added operator=(unsigned int) overload (should help djgpp compilation)

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

diff --git a/include/wx/msw/spinctrl.h b/include/wx/msw/spinctrl.h
index 5d4d2824a25fcf3207da78f96f412d0977e643b4..b58f818c74b3bc527ed9ba28d46c109c311f4ffa 100644 (file)
--- a/include/wx/msw/spinctrl.h
+++ b/include/wx/msw/spinctrl.h
@@ -12,16 +12,14 @@
 #ifndef _WX_MSW_SPINCTRL_H_
 #define _WX_MSW_SPINCTRL_H_
 
 #ifndef _WX_MSW_SPINCTRL_H_
 #define _WX_MSW_SPINCTRL_H_
 

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

 #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;

-WX_DEFINE_EXPORTED_ARRAY(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 +33,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 +45,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 +70,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(); }


@@ -94,12 +92,17 @@ protected:
     virtual void DoMoveWindow(int x, int y, int width, int height);
     virtual wxSize DoGetBestSize() const;
     virtual void DoGetSize(int *width, int *height) const;
     virtual void DoMoveWindow(int x, int y, int width, int height);
     virtual wxSize DoGetBestSize() const;
     virtual void DoGetSize(int *width, int *height) const;

+#if wxUSE_TOOLTIPS
+    virtual void DoSetToolTip( wxToolTip *tip );
+#endif // wxUSE_TOOLTIPS

 
     // the handler for wxSpinButton events
     void OnSpinChange(wxSpinEvent& event);
 
     // Handle processing of special keys
     void OnChar(wxKeyEvent& event);
 
     // the handler for wxSpinButton events
     void OnSpinChange(wxSpinEvent& event);
 
     // Handle processing of special keys
     void OnChar(wxKeyEvent& event);

+    void OnSetFocus(wxFocusEvent& event);
+    void OnKillFocus(wxFocusEvent& event);

 
     // the data for the "buddy" text ctrl
     WXHWND     m_hwndBuddy;
 
     // the data for the "buddy" text ctrl
     WXHWND     m_hwndBuddy;


@@ -115,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_