converted to 16 colors

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

diff --git a/include/wx/msw/spinbutt.h b/include/wx/msw/spinbutt.h
index 161df41293a9fee20fe5be870ab3213b347f53af..fc42e4929f247bdad61ba667c4869d81d8d73707 100644 (file)
--- a/include/wx/msw/spinbutt.h
+++ b/include/wx/msw/spinbutt.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SPINBUTT_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SPINBUTT_H_


@@ -21,17 +21,8 @@
 
 #if defined(__WIN95__)
 
 
 #if defined(__WIN95__)
 

-/*
-    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)
 
 {
 DECLARE_DYNAMIC_CLASS(wxSpinButton)
 


@@ -39,7 +30,7 @@ public:
     /*
      * Public interface
      */
     /*
      * Public interface
      */

-    wxSpinButton();
+    wxSpinButton() { }

 
     wxSpinButton(wxWindow *parent,
                  wxWindowID id = -1,
 
     wxSpinButton(wxWindow *parent,
                  wxWindowID id = -1,


@@ -61,52 +52,18 @@ public:
                 const wxString& name = "wxSpinButton");
 
 
                 const wxString& name = "wxSpinButton");
 
 

-    // Attributes
-    ////////////////////////////////////////////////////////////////////////////
-
-    int GetValue() const ;
-    void SetValue(int val) ;
-    void SetRange(int minVal, int maxVal);
-    int GetMin() const { return m_min; }
-    int GetMax() const { return m_max; }
+    // accessors
+    virtual int GetValue() const;
+    virtual void SetValue(int val);
+    virtual void SetRange(int minVal, int maxVal);

 
 

-    // Operations
-    ////////////////////////////////////////////////////////////////////////////
-
-    // IMPLEMENTATION
+    // implementation

     virtual bool MSWCommand(WXUINT param, WXWORD id);
     virtual bool MSWCommand(WXUINT param, WXWORD id);

+    virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);

     virtual bool MSWOnScroll(int orientation, WXWORD wParam,
                              WXWORD pos, WXHWND control);
     virtual bool MSWOnScroll(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);
-};
-
-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_WIN95__
 #endif
 #endif
     // _WX_WIN95__
 #endif