Use _UNICODE instead of UNICODE in wx/msw/winundef.h.

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

diff --git a/include/wx/os2/spinctrl.h b/include/wx/os2/spinctrl.h
index 4c39c123c7160c4f5535c938cacfafc8eb7cd23a..3b666a6452e9a146a7e5608bc1a0dd320e9d158b 100644 (file)
--- a/include/wx/os2/spinctrl.h
+++ b/include/wx/os2/spinctrl.h
@@ -14,8 +14,8 @@
 
 #include "wx/spinbutt.h"    // the base class
 #include "wx/dynarray.h"
 
 #include "wx/spinbutt.h"    // the base class
 #include "wx/dynarray.h"

-class WXDLLEXPORT wxSpinCtrl;
-WX_DEFINE_EXPORTED_ARRAY(wxSpinCtrl *, wxArraySpins);
+class WXDLLIMPEXP_FWD_CORE wxSpinCtrl;
+WX_DEFINE_EXPORTED_ARRAY_PTR(wxSpinCtrl *, wxArraySpins);

 
 // ----------------------------------------------------------------------------
 // Under Win32 and OS2 PM, wxSpinCtrl is a wxSpinButton with a buddy
 
 // ----------------------------------------------------------------------------
 // Under Win32 and OS2 PM, wxSpinCtrl is a wxSpinButton with a buddy


@@ -23,12 +23,12 @@ WX_DEFINE_EXPORTED_ARRAY(wxSpinCtrl *, wxArraySpins);
 // control is clicked.
 // ----------------------------------------------------------------------------
 
 // control is clicked.
 // ----------------------------------------------------------------------------
 

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

 {
 public:
     wxSpinCtrl() { }
     wxSpinCtrl( wxWindow*       pParent
 {
 public:
     wxSpinCtrl() { }
     wxSpinCtrl( wxWindow*       pParent

-               ,wxWindowID      vId = -1
+               ,wxWindowID      vId = wxID_ANY

                ,const wxString& rsValue = wxEmptyString
                ,const wxPoint&  rPos = wxDefaultPosition
                ,const wxSize&   rSize = wxDefaultSize
                ,const wxString& rsValue = wxEmptyString
                ,const wxPoint&  rPos = wxDefaultPosition
                ,const wxSize&   rSize = wxDefaultSize


@@ -36,7 +36,7 @@ public:
                ,int             nMin = 0
                ,int             nMax = 100
                ,int             nInitial = 0
                ,int             nMin = 0
                ,int             nMax = 100
                ,int             nInitial = 0

-               ,const wxString& rsName = _T("wxSpinCtrl")
+               ,const wxString& rsName = wxT("wxSpinCtrl")

               )
     {
         Create(pParent, vId, rsValue, rPos, rSize, lStyle, nMin, nMax, nInitial, rsName);
               )
     {
         Create(pParent, vId, rsValue, rPos, rSize, lStyle, nMin, nMax, nInitial, rsName);


@@ -44,7 +44,7 @@ public:
     virtual ~wxSpinCtrl();
 
     bool Create(wxWindow*       pParent
     virtual ~wxSpinCtrl();
 
     bool Create(wxWindow*       pParent

-               ,wxWindowID      vId = -1
+               ,wxWindowID      vId = wxID_ANY

                ,const wxString& rsValue = wxEmptyString
                ,const wxPoint&  rPos = wxDefaultPosition
                ,const wxSize&   rSize = wxDefaultSize
                ,const wxString& rsValue = wxEmptyString
                ,const wxPoint&  rPos = wxDefaultPosition
                ,const wxSize&   rSize = wxDefaultSize


@@ -52,7 +52,7 @@ public:
                ,int             nMin = 0
                ,int             nMax = 100
                ,int             nInitial = 0
                ,int             nMin = 0
                ,int             nMax = 100
                ,int             nInitial = 0

-               ,const wxString& rsName = _T("wxSpinCtrl")
+               ,const wxString& rsName = wxT("wxSpinCtrl")

               );
 
     //
               );
 
     //


@@ -65,20 +65,23 @@ public:
     // implementation only from now on
     // -------------------------------
     //
     // implementation only from now on
     // -------------------------------
     //

-    virtual        bool Enable(bool bEnable = TRUE);
+    virtual bool Enable(bool bEnable = true);

 
 

-           virtual int  GetValue(void) const;
+    virtual int  GetValue(void) const;
+
+    virtual bool SetFont(const wxFont &rFont);
+    virtual void SetFocus(void);

 
 

-           virtual bool SetFont(const wxFont &rFont);
-           virtual void SetFocus(void);

     inline virtual void SetValue(int nVal) { wxSpinButton::SetValue(nVal); }
 
     inline virtual void SetValue(int nVal) { wxSpinButton::SetValue(nVal); }
 

-           virtual bool Show(bool bShow = TRUE);
+    void SetSelection(long lFrom, long lTo);
+
+    virtual bool Show(bool bShow = true);

 
     //
     // wxSpinButton doesn't accept focus, but we do
     //
 
     //
     // wxSpinButton doesn't accept focus, but we do
     //

-    inline virtual bool AcceptsFocus(void) const { return FALSE; }
+    inline virtual bool AcceptsFocus(void) const { return false; }

 
     //
     // Return the spinctrl object whose buddy is the given window or NULL
 
     //
     // Return the spinctrl object whose buddy is the given window or NULL


@@ -112,6 +115,7 @@ protected:
     //
     void OnSpinChange(wxSpinEvent& rEvent);
     void OnChar(wxKeyEvent& rEvent);
     //
     void OnSpinChange(wxSpinEvent& rEvent);
     void OnChar(wxKeyEvent& rEvent);

+    void OnSetFocus(wxFocusEvent& rEvent);

 
     WXHWND                          m_hWndBuddy;
     static wxArraySpins             m_svAllSpins;
 
     WXHWND                          m_hWndBuddy;
     static wxArraySpins             m_svAllSpins;


@@ -122,5 +126,3 @@ private:
 }; // end of CLASS wxSpinCtrl
 
 #endif // _WX_MSW_SPINCTRL_H_
 }; // end of CLASS wxSpinCtrl
 
 #endif // _WX_MSW_SPINCTRL_H_

-
-