removed checks for compilers supporting wxUSE_ON_FATAL_EXCEPTION, it's in wx/chkconf...

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

diff --git a/include/wx/msw/spinctrl.h b/include/wx/msw/spinctrl.h
index f7374f400bc89c9118d5b00171968c3004f36d44..350c6ea86180c096b6a8cd437879824dcc4dbdb7 100644 (file)
--- a/include/wx/msw/spinctrl.h
+++ b/include/wx/msw/spinctrl.h
@@ -6,7 +6,7 @@
 // Created:     22.07.99
 // RCS-ID:      $Id$
 // Copyright:   (c) Vadim Zeitlin
 // Created:     22.07.99
 // RCS-ID:      $Id$
 // Copyright:   (c) Vadim Zeitlin

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

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MSW_SPINCTRL_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MSW_SPINCTRL_H_


@@ -18,6 +18,8 @@
 
 #include "wx/spinbutt.h"    // the base class
 
 
 #include "wx/spinbutt.h"    // the base class
 

+#if wxUSE_SPINCTRL
+

 #include "wx/dynarray.h"
 
 class WXDLLEXPORT wxSpinCtrl;
 #include "wx/dynarray.h"
 
 class WXDLLEXPORT wxSpinCtrl;


@@ -35,7 +37,7 @@ public:
     wxSpinCtrl() { }
 
     wxSpinCtrl(wxWindow *parent,
     wxSpinCtrl() { }
 
     wxSpinCtrl(wxWindow *parent,

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

                const wxString& value = wxEmptyString,
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                const wxString& value = wxEmptyString,
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,


@@ -47,7 +49,7 @@ public:
     }
 
     bool Create(wxWindow *parent,
     }
 
     bool Create(wxWindow *parent,

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

                 const wxString& value = wxEmptyString,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 const wxString& value = wxEmptyString,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,


@@ -72,8 +74,8 @@ public:
     virtual bool SetFont(const wxFont &font);
     virtual void SetFocus();
 
     virtual bool SetFont(const wxFont &font);
     virtual void SetFocus();
 

-    virtual bool Enable(bool enable = TRUE);
-    virtual bool Show(bool show = TRUE);
+    virtual bool Enable(bool enable = true);
+    virtual bool Show(bool show = true);

 
     // wxSpinButton doesn't accept focus, but we do
     virtual bool AcceptsFocus() const { return wxWindow::AcceptsFocus(); }
 
     // wxSpinButton doesn't accept focus, but we do
     virtual bool AcceptsFocus() const { return wxWindow::AcceptsFocus(); }


@@ -116,6 +118,8 @@ private:
     DECLARE_NO_COPY_CLASS(wxSpinCtrl)
 };
 
     DECLARE_NO_COPY_CLASS(wxSpinCtrl)
 };
 

+#endif // wxUSE_SPINCTRL
+

 #endif // _WX_MSW_SPINCTRL_H_
 
 
 #endif // _WX_MSW_SPINCTRL_H_