3 files changed, 10 insertions, 26 deletions
diff --git a/protocols/Weather/weather.h b/protocols/Weather/weather.h
index e2b4f268cd..1d6005c329 100644
--- a/protocols/Weather/weather.h
+++ b/protocols/Weather/weather.h
@@ -62,7 +62,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <m_clui.h>
 #include <m_clc.h>
 #include <m_fontservice.h>
-#include "m_cluiframes.h"
+#include <m_skin_eng.h>
+#include <m_cluiframes.h>
 
 #include <m_popup.h>
 
diff --git a/protocols/Weather/weather_contacts.cpp b/protocols/Weather/weather_contacts.cpp
index 7089e04056..06c7463fe3 100644
--- a/protocols/Weather/weather_contacts.cpp
+++ b/protocols/Weather/weather_contacts.cpp
@@ -168,13 +168,13 @@ INT_PTR CALLBACK DlgProcChange(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa
 		SendDlgItemMessage(hwndDlg, IDC_RESET2, BUTTONSETASFLATBTN, TRUE, 0);
 
 		// set tooltip for the buttons
-		SendDlgItemMessage(hwndDlg, IDC_GETNAME, BUTTONADDTOOLTIP, (WPARAM)"Get city name from ID", 0);
-		SendDlgItemMessage(hwndDlg, IDC_SVCINFO, BUTTONADDTOOLTIP, (WPARAM)"Weather INI information", 0);
-		SendDlgItemMessage(hwndDlg, IDC_BROWSE, BUTTONADDTOOLTIP, (WPARAM)"Browse", 0);
-		SendDlgItemMessage(hwndDlg, IDC_VIEW1, BUTTONADDTOOLTIP, (WPARAM)"View webpage", 0);
-		SendDlgItemMessage(hwndDlg, IDC_RESET1, BUTTONADDTOOLTIP, (WPARAM)"Reset to default", 0);
-		SendDlgItemMessage(hwndDlg, IDC_VIEW2, BUTTONADDTOOLTIP, (WPARAM)"View webpage", 0);
-		SendDlgItemMessage(hwndDlg, IDC_RESET2, BUTTONADDTOOLTIP, (WPARAM)"Reset to default", 0);
+		SendDlgItemMessage(hwndDlg, IDC_GETNAME, BUTTONADDTOOLTIP, (WPARAM) LPGENT("Get city name from ID"), BATF_TCHAR);
+		SendDlgItemMessage(hwndDlg, IDC_SVCINFO, BUTTONADDTOOLTIP, (WPARAM) LPGENT("Weather INI information"), BATF_TCHAR);
+		SendDlgItemMessage(hwndDlg, IDC_BROWSE, BUTTONADDTOOLTIP, (WPARAM) LPGENT("Browse"), BATF_TCHAR);
+		SendDlgItemMessage(hwndDlg, IDC_VIEW1, BUTTONADDTOOLTIP, (WPARAM) LPGENT("View webpage"), BATF_TCHAR);
+		SendDlgItemMessage(hwndDlg, IDC_RESET1, BUTTONADDTOOLTIP, (WPARAM) LPGENT("Reset to default"), BATF_TCHAR);
+		SendDlgItemMessage(hwndDlg, IDC_VIEW2, BUTTONADDTOOLTIP, (WPARAM) LPGENT("View webpage"), BATF_TCHAR);
+		SendDlgItemMessage(hwndDlg, IDC_RESET2, BUTTONADDTOOLTIP, (WPARAM) LPGENT("Reset to default"), BATF_TCHAR);
 
 		// save the handle for the contact
 		WindowList_Add(hWindowList, hwndDlg, hContact);
@@ -246,13 +246,12 @@ INT_PTR CALLBACK DlgProcChange(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa
 			{
 				// the button for getting station name from the internet
 				// this function uses the ID search for add/find weather station
-				WIDATA *sData; 
 
 				if (!CheckSearch()) return TRUE;	// don't download if update is in progress
 				// get the weather update data using the string in the ID field
 				GetDlgItemText(hwndDlg, IDC_ID, str, SIZEOF(str));
 				GetSvc(str);
-				sData = GetWIData(str);
+				WIDATA *sData = GetWIData(str);
 				GetDlgItemText(hwndDlg, IDC_ID, str, SIZEOF(str));
 				GetID(str);
 				// if ID search is available, do it
diff --git a/protocols/Weather/weather_mwin.cpp b/protocols/Weather/weather_mwin.cpp
index ed84bc4d01..046ad2c7d6 100644
--- a/protocols/Weather/weather_mwin.cpp
+++ b/protocols/Weather/weather_mwin.cpp
@@ -20,22 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "weather.h"
 #include "m_acc.h"
 
-/* DRAWGLYPH Request structure */
-typedef struct s_SKINDRAWREQUEST
-{
-	char szObjectID[255];      // Unic Object ID (path) to paint
-	RECT rcDestRect;           // Rectangle to fit
-	RECT rcClipRect;           // Rectangle to paint in.
-	HDC hDC;                   // Handler to device context to paint in. 
-} SKINDRAWREQUEST,*LPSKINDRAWREQUEST;
-
-
-// Request painting glyph object 
-// wParam = pointer to SKINDRAWREQUEST structure
-// lParam = 0
-#define MS_SKIN_DRAWGLYPH "ModernList/DrawGlyph"
-
-
 #define MS_TOOLTIP_SHOWTIP		"mToolTip/ShowTip"
 #define MS_TOOLTIP_HIDETIP		"mToolTip/HideTip"