WindowList_* functions are not services anymore; unneeded helpers removed

git-svn-id: http://svn.miranda-ng.org/main/trunk@14168 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

4 files changed, 7 insertions, 7 deletions

diff --git a/plugins/Weather/src/weather.cpp b/plugins/Weather/src/weather.cpp
index eba9346537..02e61c82d2 100644
--- a/plugins/Weather/src/weather.cpp
+++ b/plugins/Weather/src/weather.cpp
@@ -37,8 +37,7 @@ HWND hPopupWindow;
 HANDLE hHookWeatherUpdated;

 HANDLE hHookWeatherError;

 

-HANDLE hDataWindowList;

-HANDLE hWindowList;

+MWindowList hDataWindowList, hWindowList;

 

 HANDLE hUpdateMutex;

 

diff --git a/plugins/Weather/src/weather.h b/plugins/Weather/src/weather.h
index 77550391bc..182fb07cd9 100644
--- a/plugins/Weather/src/weather.h
+++ b/plugins/Weather/src/weather.h
@@ -363,11 +363,12 @@ extern MYOPTIONS opt;
 extern unsigned status;

 extern unsigned old_status;

 

-extern HANDLE hDataWindowList;

+extern MWindowList hDataWindowList;

+extern MWindowList hWindowList;

+

 extern HANDLE hNetlibUser, hNetlibHttp;

 extern HANDLE hHookWeatherUpdated;

 extern HANDLE hHookWeatherError;

-extern HANDLE hWindowList;

 extern HANDLE hTBButton;

 extern UINT_PTR timerId;

 extern HANDLE hUpdateMutex;

@@ -546,6 +547,6 @@ void LoadBriefInfoText(HWND hwndDlg, MCONTACT hContact);
 INT_PTR CALLBACK DlgProcBrief(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);

 

 void InitIcons(void);

-HICON  LoadIconEx(const char* name, BOOL big);

+HICON  LoadIconEx(const char* name, bool big);

 HANDLE GetIconHandle(const char* name);

 void   ReleaseIconEx(HICON hIcon);

diff --git a/plugins/Weather/src/weather_icons.cpp b/plugins/Weather/src/weather_icons.cpp
index 74a25ffbe8..e4b548b37c 100644
--- a/plugins/Weather/src/weather_icons.cpp
+++ b/plugins/Weather/src/weather_icons.cpp
@@ -42,7 +42,7 @@ void InitIcons(void)
 	Icon_Register(hInst, WEATHERPROTONAME, iconList, SIZEOF(iconList), WEATHERPROTONAME);

 }

 

-HICON  LoadIconEx(const char* name, BOOL big)

+HICON LoadIconEx(const char* name, bool big)

 {

 	char szSettingName[100];

 	mir_snprintf(szSettingName, SIZEOF(szSettingName), "%s_%s", WEATHERPROTONAME, name);

diff --git a/plugins/Weather/src/weather_mwin.cpp b/plugins/Weather/src/weather_mwin.cpp
index 714df36626..7c91da6ffc 100644
--- a/plugins/Weather/src/weather_mwin.cpp
+++ b/plugins/Weather/src/weather_mwin.cpp
@@ -23,7 +23,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MS_TOOLTIP_SHOWTIP		"mToolTip/ShowTip"

 #define MS_TOOLTIP_HIDETIP		"mToolTip/HideTip"

 

-static HANDLE hMwinWindowList;

+static MWindowList hMwinWindowList;

 static HANDLE hFontHook;

 

 HGENMENU hMwinMenu;