diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-04-05 23:13:56 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-04-05 23:13:56 +0000 |
| commit | 4810d4b1b7a47701b8e6c45490fb2643ea425123 (patch) | |
| tree | fb94dd5889fdd0558605ffe738f0b2d6d2f08ca2 /plugins/Weather | |
| parent | 007b4c7301f0d26a72f89f74e9929f42e24eb3e6 (diff) | |
rest of menu cleaning
git-svn-id: http://svn.miranda-ng.org/main/trunk@4325 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Weather')
| -rw-r--r-- | plugins/Weather/src/weather.h | 3 | ||||
| -rw-r--r-- | plugins/Weather/src/weather_mwin.cpp | 4 | ||||
| -rw-r--r-- | plugins/Weather/src/weather_svcs.cpp | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/plugins/Weather/src/weather.h b/plugins/Weather/src/weather.h index 868440ad22..84d1b2b888 100644 --- a/plugins/Weather/src/weather.h +++ b/plugins/Weather/src/weather.h @@ -361,11 +361,12 @@ extern HANDLE hNetlibUser, hNetlibHttp; extern HANDLE hHookWeatherUpdated;
extern HANDLE hHookWeatherError;
extern HANDLE hWindowList;
-extern HANDLE hMwinMenu;
extern HANDLE hTBButton;
extern UINT_PTR timerId;
extern HANDLE hUpdateMutex;
+extern HGENMENU hMwinMenu;
+
// check if weather is currently updating
extern BOOL ThreadRunning;
diff --git a/plugins/Weather/src/weather_mwin.cpp b/plugins/Weather/src/weather_mwin.cpp index 4061858a73..b748173aeb 100644 --- a/plugins/Weather/src/weather_mwin.cpp +++ b/plugins/Weather/src/weather_mwin.cpp @@ -29,7 +29,7 @@ static ft_TrackMouseEvent f_TrackMouseEvent = NULL; static HANDLE hMwinWindowList;
static HANDLE hFontHook;
-HANDLE hMwinMenu;
+HGENMENU hMwinMenu;
typedef struct
{
@@ -312,7 +312,7 @@ int BuildContactMenu(WPARAM wparam,LPARAM lparam) CLISTMENUITEM mi = { sizeof(mi) };
mi.flags = CMIM_FLAGS |
(db_get_dw((HANDLE)wparam, WEATHERPROTONAME, "mwin", 0) ? CMIF_CHECKED : 0);
- CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM)hMwinMenu, (LPARAM)&mi);
+ Menu_ModifyItem(hMwinMenu, &mi);
return 0;
}
diff --git a/plugins/Weather/src/weather_svcs.cpp b/plugins/Weather/src/weather_svcs.cpp index d61bdc2a8b..0f074e292a 100644 --- a/plugins/Weather/src/weather_svcs.cpp +++ b/plugins/Weather/src/weather_svcs.cpp @@ -241,7 +241,7 @@ void UpdateMenu(BOOL State) }
mi.flags = CMIM_ICON | CMIM_NAME | CMIF_ICONFROMICOLIB;
- CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM)hEnableDisableMenu, (LPARAM)&mi);
+ Menu_ModifyItem(hEnableDisableMenu, &mi);
CallService(MS_TTB_SETBUTTONSTATE, (WPARAM)hTBButton, !State ? TTBST_PUSHED : TTBST_RELEASED);
}
@@ -265,7 +265,7 @@ void UpdatePopupMenu(BOOL State) }
mi.flags = CMIM_ICON | CMIM_NAME | CMIF_ICONFROMICOLIB;
- CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM)hEnableDisablePopupMenu, (LPARAM)&mi);
+ Menu_ModifyItem(hEnableDisablePopupMenu, &mi);
}
// update the weather auto-update menu item when click on it
|