build fixes

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

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

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

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

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "spinbutt.h"
-#endif
-

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

+#if wxUSE_SPINBTN
+

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


@@ -26,7 +24,7 @@ public:
     wxSpinButton() { }
 
     wxSpinButton(wxWindow *parent,
     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,


@@ -38,7 +36,7 @@ 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,


@@ -57,14 +55,21 @@ public:
                              WXWORD pos, WXHWND control);
 
     // a wxSpinButton can't do anything useful with focus, only wxSpinCtrl can
                              WXWORD pos, WXHWND control);
 
     // a wxSpinButton can't do anything useful with focus, only wxSpinCtrl can

-    virtual bool AcceptsFocus() const { return FALSE; }
+    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:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxSpinButton)
 };
 
 private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxSpinButton)
 };
 

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