diff --git a/src/wxwindow/src/msw/wx_item.cxx b/src/wxwindow/src/msw/wx_item.cxx
index a9aff14a61..9aebc388bd 100644
--- a/src/wxwindow/src/msw/wx_item.cxx
+++ b/src/wxwindow/src/msw/wx_item.cxx
@@ -198,14 +198,14 @@ void wxItem::SubclassControl(HWND hWnd)
     wxGenericControlSubClassProc = MakeProcInstance((FARPROC)wxSubclassedGenericControlProc,
 						    wxhInstance);
   }
-  SetWindowLong(hWnd, GWL_WNDPROC, (LONG)wxGenericControlSubClassProc);
+  SetWindowLongW(hWnd, GWL_WNDPROC, (LONG)wxGenericControlSubClassProc);
 }
 
 void wxItem::UnsubclassControl(HWND hWnd)
 {
   if (oldWndProc) {
     wxRemoveControlHandle(hWnd);
-    SetWindowLong(hWnd, GWL_WNDPROC, (LONG)oldWndProc);
+    SetWindowLongW(hWnd, GWL_WNDPROC, (LONG)oldWndProc);
   }
 }
 
@@ -484,7 +484,7 @@ LONG APIENTRY _EXPORT
 
   if (!tramp)
     scheme_start_atomic();
-  res = CallWindowProc((WNDPROC)item->oldWndProc, hWnd, message, wParam, lParam);
+  res = CallWindowProcW((WNDPROC)item->oldWndProc, hWnd, message, wParam, lParam);
   if (!tramp)
     scheme_end_atomic_no_swap();
 
diff --git a/src/wxwindow/src/msw/wx_lbox.cxx b/src/wxwindow/src/msw/wx_lbox.cxx
index 6addac76e2..25b16b72b5 100644
--- a/src/wxwindow/src/msw/wx_lbox.cxx
+++ b/src/wxwindow/src/msw/wx_lbox.cxx
@@ -90,7 +90,7 @@ Bool wxListBox::Create(wxPanel *panel, wxFunction func,
 				   0, 0, 0, 0, cparent->handle, (HMENU)nid,
 				   wxhInstance, NULL);
 
-    wxSetWinFont(label_font, (HANDLE)static_label);
+    wxSetWinFont(font, (HANDLE)static_label);
   }
   else
     static_label = NULL;
diff --git a/src/wxwindow/src/msw/wx_rbox.cxx b/src/wxwindow/src/msw/wx_rbox.cxx
index 73b23bc323..36fcfa91c8 100644
--- a/src/wxwindow/src/msw/wx_rbox.cxx
+++ b/src/wxwindow/src/msw/wx_rbox.cxx
@@ -79,7 +79,7 @@ wxRadioItemProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
     }
     return TRUE;
   } else
-    return CallWindowProc((WNDPROC)i->old, hWnd, message, wParam, lParam);
+    return CallWindowProcW((WNDPROC)i->old, hWnd, message, wParam, lParam);
 }
 
 static FARPROC wxGenericRIProc;
@@ -101,7 +101,7 @@ static void *SubclassRadioButton(HWND hWnd, wxItem *item, int which)
   if (!wxGenericRIProc) {
     wxGenericRIProc = MakeProcInstance((FARPROC) wxRadioItemProc, wxhInstance);
   }
-  SetWindowLong(hWnd, GWL_WNDPROC, (LONG) wxGenericRIProc);
+  SetWindowLongW(hWnd, GWL_WNDPROC, (LONG) wxGenericRIProc);
 
   return i;
 }
@@ -113,7 +113,7 @@ void UnsubclassRadioButton(HWND hWnd)
   
   if (i) {
     wxRemoveControlHandle(hWnd);
-    SetWindowLong(hWnd, GWL_WNDPROC, (LONG)i->old);
+    SetWindowLongW(hWnd, GWL_WNDPROC, (LONG)i->old);
   }
 }