Removed the SaveBG hack. The real incompatibility is that the MemoryDC

[wxWidgets.git] / include / wx / os2 / spinbutt.h

diff --git a/include/wx/os2/spinbutt.h b/include/wx/os2/spinbutt.h
index 643ae907d9002a996b41c1d6ec4a8aced7b7ae98..493f7fddfcb5fda634f9398f6ca461af4e84a0af 100644 (file)
--- a/include/wx/os2/spinbutt.h
+++ b/include/wx/os2/spinbutt.h
@@ -15,58 +15,66 @@
 #include "wx/control.h"
 #include "wx/event.h"
 
 #include "wx/control.h"
 #include "wx/event.h"
 

+extern MRESULT EXPENTRY wxSpinCtrlWndProc(
+  HWND                              hWnd
+, UINT                              uMessage
+, MPARAM                            wParam
+, MPARAM                            lParam
+);
+

 class WXDLLEXPORT wxSpinButton: public wxSpinButtonBase
 {
 public:
     // Construction
     wxSpinButton() { }
 class WXDLLEXPORT wxSpinButton: public wxSpinButtonBase
 {
 public:
     // Construction
     wxSpinButton() { }

-
-    inline wxSpinButton( wxWindow *parent
-                        ,wxWindowID id = -1
-                        ,const wxPoint& pos = wxDefaultPosition
-                        ,const wxSize& size = wxDefaultSize
-                        ,long style = wxSP_VERTICAL
-                        ,const wxString& name = "wxSpinButton"
+    inline wxSpinButton( wxWindow*       pParent
+                        ,wxWindowID      vId = -1
+                        ,const wxPoint&  rPos = wxDefaultPosition
+                        ,const wxSize&   rSize = wxDefaultSize
+                        ,long            lStyle = wxSP_VERTICAL
+                        ,const wxString& rsName = "wxSpinButton"

                        )
     {
                        )
     {

-        Create(parent, id, pos, size, style, name);
+        Create(pParent, vId, rPos, rSize, lStyle, rsName);

     }
     }

-

     virtual ~wxSpinButton();
 
     virtual ~wxSpinButton();
 

-    bool Create( wxWindow *parent
-                ,wxWindowID id = -1
-                ,const wxPoint& pos = wxDefaultPosition
-                ,const wxSize& size = wxDefaultSize
-                ,long style = wxSP_VERTICAL
-                ,const wxString& name = "wxSpinButton"
+
+    bool Create( wxWindow*       pParent
+                ,wxWindowID      vId = -1
+                ,const wxPoint&  rPos = wxDefaultPosition
+                ,const wxSize&   rSize = wxDefaultSize
+                ,long            lStyle = wxSP_VERTICAL
+                ,const wxString& rsName = "wxSpinButton"

                );
 
     // Accessors
                );
 
     // Accessors

-    virtual int  GetValue() const ;
-    virtual void SetValue(int val) ;
-    virtual void SetRange( int minVal
-                          ,int maxVal
-                         );
+    inline virtual int  GetMax(void) const { return m_max; }
+    inline virtual int  GetMin(void) const { return m_min; }
+           virtual int  GetValue(void) const;
+    inline         bool IsVertical(void) const {return ((m_windowStyle & wxSP_VERTICAL) != 0); }
+           virtual void SetValue(int nVal);
+           virtual void SetRange( int nMinVal
+                                 ,int nMaxVal
+                                );

 
 

+    //

     // Implementation
     // Implementation

-    virtual bool OS2Command( WXUINT param
-                            ,WXWORD id
+    //
+    virtual bool OS2Command( WXUINT wParam
+                            ,WXWORD wId

                            );
                            );

-    virtual bool OS2OnNotify( int       idCtrl
-                             ,WXLPARAM  lParam
-                             ,WXLPARAM* result
-                            );
-    virtual bool OS2OnScroll( int    orientation
+    virtual bool OS2OnScroll( int    nOrientation

                              ,WXWORD wParam
                              ,WXWORD wParam

-                             ,WXWORD pos
-                             ,WXHWND control
+                             ,WXWORD wPos
+                             ,WXHWND hControl

                             );
 
                             );
 

+    inline virtual bool AcceptsFocus(void) const { return FALSE; }

 protected:
 protected:

-   virtual wxSize DoGetBestSize() const;
+    virtual wxSize DoGetBestSize() const;

 private:
     DECLARE_DYNAMIC_CLASS(wxSpinButton)
 private:
     DECLARE_DYNAMIC_CLASS(wxSpinButton)

-};
-#endif
-    // _WX_SPINBUTT_H_
+}; // end of CLASS wxSpinButton
+
+#endif // _WX_SPINBUTT_H_