Latest OS/2 compiler bug fixes for common and generic

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

diff --git a/include/wx/motif/spinbutt.h b/include/wx/motif/spinbutt.h
index ce5a75372cf82f024c6aad76ae1b0ea59838c7f0..1731d356edde7da9a325365f3de37e62670f21a7 100644 (file)
--- a/include/wx/motif/spinbutt.h
+++ b/include/wx/motif/spinbutt.h
@@ -6,92 +6,61 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SPINBUTT_H_
 #define _WX_SPINBUTT_H_
 
 #ifdef __GNUG__
-#pragma interface "spinbutt.h"
+    #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); };
+    DECLARE_DYNAMIC_CLASS(wxSpinButton)
+
+public:
+    wxSpinButton() { }
+
+    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");
+
+
+    // accessors
+    int GetValue() const;
+    int GetMin() const { return m_min; }
+    int GetMax() const { return m_max; }
+
+    // operations
+    void SetValue(int val);
+    void SetRange(int minVal, int maxVal);
+
+    // Implementation
+    virtual void Command(wxCommandEvent& event) { (void)ProcessCommand(event); };
+    virtual void ChangeFont(bool keepOriginalSize = TRUE);
+    virtual void ChangeBackgroundColour();
+    virtual void ChangeForegroundColour();
 
 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);
+    int   m_min;
+    int   m_max;
 };
 
-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_