A fix for attribrute sorting, but it's still broken if there are

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

diff --git a/include/wx/msw/spinbutt.h b/include/wx/msw/spinbutt.h
index fc42e4929f247bdad61ba667c4869d81d8d73707..295ea3867daee2e43af908e926936491dc3d2a9d 100644 (file)
--- a/include/wx/msw/spinbutt.h
+++ b/include/wx/msw/spinbutt.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        spinbutt.h
+// Name:        wx/univ/spinbutt.h

 // Purpose:     wxSpinButton class
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxSpinButton class
 // Author:      Julian Smart
 // Modified by:


@@ -13,23 +13,16 @@
 #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"
 #include "wx/event.h"
 
 #endif
 
 #include "wx/control.h"
 #include "wx/event.h"
 

-#if defined(__WIN95__)
-
-

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

-DECLARE_DYNAMIC_CLASS(wxSpinButton)
-

 public:
 public:

-    /*
-     * Public interface
-     */
+    // construction

     wxSpinButton() { }
 
     wxSpinButton(wxWindow *parent,
     wxSpinButton() { }
 
     wxSpinButton(wxWindow *parent,


@@ -37,7 +30,7 @@ public:
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
                  long style = wxSP_VERTICAL | wxSP_ARROW_KEYS,
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
                  long style = wxSP_VERTICAL | wxSP_ARROW_KEYS,

-                 const wxString& name = "wxSpinButton")
+                 const wxString& name = wxSPIN_BUTTON_NAME)

     {
         Create(parent, id, pos, size, style, name);
     }
     {
         Create(parent, id, pos, size, style, name);
     }


@@ -49,7 +42,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxSP_VERTICAL | wxSP_ARROW_KEYS,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxSP_VERTICAL | wxSP_ARROW_KEYS,

-                const wxString& name = "wxSpinButton");
+                const wxString& name = wxSPIN_BUTTON_NAME);

 
 
     // accessors
 
 
     // accessors


@@ -62,9 +55,16 @@ public:
     virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
     virtual bool MSWOnScroll(int orientation, WXWORD wParam,
                              WXWORD pos, WXHWND control);
     virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
     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
-    // _WX_WIN95__

 #endif
     // _WX_SPINBUTT_H_
 #endif
     // _WX_SPINBUTT_H_