fixed the last of the off-by-one errors (some are refixed, again...)

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

diff --git a/include/wx/os2/spinbutt.h b/include/wx/os2/spinbutt.h
index afdb978c3fc972cee771671b55d341b77a3a54a7..643ae907d9002a996b41c1d6ec4a8aced7b7ae98 100644 (file)
--- a/include/wx/os2/spinbutt.h
+++ b/include/wx/os2/spinbutt.h
@@ -1,97 +1,72 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        spinbutt.h
 // Purpose:     wxSpinButton class
-// Author:      AUTHOR
+// Author:      David Webster
 // Modified by:
-// Created:     ??/??/98
+// Created:     10/15/99
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) David Webster
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SPINBUTT_H_
 #define _WX_SPINBUTT_H_
 
-#ifdef __GNUG__
-#pragma interface "spinbutt.h"
-#endif
-
 #include "wx/control.h"
 #include "wx/event.h"
 
-/*
-    The wxSpinButton is like a small scrollbar than is often placed next
-    to a text control.
-
-    wxSP_HORIZONTAL:   horizontal spin button
-    wxSP_VERTICAL:     vertical spin button (the default)
-    wxSP_ARROW_KEYS:   arrow keys increment/decrement value
-    wxSP_WRAP:         value wraps at either end
- */
-
-class WXDLLEXPORT wxSpinButton: public wxControl
+class WXDLLEXPORT wxSpinButton: public wxSpinButtonBase
 {
-  DECLARE_DYNAMIC_CLASS(wxSpinButton)
- public:
-  /*
-   * Public interface
-   */
-
-  wxSpinButton();
-
-  inline wxSpinButton(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-            long style = wxSP_VERTICAL, const wxString& name = "wxSpinButton")
-  {
-    Create(parent, id, pos, size, style, name);
-  }
-  ~wxSpinButton();
-
-  bool Create(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-            long style = wxSP_VERTICAL, const wxString& name = "wxSpinButton");
-
-
-  // Attributes
-  ////////////////////////////////////////////////////////////////////////////
-
-  int GetValue() const ;
-  void SetValue(int val) ;
-  void SetRange(int minVal, int maxVal) ;
-  inline int GetMin() const { return m_min; }
-  inline int GetMax() const { return m_max; }
-
-  // Operations
-  ////////////////////////////////////////////////////////////////////////////
-
-  void Command(wxCommandEvent& event) { ProcessCommand(event); };
+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"
+                       )
+    {
+        Create(parent, id, pos, size, style, name);
+    }
+
+    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"
+               );
+
+    // Accessors
+    virtual int  GetValue() const ;
+    virtual void SetValue(int val) ;
+    virtual void SetRange( int minVal
+                          ,int maxVal
+                         );
+
+    // Implementation
+    virtual bool OS2Command( WXUINT param
+                            ,WXWORD id
+                           );
+    virtual bool OS2OnNotify( int       idCtrl
+                             ,WXLPARAM  lParam
+                             ,WXLPARAM* result
+                            );
+    virtual bool OS2OnScroll( int    orientation
+                             ,WXWORD wParam
+                             ,WXWORD pos
+                             ,WXHWND control
+                            );
 
 protected:
-  int   m_min;
-  int   m_max;
-};
-
-class WXDLLEXPORT wxSpinEvent: public wxScrollEvent
-{
-  DECLARE_DYNAMIC_CLASS(wxSpinEvent)
-
- public:
-  wxSpinEvent(wxEventType commandType = wxEVT_NULL, int id = 0);
+   virtual wxSize DoGetBestSize() const;
+private:
+    DECLARE_DYNAMIC_CLASS(wxSpinButton)
 };
-
-typedef void (wxEvtHandler::*wxSpinEventFunction)(wxSpinEvent&);
-
-// Spin events
-
-#define EVT_SPIN_UP(id, func) { wxEVT_SCROLL_LINEUP, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & func }
-#define EVT_SPIN_DOWN(id, func) { wxEVT_SCROLL_LINEDOWN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & func }
-
-#define EVT_SPIN(id, func) \
-  { wxEVT_SCROLL_TOP, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & func },\
-  { wxEVT_SCROLL_BOTTOM, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & func },\
-  { wxEVT_SCROLL_LINEUP, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & func },\
-  { wxEVT_SCROLL_LINEDOWN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & func },\
-  { wxEVT_SCROLL_PAGEUP, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & func },\
-  { wxEVT_SCROLL_PAGEDOWN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & func },\
-  { wxEVT_SCROLL_THUMBTRACK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & func },
-
 #endif
     // _WX_SPINBUTT_H_