1. derive wxGTK wxRadioBox from wxRadioBoxBase now, as in all other ports

[wxWidgets.git] / src / os2 / spinbutt.cpp

diff --git a/src/os2/spinbutt.cpp b/src/os2/spinbutt.cpp
index 0bd30bf97c577b6cecc552b860df0b0bc8f0404b..28661af11a3393538f3e96aa523fc0bbfdc3a97b 100644 (file)
--- a/src/os2/spinbutt.cpp
+++ b/src/os2/spinbutt.cpp
@@ -9,11 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-    #pragma implementation "spinbutt.h"
-    #pragma implementation "spinbutbase.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -32,7 +27,6 @@
 extern void  wxAssociateWinWithHandle( HWND         hWnd
                                       ,wxWindowOS2* pWin
                                      );
 extern void  wxAssociateWinWithHandle( HWND         hWnd
                                       ,wxWindowOS2* pWin
                                      );

-static WXFARPROC fnWndProcSpinCtrl = (WXFARPROC)NULL;

 
 IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent)
 


@@ -168,7 +162,8 @@ wxSize wxSpinButton::DoGetBestSize() const
     // 24x20 which is the size of the buttons and the borders.
     // Also we have no horizontal spin buttons.
     //
     // 24x20 which is the size of the buttons and the borders.
     // Also we have no horizontal spin buttons.
     //

-    return (wxSize(24,20));
+    wxSize best(24,20);
+    return best;

 } // end of wxSpinButton::DoGetBestSize
 
 // ----------------------------------------------------------------------------
 } // end of wxSpinButton::DoGetBestSize
 
 // ----------------------------------------------------------------------------


@@ -191,31 +186,25 @@ int wxSpinButton::GetValue() const
     return ((int)lVal);
 } // end of wxSpinButton::GetValue
 
     return ((int)lVal);
 } // end of wxSpinButton::GetValue
 

-bool wxSpinButton::OS2OnScroll(
-  int                               nOrientation
-, WXWORD                            wParam
-, WXWORD                            wPos
-, WXHWND                            hControl
-)
+bool wxSpinButton::OS2OnScroll( int    WXUNUSED(nOrientation),
+                                WXWORD WXUNUSED(wParam),
+                                WXWORD wPos,
+                                WXHWND hControl )

 {
 {

-    wxCHECK_MSG(hControl, FALSE, wxT("scrolling what?") )
+    wxCHECK_MSG(hControl, false, wxT("scrolling what?") )

 
 

-    wxSpinEvent                     vEvent( wxEVT_SCROLL_THUMBTRACK
-                                           ,m_windowId
-                                          );
-    int                             nVal = (int)wPos;    // cast is important for negative values!
+    wxSpinEvent vEvent( wxEVT_SCROLL_THUMBTRACK, m_windowId );
+    int nVal = (int)wPos;    // cast is important for negative values!

 
     vEvent.SetPosition(nVal);
     vEvent.SetEventObject(this);
     return(GetEventHandler()->ProcessEvent(vEvent));
 } // end of wxSpinButton::OS2OnScroll
 
 
     vEvent.SetPosition(nVal);
     vEvent.SetEventObject(this);
     return(GetEventHandler()->ProcessEvent(vEvent));
 } // end of wxSpinButton::OS2OnScroll
 

-bool wxSpinButton::OS2Command(
-  WXUINT                            uCmd
-, WXWORD                            wId
-)
+bool wxSpinButton::OS2Command( WXUINT WXUNUSED(uCmd),
+                               WXWORD WXUNUSED(wId) )

 {
 {

-    return FALSE;
+    return false;

 } // end of wxSpinButton::OS2Command
 
 void wxSpinButton::SetRange(
 } // end of wxSpinButton::OS2Command
 
 void wxSpinButton::SetRange(