Visualage C++ V4.0 duplicate symbol fixes

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

diff --git a/src/msw/radiobox.cpp b/src/msw/radiobox.cpp
index 5b908961894fe00c90e202e0ce7ed353c80a1767..96cc7b42b9f87fb60bfd31bb21de97416493ff72 100644 (file)
--- a/src/msw/radiobox.cpp
+++ b/src/msw/radiobox.cpp
@@ -38,10 +38,9 @@
 #include "wx/msw/private.h"
 
 #if wxUSE_TOOLTIPS
 #include "wx/msw/private.h"
 
 #if wxUSE_TOOLTIPS

-    #ifndef __GNUWIN32__
+//    #ifndef __GNUWIN32__

         #include <commctrl.h>
         #include <commctrl.h>

-    #endif
-
+//    #endif

     #include "wx/tooltip.h"
 #endif // wxUSE_TOOLTIPS
 
     #include "wx/tooltip.h"
 #endif // wxUSE_TOOLTIPS
 


@@ -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
             {
             // 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);
                                                  message, wParam, lParam);

+

                 return lDlgCode | DLGC_WANTARROWS;
             }
 
                 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__
 }
 
 #endif // __WIN32__