we need our own implementation because in wxmac wxIcon does not inherit from wxBitmap...

[wxWidgets.git] / src / os2 / spinctrl.cpp

diff --git a/src/os2/spinctrl.cpp b/src/os2/spinctrl.cpp
index 8d3cdeebde47be5d01425634d55e62eb0cd47da8..7a05daa6356a6e5aba5e2b3b1e32604d48ea1db0 100644 (file)
--- a/src/os2/spinctrl.cpp
+++ b/src/os2/spinctrl.cpp
@@ -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

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -31,7 +31,7 @@
     #include "wx/wx.h"
 #endif
 
     #include "wx/wx.h"
 #endif
 

-#if wxUSE_SPINBTN
+#if wxUSE_SPINCTRL

 
 #include "wx/spinctrl.h"
 #include "wx/os2/private.h"
 
 #include "wx/spinctrl.h"
 #include "wx/os2/private.h"


@@ -50,7 +50,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl, wxControl)
 
 BEGIN_EVENT_TABLE(wxSpinCtrl, wxSpinButton)
     EVT_CHAR(wxSpinCtrl::OnChar)
 
 BEGIN_EVENT_TABLE(wxSpinCtrl, wxSpinButton)
     EVT_CHAR(wxSpinCtrl::OnChar)

-    EVT_SPIN(-1, wxSpinCtrl::OnSpinChange)
+    EVT_SPIN(wxID_ANY, wxSpinCtrl::OnSpinChange)

     EVT_SET_FOCUS(wxSpinCtrl::OnSetFocus)
 END_EVENT_TABLE()
 // ----------------------------------------------------------------------------
     EVT_SET_FOCUS(wxSpinCtrl::OnSetFocus)
 END_EVENT_TABLE()
 // ----------------------------------------------------------------------------


@@ -132,7 +132,7 @@ bool wxSpinCtrl::Create(
 {
     SWP                             vSwp;
 
 {
     SWP                             vSwp;
 

-    if (vId == -1)
+    if (vId == wxID_ANY)

         m_windowId = NewControlId();
     else
         m_windowId = vId;
         m_windowId = NewControlId();
     else
         m_windowId = vId;


@@ -174,7 +174,7 @@ bool wxSpinCtrl::Create(
                                       );
     if (m_hWnd == 0)
     {
                                       );
     if (m_hWnd == 0)
     {

-        return FALSE;
+        return false;

     }
     m_hWndBuddy = m_hWnd; // One in the same for OS/2
     if(pParent)
     }
     m_hWndBuddy = m_hWnd; // One in the same for OS/2
     if(pParent)


@@ -207,20 +207,21 @@ bool wxSpinCtrl::Create(
     fnWndProcSpinCtrl = (WXFARPROC)::WinSubclassWindow(m_hWnd, (PFNWP)wxSpinCtrlWndProc);
     m_svAllSpins.Add(this);
     delete pTextFont;
     fnWndProcSpinCtrl = (WXFARPROC)::WinSubclassWindow(m_hWnd, (PFNWP)wxSpinCtrlWndProc);
     m_svAllSpins.Add(this);
     delete pTextFont;

-    return TRUE;
+    return true;

 } // end of wxSpinCtrl::Create
 
 wxSize wxSpinCtrl::DoGetBestSize() const
 {
     wxSize                          vSizeBtn = wxSpinButton::DoGetBestSize();
     int                             nHeight;
 } // end of wxSpinCtrl::Create
 
 wxSize wxSpinCtrl::DoGetBestSize() const
 {
     wxSize                          vSizeBtn = wxSpinButton::DoGetBestSize();
     int                             nHeight;

+    wxFont                          vFont = (wxFont)GetFont();

 
     vSizeBtn.x += DEFAULT_ITEM_WIDTH + MARGIN_BETWEEN;
 
     wxGetCharSize( GetHWND()
                   ,NULL
                   ,&nHeight
 
     vSizeBtn.x += DEFAULT_ITEM_WIDTH + MARGIN_BETWEEN;
 
     wxGetCharSize( GetHWND()
                   ,NULL
                   ,&nHeight

-                  ,(wxFont*)&GetFont()
+                  ,&vFont

                  );
     nHeight = EDIT_HEIGHT_FROM_CHAR_HEIGHT(nHeight);
 
                  );
     nHeight = EDIT_HEIGHT_FROM_CHAR_HEIGHT(nHeight);
 


@@ -301,10 +302,10 @@ bool wxSpinCtrl::Enable(
 {
     if (!wxControl::Enable(bEnable))
     {
 {
     if (!wxControl::Enable(bEnable))
     {

-        return FALSE;
+        return false;

     }
     ::WinEnableWindow(GetHwnd(), bEnable);
     }
     ::WinEnableWindow(GetHwnd(), bEnable);

-    return TRUE;
+    return true;

 } // end of wxSpinCtrl::Enable
 
 wxSpinCtrl* wxSpinCtrl::GetSpinForTextCtrl(
 } // end of wxSpinCtrl::Enable
 
 wxSpinCtrl* wxSpinCtrl::GetSpinForTextCtrl(


@@ -455,7 +456,7 @@ bool wxSpinCtrl::ProcessTextCommand(
     //
     // Not processed
     //
     //
     // Not processed
     //

-    return FALSE;
+    return false;

 } // end of wxSpinCtrl::ProcessTextCommand
 
 void wxSpinCtrl::SetFocus()
 } // end of wxSpinCtrl::ProcessTextCommand
 
 void wxSpinCtrl::SetFocus()


@@ -470,13 +471,13 @@ bool wxSpinCtrl::SetFont(
     if (!wxWindowBase::SetFont(rFont))
     {
         // nothing to do
     if (!wxWindowBase::SetFont(rFont))
     {
         // nothing to do

-        return FALSE;
+        return false;

     }
 
     wxOS2SetFont( m_hWnd
                  ,rFont
                 );
     }
 
     wxOS2SetFont( m_hWnd
                  ,rFont
                 );

-    return TRUE;
+    return true;

 } // end of wxSpinCtrl::SetFont
 
 void wxSpinCtrl::SetValue(
 } // end of wxSpinCtrl::SetFont
 
 void wxSpinCtrl::SetValue(


@@ -495,9 +496,9 @@ bool wxSpinCtrl::Show(
 {
     if (!wxControl::Show(bShow))
     {
 {
     if (!wxControl::Show(bShow))
     {

-        return FALSE;
+        return false;

     }
     }

-    return TRUE;
+    return true;

 } // end of wxSpinCtrl::Show
 
 void wxSpinCtrl::SetSelection (
 } // end of wxSpinCtrl::Show
 
 void wxSpinCtrl::SetSelection (


@@ -516,4 +517,4 @@ void wxSpinCtrl::SetSelection (
     ::WinSendMsg(m_hWnd, EM_SETSEL, MPFROM2SHORT((USHORT)lFrom, (USHORT)lTo), (MPARAM)0);
 } // end of wxSpinCtrl::SetSelection
 
     ::WinSendMsg(m_hWnd, EM_SETSEL, MPFROM2SHORT((USHORT)lFrom, (USHORT)lTo), (MPARAM)0);
 } // end of wxSpinCtrl::SetSelection
 

-#endif //wxUSE_SPINBTN
+#endif //wxUSE_SPINCTRL