changed background color reference from light gray to assigned bkgd color

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

diff --git a/src/os2/spinctrl.cpp b/src/os2/spinctrl.cpp
index d526cfa43f47d5f62ef667e6eb06866319cc15c6..9b9ca7ada70cda3fa0a0b0f97d5af820cacb6ae7 100644 (file)
--- a/src/os2/spinctrl.cpp
+++ b/src/os2/spinctrl.cpp
@@ -13,12 +13,6 @@
 // declarations
 // ============================================================================
 
 // declarations
 // ============================================================================
 

-
-#ifdef __GNUG__
-    #pragma implementation "spinctrlbase.h"
-    #pragma implementation "spinctrl.h"
-#endif
-

 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------


@@ -31,7 +25,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"


@@ -49,7 +43,9 @@ wxArraySpins                        wxSpinCtrl::m_svAllSpins;
 IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl, wxControl)
 
 BEGIN_EVENT_TABLE(wxSpinCtrl, wxSpinButton)
 IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl, wxControl)
 
 BEGIN_EVENT_TABLE(wxSpinCtrl, wxSpinButton)

-    EVT_SPIN(-1, wxSpinCtrl::OnSpinChange)
+    EVT_CHAR(wxSpinCtrl::OnChar)
+    EVT_SPIN(wxID_ANY, wxSpinCtrl::OnSpinChange)
+    EVT_SET_FOCUS(wxSpinCtrl::OnSetFocus)

 END_EVENT_TABLE()
 // ----------------------------------------------------------------------------
 // constants
 END_EVENT_TABLE()
 // ----------------------------------------------------------------------------
 // constants


@@ -71,8 +67,7 @@ MRESULT EXPENTRY wxSpinCtrlWndProc(
     wxSpinCtrl*                    pSpin = (wxSpinCtrl *)::WinQueryWindowULong( hWnd
                                                                                ,QWL_USER
                                                                               );
     wxSpinCtrl*                    pSpin = (wxSpinCtrl *)::WinQueryWindowULong( hWnd
                                                                                ,QWL_USER
                                                                               );

-    bool                            bProccesed = FALSE;
-    MRESULT                         rc = (MRESULT)0;
+

     //
     // Forward some messages (the key ones only so far) to the spin ctrl
     //
     //
     // Forward some messages (the key ones only so far) to the spin ctrl
     //


@@ -116,22 +111,20 @@ wxSpinCtrl::~wxSpinCtrl()
 // construction
 // ----------------------------------------------------------------------------
 
 // construction
 // ----------------------------------------------------------------------------
 

-bool wxSpinCtrl::Create(
-  wxWindow*                         pParent
-, wxWindowID                        vId
-, const wxString&                   rsValue
-, const wxPoint&                    rPos
-, const wxSize&                     rSize
-, long                              lStyle
-, int                               nMin
-, int                               nMax
-, int                               nInitial
-, const wxString&                   rsName
-)
+bool wxSpinCtrl::Create( wxWindow*       pParent,
+                         wxWindowID      vId,
+                         const wxString& WXUNUSED(rsValue),
+                         const wxPoint&  rPos,
+                         const wxSize&   rSize,
+                         long            lStyle,
+                         int             nMin,
+                         int             nMax,
+                         int             nInitial,
+                         const wxString& rsName )

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


@@ -173,7 +166,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)


@@ -206,20 +199,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);
 


@@ -300,10 +294,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(


@@ -345,7 +339,7 @@ void wxSpinCtrl::OnChar (
   wxKeyEvent&                       rEvent
 )
 {
   wxKeyEvent&                       rEvent
 )
 {

-    switch (rEvent.KeyCode())
+    switch (rEvent.GetKeyCode())

     {
         case WXK_RETURN:
             {
     {
         case WXK_RETURN:
             {


@@ -355,7 +349,7 @@ void wxSpinCtrl::OnChar (
                 wxString                    sVal = wxGetWindowText(m_hWndBuddy);
 
                 InitCommandEvent(vEvent);
                 wxString                    sVal = wxGetWindowText(m_hWndBuddy);
 
                 InitCommandEvent(vEvent);

-                vEvent.SetString((char*)sVal.c_str());
+                vEvent.SetString(sVal);

                 vEvent.SetInt(GetValue());
                 if (GetEventHandler()->ProcessEvent(vEvent))
                     return;
                 vEvent.SetInt(GetValue());
                 if (GetEventHandler()->ProcessEvent(vEvent))
                     return;


@@ -404,23 +398,31 @@ void wxSpinCtrl::OnSpinChange(
     }
 } // end of wxSpinCtrl::OnSpinChange
 
     }
 } // end of wxSpinCtrl::OnSpinChange
 

-bool wxSpinCtrl::ProcessTextCommand(
-  WXWORD                            wCmd
-, WXWORD                            wId
+void wxSpinCtrl::OnSetFocus (
+  wxFocusEvent&                     rEvent

 )
 )

+{
+    //
+    // When we get focus, give it to our buddy window as it needs it more than
+    // we do
+    //
+    ::WinSetFocus(HWND_DESKTOP, (HWND)m_hWndBuddy);
+    rEvent.Skip();
+} // end of wxSpinCtrl::OnSetFocus
+
+bool wxSpinCtrl::ProcessTextCommand( WXWORD wCmd,
+                                     WXWORD WXUNUSED(wId) )

 {
     switch (wCmd)
     {
         case SPBN_CHANGE:
         {
 {
     switch (wCmd)
     {
         case SPBN_CHANGE:
         {

-            wxCommandEvent          vEvent( wxEVT_COMMAND_TEXT_UPDATED
-                                           ,GetId()
-                                          );
+            wxCommandEvent vEvent( wxEVT_COMMAND_TEXT_UPDATED, GetId() );

             vEvent.SetEventObject(this);
 
             vEvent.SetEventObject(this);
 

-            wxString                sVal = wxGetWindowText(m_hWndBuddy);
+            wxString sVal = wxGetWindowText(m_hWndBuddy);

 
 

-            vEvent.SetString((char*)sVal.c_str());
+            vEvent.SetString(sVal);

             vEvent.SetInt(GetValue());
             return (GetEventHandler()->ProcessEvent(vEvent));
         }
             vEvent.SetInt(GetValue());
             return (GetEventHandler()->ProcessEvent(vEvent));
         }


@@ -428,9 +430,9 @@ bool wxSpinCtrl::ProcessTextCommand(
         case SPBN_SETFOCUS:
         case SPBN_KILLFOCUS:
         {
         case SPBN_SETFOCUS:
         case SPBN_KILLFOCUS:
         {

-            wxFocusEvent                vEvent( wCmd == EN_KILLFOCUS ? wxEVT_KILL_FOCUS : wxEVT_SET_FOCUS
-                                               ,m_windowId
-                                              );
+            wxFocusEvent vEvent( wCmd == EN_KILLFOCUS ? wxEVT_KILL_FOCUS : wxEVT_SET_FOCUS
+                                ,m_windowId
+                               );

 
             vEvent.SetEventObject(this);
             return(GetEventHandler()->ProcessEvent(vEvent));
 
             vEvent.SetEventObject(this);
             return(GetEventHandler()->ProcessEvent(vEvent));


@@ -442,7 +444,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()


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

-        return FALSE;
+        return false;

     }
 
     }
 

-    WXHANDLE                        hFont = GetFont().GetResourceHandle();

     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(


@@ -473,7 +474,7 @@ void wxSpinCtrl::SetValue(
 {
     long                            lVal;
 
 {
     long                            lVal;
 

-    lVal = atol(rsText.c_str());
+    lVal = atol((char*)rsText.c_str());

     wxSpinButton::SetValue(lVal);
 } // end of wxSpinCtrl::SetValue
 
     wxSpinButton::SetValue(lVal);
 } // end of wxSpinCtrl::SetValue
 


@@ -483,9 +484,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 (


@@ -494,7 +495,7 @@ void wxSpinCtrl::SetSelection (
 )
 {
     //
 )
 {
     //

-    // If from and to are both -1, it means (in wxWindows) that all text should
+    // If from and to are both -1, it means (in wxWidgets) that all text should

     // be selected - translate into Windows convention
     //
     if ((lFrom == -1) && (lTo == -1))
     // be selected - translate into Windows convention
     //
     if ((lFrom == -1) && (lTo == -1))


@@ -504,4 +505,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