Corrected/added support for column headers with icon and text

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

diff --git a/include/wx/os2/spinctrl.h b/include/wx/os2/spinctrl.h
index bc1973af98a0633e9e4d5f7134a535f210777ac9..1b37a27fd2d9c4e6cc26b4e648eb17c66c3d1787 100644 (file)
--- a/include/wx/os2/spinctrl.h
+++ b/include/wx/os2/spinctrl.h
@@ -6,7 +6,7 @@
 // Created:     10/15/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
 // Created:     10/15/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster

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

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MSW_SPINCTRL_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MSW_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


@@ -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


@@ -65,23 +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); }

-                   void SetSelection( long lFrom
-                                     ,long lTo
-                                    );

 
 

-           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


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

-
-