Deprecated SetItemImage with 2 image ids

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

diff --git a/include/wx/msw/spinctrl.h b/include/wx/msw/spinctrl.h
index 1034191b6d05d3726e943a77b4bb99308fe986bf..e5687d075c6648e8fc49a48d20765500bb6061c4 100644 (file)
--- a/include/wx/msw/spinctrl.h
+++ b/include/wx/msw/spinctrl.h
@@ -21,7 +21,7 @@
 #include "wx/dynarray.h"
 
 class WXDLLEXPORT wxSpinCtrl;
 #include "wx/dynarray.h"
 
 class WXDLLEXPORT wxSpinCtrl;

-WX_DEFINE_EXPORTED_ARRAY_NO_PTR(wxSpinCtrl *, wxArraySpins);
+WX_DEFINE_EXPORTED_ARRAY_PTR(wxSpinCtrl *, wxArraySpins);

 
 // ----------------------------------------------------------------------------
 // Under Win32, wxSpinCtrl is a wxSpinButton with a buddy (as MSDN docs call
 
 // ----------------------------------------------------------------------------
 // Under Win32, wxSpinCtrl is a wxSpinButton with a buddy (as MSDN docs call


@@ -35,7 +35,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 +47,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 +72,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(); }