Lotta stuff for drawing etc.

[wxWidgets.git] / src / msw / radiobox.cpp

diff --git a/src/msw/radiobox.cpp b/src/msw/radiobox.cpp
index 5b908961894fe00c90e202e0ce7ed353c80a1767..e54fa2c71c3b35590abaab20ad863c7efb7119d5 100644 (file)
--- a/src/msw/radiobox.cpp
+++ b/src/msw/radiobox.cpp
@@ -38,10 +38,9 @@
 #include "wx/msw/private.h"
 
 #if wxUSE_TOOLTIPS
-    #ifndef __GNUWIN32__
+    #ifndef __GNUWIN32_OLD__
         #include <commctrl.h>
     #endif
-
     #include "wx/tooltip.h"
 #endif // wxUSE_TOOLTIPS
 
@@ -86,7 +85,7 @@ LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hWnd,
 // ---------------------------------------------------------------------------
 
 // the pointer to standard radio button wnd proc
-static WNDPROC s_wndprocRadioBtn = (WNDPROC)NULL;
+static WXFARPROC s_wndprocRadioBtn = (WXFARPROC)NULL;
 
 #endif // __WIN32__
 
@@ -689,7 +688,7 @@ void wxRadioBox::SubclassRadioButton(WXHWND hWndBtn)
     HWND hwndBtn = (HWND)hWndBtn;
 
     if ( !s_wndprocRadioBtn )
-        s_wndprocRadioBtn = (WNDPROC)::GetWindowLong(hwndBtn, GWL_WNDPROC);
+        s_wndprocRadioBtn = (WXFARPROC)::GetWindowLong(hwndBtn, GWL_WNDPROC);
 
     ::SetWindowLong(hwndBtn, GWL_WNDPROC, (long)wxRadioBtnWndProc);
     ::SetWindowLong(hwndBtn, GWL_USERDATA, (long)this);
@@ -788,8 +787,9 @@ LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hwnd,
             // want to process arrows ourselves because neither of them is
             // smart enough to handle arrows properly for us
             {
-                long lDlgCode = ::CallWindowProc(s_wndprocRadioBtn, hwnd,
+                long lDlgCode = ::CallWindowProc(CASTWNDPROC s_wndprocRadioBtn, hwnd,
                                                  message, wParam, lParam);
+
                 return lDlgCode | DLGC_WANTARROWS;
             }
 
@@ -873,7 +873,7 @@ LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hwnd,
             }
     }
 
-    return ::CallWindowProc(s_wndprocRadioBtn, hwnd, message, wParam, lParam);
+    return ::CallWindowProc(CASTWNDPROC s_wndprocRadioBtn, hwnd, message, wParam, lParam);
 }
 
 #endif // __WIN32__