wxColour -> NSColor conversion.

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

diff --git a/include/wx/msw/spinbutt.h b/include/wx/msw/spinbutt.h
index 2828753d570a92c53f410c7c96ec2b8b066d0e32..778db17f85058ce16d2a538ec8ce52d59957315a 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:


@@ -12,27 +12,23 @@
 #ifndef _WX_SPINBUTT_H_
 #define _WX_SPINBUTT_H_
 
 #ifndef _WX_SPINBUTT_H_
 #define _WX_SPINBUTT_H_
 

-#ifdef __GNUG__
-    #pragma interface "spinbutt.h"
-#endif
-

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

-#if defined(__WIN95__)
+#if wxUSE_SPINBTN

 
 

-class WXDLLEXPORT wxSpinButton : public wxSpinButtonBase
+class WXDLLIMPEXP_CORE wxSpinButton : public wxSpinButtonBase

 {
 public:
     // construction
     wxSpinButton() { }
 
     wxSpinButton(wxWindow *parent,
 {
 public:
     // construction
     wxSpinButton() { }
 
     wxSpinButton(wxWindow *parent,

-                 wxWindowID id = -1,
+                 wxWindowID id = wxID_ANY,

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


@@ -40,11 +36,11 @@ public:
     virtual ~wxSpinButton();
 
     bool Create(wxWindow *parent,
     virtual ~wxSpinButton();
 
     bool Create(wxWindow *parent,

-                wxWindowID id = -1,
+                wxWindowID id = wxID_ANY,

                 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


@@ -58,14 +54,22 @@ public:
     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; }
+
+    // returns true if the platform should explicitly apply a theme border
+    virtual bool CanApplyThemeBorder() const { return false; }
+

 protected:
    virtual wxSize DoGetBestSize() const;
 
 protected:
    virtual wxSize DoGetBestSize() const;
 

+   // ensure that the control displays a value in the current range
+   virtual void NormalizeValue();
+

 private:
 private:

-    DECLARE_DYNAMIC_CLASS(wxSpinButton)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxSpinButton)

 };
 
 };
 

-#endif
-    // __WIN95__
-#endif
-    // _WX_SPINBUTT_H_
+#endif // wxUSE_SPINBTN
+
+#endif // _WX_SPINBUTT_H_