added wxUSE_PLOT

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

diff --git a/include/wx/msw/spinbutt.h b/include/wx/msw/spinbutt.h
index 9f74c568fcf1cb38c01221349ad9714786f6c8d7..e7c54bdb3f763696e6909dda3eefc1e965761591 100644 (file)
--- a/include/wx/msw/spinbutt.h
+++ b/include/wx/msw/spinbutt.h
@@ -13,7 +13,7 @@
 #define _WX_SPINBUTT_H_
 
 #ifdef __GNUG__
 #define _WX_SPINBUTT_H_
 
 #ifdef __GNUG__

-#pragma interface "spinbutt.h"
+    #pragma interface "spinbutt.h"

 #endif
 
 #include "wx/control.h"
 #endif
 
 #include "wx/control.h"


@@ -21,16 +21,11 @@
 
 #if defined(__WIN95__)
 
 
 #if defined(__WIN95__)
 

-

 class WXDLLEXPORT wxSpinButton : public wxSpinButtonBase
 {
 class WXDLLEXPORT wxSpinButton : public wxSpinButtonBase
 {

-DECLARE_DYNAMIC_CLASS(wxSpinButton)
-

 public:
 public:

-    /*
-     * Public interface
-     */
-    wxSpinButton();
+    // construction
+    wxSpinButton() { }

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


@@ -52,20 +47,28 @@ public:
                 const wxString& name = "wxSpinButton");
 
 
                 const wxString& name = "wxSpinButton");
 
 

-    // Attributes
-    ////////////////////////////////////////////////////////////////////////////
-
+    // accessors

     virtual int GetValue() const;
     virtual void SetValue(int val);
     virtual void SetRange(int minVal, int maxVal);
 
     virtual int GetValue() const;
     virtual void SetValue(int val);
     virtual void SetRange(int minVal, int maxVal);
 

-    // 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);

+
+    // a wxSpinButton can't do anything useful with focus, only wxSpinCtrl can
+    virtual bool AcceptsFocus() const { return FALSE; }
+
+protected:
+   virtual wxSize DoGetBestSize() const;
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxSpinButton)

 };
 
 #endif
 };
 
 #endif

-    // _WX_WIN95__
+    // __WIN95__

 #endif
     // _WX_SPINBUTT_H_
 #endif
     // _WX_SPINBUTT_H_