A few tweaks and cleanups

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

diff --git a/src/os2/spinctrl.cpp b/src/os2/spinctrl.cpp
index edfa2468f36426c9b63d8811b558ca613c220dd0..8c2735901ef9b6ba91f8dceeea7e244240134bb4 100644 (file)
--- a/src/os2/spinctrl.cpp
+++ b/src/os2/spinctrl.cpp
@@ -31,6 +31,8 @@
     #include "wx/wx.h"
 #endif
 
     #include "wx/wx.h"
 #endif
 

+#if wxUSE_SPINBTN
+

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


@@ -38,6 +40,12 @@
 // macros
 // ----------------------------------------------------------------------------
 
 // macros
 // ----------------------------------------------------------------------------
 

+extern void  wxAssociateWinWithHandle( HWND         hWnd
+                                      ,wxWindowOS2* pWin
+                                     );
+static WXFARPROC fnWndProcSpinCtrl = (WXFARPROC)NULL;
+wxArraySpins                        wxSpinCtrl::m_svAllSpins;
+

 IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl, wxControl)
 
 BEGIN_EVENT_TABLE(wxSpinCtrl, wxSpinButton)
 IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl, wxControl)
 
 BEGIN_EVENT_TABLE(wxSpinCtrl, wxSpinButton)


@@ -53,242 +61,431 @@ static const int MARGIN_BETWEEN = 5;
 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================

+MRESULT EXPENTRY wxSpinCtrlWndProc(
+  HWND                              hWnd
+, UINT                              uMessage
+, MPARAM                            wParam
+, MPARAM                            lParam
+)
+{
+    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
+    //
+    switch (uMessage )
+    {
+        case WM_CHAR:
+            pSpin->OS2WindowProc( uMessage
+                                 ,wParam
+                                 ,lParam
+                                );
+
+            //
+            // The control may have been deleted at this point, so check.
+            //
+            if (!(::WinIsWindow(vHabmain, hWnd) && ((wxSpinCtrl *)::WinQueryWindowULong( hWnd
+                                                                                        ,QWL_USER
+                                                                                       )
+                                                   ) == pSpin))
+                return 0;
+            break;
+
+    }
+    return (fnWndProcSpinCtrl( hWnd
+                              ,(ULONG)uMessage
+                              ,(MPARAM)wParam
+                              ,(MPARAM)lParam
+                             )
+           );
+} // end of wxSpinCtrlWndProc
+
+wxSpinCtrl::~wxSpinCtrl()
+{
+    m_svAllSpins.Remove(this);
+
+    // This removes spurious memory leak reporting
+    if (m_svAllSpins.GetCount() == 0)
+        m_svAllSpins.Clear();
+} // end of wxSpinCtrl::~wxSpinCtrl

 
 // ----------------------------------------------------------------------------
 // construction
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // construction
 // ----------------------------------------------------------------------------
 

-bool wxSpinCtrl::Create(wxWindow *parent,
-                        wxWindowID id,
-                        const wxString& value,
-                        const wxPoint& pos,
-                        const wxSize& size,
-                        long style,
-                        int min, int max, int initial,
-                        const wxString& name)
+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
+)

 {
 {

-    // TODO:
-/*
-    // before using DoGetBestSize(), have to set style to let the base class
-    // know whether this is a horizontal or vertical control (we're always
-    // vertical)
-    style |= wxSP_VERTICAL;
-    SetWindowStyle(style);
-
-    // calculate the sizes: the size given is the toal size for both controls
-    // and we need to fit them both in the given width (height is the same)
-    wxSize sizeText(size), sizeBtn(size);
-    sizeBtn.x = wxSpinButton::DoGetBestSize().x;
-    if ( sizeText.x <= 0 )
+    SWP                             vSwp;
+
+    if (vId == -1)
+        m_windowId = NewControlId();
+    else
+        m_windowId = vId;
+    m_backgroundColour = pParent->GetBackgroundColour();
+    m_foregroundColour = pParent->GetForegroundColour();
+    SetName(rsName);
+    SetParent(pParent);
+    m_windowStyle      = lStyle;
+
+    int                             lSstyle = 0L;
+
+    lSstyle = WS_VISIBLE      |
+              WS_TABSTOP      |
+              SPBS_MASTER     | // We use only single field spin buttons
+              SPBS_NUMERICONLY; // We default to numeric data
+
+    if (m_windowStyle & wxCLIP_SIBLINGS )
+        lSstyle |= WS_CLIPSIBLINGS;
+
+    SPBCDATA                        vCtrlData;
+
+    vCtrlData.cbSize = sizeof(SPBCDATA);
+    vCtrlData.ulTextLimit = 10L;
+    vCtrlData.lLowerLimit = 0L;
+    vCtrlData.lUpperLimit = 100L;
+    vCtrlData.idMasterSpb = vId;
+    vCtrlData.pHWXCtlData = NULL;
+
+    m_hWnd = (WXHWND)::WinCreateWindow( GetWinHwnd(pParent)
+                                       ,WC_SPINBUTTON
+                                       ,(PSZ)NULL
+                                       ,lSstyle
+                                       ,0L, 0L, 0L, 0L
+                                       ,GetWinHwnd(pParent)
+                                       ,HWND_TOP
+                                       ,(HMENU)vId
+                                       ,(PVOID)&vCtrlData
+                                       ,NULL
+                                      );
+    if (m_hWnd == 0)

     {
     {

-        // DEFAULT_ITEM_WIDTH is the default width for the text control
-        sizeText.x = DEFAULT_ITEM_WIDTH + MARGIN_BETWEEN + sizeBtn.x;
+        return FALSE;

     }
     }

+    m_hWndBuddy = m_hWnd; // One in the same for OS/2
+    if(pParent)
+        pParent->AddChild((wxSpinButton *)this);
+    wxFont*                          pTextFont = new wxFont( 10
+                                                            ,wxMODERN
+                                                            ,wxNORMAL
+                                                            ,wxNORMAL
+                                                           );
+    SetFont(*pTextFont);
+    ::WinQueryWindowPos(m_hWnd, &vSwp);
+    SetXComp(vSwp.x);
+    SetYComp(vSwp.y);
+    SetSize( rPos.x
+            ,rPos.y
+            ,rSize.x
+            ,rSize.y
+           );
+
+    SetRange(nMin, nMax);
+    SetValue(nInitial);
+
+    //
+    // For OS/2 we'll just set our handle into our long data
+    //
+    wxAssociateWinWithHandle( m_hWnd
+                             ,(wxWindowOS2*)this
+                            );
+    ::WinSetWindowULong(GetHwnd(), QWL_USER, (LONG)this);
+    fnWndProcSpinCtrl = (WXFARPROC)::WinSubclassWindow(m_hWnd, (PFNWP)wxSpinCtrlWndProc);
+    m_svAllSpins.Add(this);
+    delete pTextFont;
+    return TRUE;
+} // end of wxSpinCtrl::Create

 
 

-    sizeText.x -= sizeBtn.x + MARGIN_BETWEEN;
-    if ( sizeText.x <= 0 )
-    {
-        wxLogDebug(_T("not enough space for wxSpinCtrl!"));
-    }
+wxSize wxSpinCtrl::DoGetBestSize() const
+{
+    wxSize                          vSizeBtn = wxSpinButton::DoGetBestSize();
+    int                             nHeight;

 
 

-    wxPoint posBtn(pos);
-    posBtn.x += sizeText.x + MARGIN_BETWEEN;
+    vSizeBtn.x += DEFAULT_ITEM_WIDTH + MARGIN_BETWEEN;

 
 

-    // create the spin button
-    if ( !wxSpinButton::Create(parent, id, posBtn, sizeBtn, style, name) )
-    {
-        return FALSE;
-    }
+    wxGetCharSize( GetHWND()
+                  ,NULL
+                  ,&nHeight
+                  ,(wxFont*)&GetFont()
+                 );
+    nHeight = EDIT_HEIGHT_FROM_CHAR_HEIGHT(nHeight);

 
 

-    SetRange(min, max);
-    SetValue(initial);
-
-    // create the text window
-    m_hwndBuddy = (WXHWND)::CreateWindowEx
-                    (
-                     WS_EX_CLIENTEDGE,       // sunken border
-                     _T("EDIT"),             // window class
-                     NULL,                   // no window title
-                     WS_CHILD | WS_BORDER,   // style (will be shown later)
-                     pos.x, pos.y,           // position
-                     0, 0,                   // size (will be set later)
-                     GetHwndOf(parent),      // parent
-                     (HMENU)-1,              // control id
-                     wxGetInstance(),        // app instance
-                     NULL                    // unused client data
-                    );
-
-    if ( !m_hwndBuddy )
+    if (vSizeBtn.y < nHeight)

     {
     {

-        wxLogLastError("CreateWindow(buddy text window)");
-
-        return FALSE;
+        //
+        // Make the text tall enough
+        //
+        vSizeBtn.y = nHeight;

     }
     }

+    return vSizeBtn;
+} // end of wxSpinCtrl::DoGetBestSize

 
 

-    // should have the same font as the other controls
-    SetFont(GetParent()->GetFont());
+void wxSpinCtrl::DoGetPosition(
+  int*                              pnX
+, int*                              pnY
+) const
+{
+    WXHWND                          hWnd = GetHWND();
+
+    wxConstCast(this, wxSpinCtrl)->m_hWnd = m_hWndBuddy;
+    wxSpinButton::DoGetPosition( pnX
+                                ,pnY
+                               );
+    wxConstCast(this, wxSpinCtrl)->m_hWnd = hWnd;
+} // end of wxpinCtrl::DoGetPosition
+
+void wxSpinCtrl::DoGetSize(
+  int*                              pnWidth
+, int*                              pnHeight
+) const
+{
+    RECTL                           vSpinrect;
+
+    ::WinQueryWindowRect(GetHwnd(), &vSpinrect);
+
+    if (pnWidth)
+        *pnWidth = vSpinrect.xRight - vSpinrect.xLeft;
+    if (pnHeight)
+        *pnHeight = vSpinrect.yTop - vSpinrect.yBottom;
+} // end of wxSpinCtrl::DoGetSize
+
+void wxSpinCtrl::DoMoveWindow(
+  int                               nX
+, int                               nY
+, int                               nWidth
+, int                               nHeight
+)
+{
+    wxWindowOS2*                    pParent = (wxWindowOS2*)GetParent();

 
 

-    // set the size of the text window - can do it only now, because we
-    // couldn't call DoGetBestSize() before as font wasn't set
-    if ( sizeText.y <= 0 )
+    if (pParent)

     {
     {

-        int cx, cy;
-        wxGetCharSize(GetHWND(), &cx, &cy, &GetFont());
+        int                         nOS2Height = GetOS2ParentHeight(pParent);

 
 

-        sizeText.y = EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy);
+        nY = nOS2Height - (nY + nHeight);

     }
     }

-
-    DoMoveWindow(pos.x, pos.y,
-                 sizeText.x + sizeBtn.x + MARGIN_BETWEEN, sizeText.y);
-
-    (void)::ShowWindow((HWND)m_hwndBuddy, SW_SHOW);
-
-    // associate the text window with the spin button
-    (void)::SendMessage(GetHwnd(), UDM_SETBUDDY, (WPARAM)m_hwndBuddy, 0);
-
-    if ( !value.IsEmpty() )
+    else

     {
     {

-        SetValue(value);
-    }
-*/
-    return FALSE;
-}
-
-// ----------------------------------------------------------------------------
-// wxTextCtrl-like methods
-// ----------------------------------------------------------------------------
+        RECTL                       vRect;

 
 

-void wxSpinCtrl::SetValue(const wxString& text)
+        ::WinQueryWindowRect(HWND_DESKTOP, &vRect);
+        nY = vRect.yTop - (nY + nHeight);
+    }
+    ::WinSetWindowPos( GetHwnd()
+                      ,HWND_TOP
+                      ,nX
+                      ,nY
+                      ,nWidth
+                      ,nHeight
+                      ,SWP_SIZE | SWP_MOVE | SWP_ZORDER | SWP_SHOW
+                     );
+} // end of wxSpinCtrl::DoMoveWindow
+
+bool wxSpinCtrl::Enable(
+  bool                              bEnable
+)

 {
 {

-    // TODO:
-    /*
-    if ( !::SetWindowText((HWND)m_hwndBuddy, text.c_str()) )
+    if (!wxControl::Enable(bEnable))

     {
     {

-        wxLogLastError("SetWindowText(buddy)");
+        return FALSE;

     }
     }

-    */
-}
+    ::WinEnableWindow(GetHwnd(), bEnable);
+    return TRUE;
+} // end of wxSpinCtrl::Enable

 
 

-int wxSpinCtrl::GetValue() const
+wxSpinCtrl* wxSpinCtrl::GetSpinForTextCtrl(
+  WXHWND                            hWndBuddy
+)

 {
 {

-    wxString val = wxGetWindowText(m_hwndBuddy);
+    wxSpinCtrl*                     pSpin = (wxSpinCtrl *)::WinQueryWindowULong( (HWND)hWndBuddy
+                                                                                ,QWL_USER
+                                                                               );
+    int                             i = m_svAllSpins.Index(pSpin);

 
 

-    long n;
-    if ( (wxSscanf(val, wxT("%lu"), &n) != 1) )
-        n = INT_MIN;
+    if (i == wxNOT_FOUND)
+        return NULL;

 
 

-    return n;
-}
+    // sanity check
+    wxASSERT_MSG( pSpin->m_hWndBuddy == hWndBuddy,
+                  _T("wxSpinCtrl has incorrect buddy HWND!") );

 
 

-// ----------------------------------------------------------------------------
-// forward some methods to subcontrols
-// ----------------------------------------------------------------------------
+    return pSpin;
+} // end of wxSpinCtrl::GetSpinForTextCtrl

 
 

-bool wxSpinCtrl::SetFont(const wxFont& font)
+int wxSpinCtrl::GetValue() const
+{
+    long                            lVal = 0L;
+    char                            zVal[10];
+
+    ::WinSendMsg( GetHwnd()
+                 ,SPBM_QUERYVALUE
+                 ,MPFROMP(zVal)
+                 ,MPFROM2SHORT( (USHORT)10
+                               ,SPBQ_UPDATEIFVALID
+                              )
+                );
+    lVal - atol(zVal);
+    return lVal;
+} // end of wxSpinCtrl::GetValue
+
+void wxSpinCtrl::OnChar (
+  wxKeyEvent&                       rEvent
+)

 {
 {

-    if ( !wxWindowBase::SetFont(font) )
+    switch (rEvent.KeyCode())

     {
     {

-        // nothing to do
-        return FALSE;
+        case WXK_RETURN:
+            {
+                wxCommandEvent              vEvent( wxEVT_COMMAND_TEXT_ENTER
+                                                   ,m_windowId
+                                                  );
+                wxString                    sVal = wxGetWindowText(m_hWndBuddy);
+
+                InitCommandEvent(vEvent);
+                vEvent.SetString((char*)sVal.c_str());
+                vEvent.SetInt(GetValue());
+                if (GetEventHandler()->ProcessEvent(vEvent))
+                    return;
+                break;
+            }
+
+        case WXK_TAB:
+            //
+            // Always produce navigation event - even if we process TAB
+            // ourselves the fact that we got here means that the user code
+            // decided to skip processing of this TAB - probably to let it
+            // do its default job.
+            //
+            {
+                wxNavigationKeyEvent        vEventNav;
+
+                vEventNav.SetDirection(!rEvent.ShiftDown());
+                vEventNav.SetWindowChange(rEvent.ControlDown());
+                vEventNav.SetEventObject(this);
+                if (GetParent()->GetEventHandler()->ProcessEvent(vEventNav))
+                    return;
+            }
+            break;

     }
 
     }
 

-    WXHANDLE hFont = GetFont().GetResourceHandle();
-    // TODO:
-    /*
-    (void)::SendMessage((HWND)m_hwndBuddy, WM_SETFONT, (WPARAM)hFont, TRUE);
-    */
-    return TRUE;
-}
+    //
+    // No, we didn't process it
+    //
+    rEvent.Skip();
+} // end of wxSpinCtrl::OnChar

 
 

-bool wxSpinCtrl::Show(bool show)
+void wxSpinCtrl::OnSpinChange(
+  wxSpinEvent&                      rEventSpin
+)

 {
 {

-    if ( !wxControl::Show(show) )
+    wxCommandEvent                  vEvent( wxEVT_COMMAND_SPINCTRL_UPDATED
+                                           ,GetId()
+                                          );
+
+    vEvent.SetEventObject(this);
+    vEvent.SetInt(rEventSpin.GetPosition());
+    (void)GetEventHandler()->ProcessEvent(vEvent);
+    if (rEventSpin.GetSkipped())

     {
     {

-        return FALSE;
+        vEvent.Skip();

     }
     }

+} // end of wxSpinCtrl::OnSpinChange

 
 

-    // TODO:
-    /*
-    ::ShowWindow((HWND)m_hwndBuddy, show ? SW_SHOW : SW_HIDE);
-    */
-    return TRUE;
-}
-
-bool wxSpinCtrl::Enable(bool enable)
+bool wxSpinCtrl::ProcessTextCommand(
+  WXWORD                            wCmd
+, WXWORD                            wId
+)

 {
 {

-    if ( !wxControl::Enable(enable) )
+    switch (wCmd)

     {
     {

-        return FALSE;
+        case SPBN_CHANGE:
+        {
+            wxCommandEvent          vEvent( wxEVT_COMMAND_TEXT_UPDATED
+                                           ,GetId()
+                                          );
+            vEvent.SetEventObject(this);
+
+            wxString                sVal = wxGetWindowText(m_hWndBuddy);
+
+            vEvent.SetString((char*)sVal.c_str());
+            vEvent.SetInt(GetValue());
+            return (GetEventHandler()->ProcessEvent(vEvent));
+        }
+
+        case SPBN_SETFOCUS:
+        case SPBN_KILLFOCUS:
+        {
+            wxFocusEvent                vEvent( wCmd == EN_KILLFOCUS ? wxEVT_KILL_FOCUS : wxEVT_SET_FOCUS
+                                               ,m_windowId
+                                              );
+
+            vEvent.SetEventObject(this);
+            return(GetEventHandler()->ProcessEvent(vEvent));
+        }
+        default:
+            break;

     }
 
     }
 

-    // TODO:
-    /*
-    ::EnableWindow((HWND)m_hwndBuddy, enable);
-    */
-    return TRUE;
-}
-
-// ----------------------------------------------------------------------------
-// event processing
-// ----------------------------------------------------------------------------
+    //
+    // Not processed
+    //
+    return FALSE;
+} // end of wxSpinCtrl::ProcessTextCommand

 
 

-void wxSpinCtrl::OnSpinChange(wxSpinEvent& eventSpin)
+void wxSpinCtrl::SetFocus()

 {
 {

-    wxCommandEvent event(wxEVT_COMMAND_SPINCTRL_UPDATED, GetId());
-    event.SetEventObject(this);
-    event.SetInt(eventSpin.GetPosition());
+    ::WinSetFocus(HWND_DESKTOP, GetHwnd());
+} // end of wxSpinCtrl::SetFocus

 
 

-    (void)GetEventHandler()->ProcessEvent(event);
-
-    if ( eventSpin.GetSkipped() )
+bool wxSpinCtrl::SetFont(
+  const wxFont&                     rFont
+)
+{
+    if (!wxWindowBase::SetFont(rFont))

     {
     {

-        event.Skip();
+        // nothing to do
+        return FALSE;

     }
     }

-}

 
 

-// ----------------------------------------------------------------------------
-// size calculations
-// ----------------------------------------------------------------------------
+    WXHANDLE                        hFont = GetFont().GetResourceHandle();
+    wxOS2SetFont( m_hWnd
+                 ,rFont
+                );
+    return TRUE;
+} // end of wxSpinCtrl::SetFont

 
 

-wxSize wxSpinCtrl::DoGetBestSize() const
+void wxSpinCtrl::SetValue(
+  const wxString&                   rsText
+)

 {
 {

-    wxSize sizeBtn = wxSpinButton::DoGetBestSize();
-    // TODO:
-    /*
-    sizeBtn.x += DEFAULT_ITEM_WIDTH + MARGIN_BETWEEN;
+    long                            lVal;

 
 

-    int y;
-    wxGetCharSize(GetHWND(), NULL, &y, &GetFont());
-    y = EDIT_HEIGHT_FROM_CHAR_HEIGHT(y);
+    lVal = atol(rsText.c_str());
+    wxSpinButton::SetValue(lVal);
+} // end of wxSpinCtrl::SetValue

 
 

-    if ( sizeBtn.y < y )
-    {
-        // make the text tall enough
-        sizeBtn.y = y;
-    }
-    */
-    return sizeBtn;
-}
-
-void wxSpinCtrl::DoMoveWindow(int x, int y, int width, int height)
+bool wxSpinCtrl::Show(
+  bool                              bShow
+)

 {
 {

-    int widthBtn = DoGetBestSize().x;
-    int widthText = width - widthBtn - MARGIN_BETWEEN;
-    if ( widthText <= 0 )
-    {
-        wxLogDebug(_T("not enough space for wxSpinCtrl!"));
-    }
-// TODO:
-/*
-    if ( !::MoveWindow((HWND)m_hwndBuddy, x, y, widthText, height, TRUE) )
+    if (!wxControl::Show(bShow))

     {
     {

-        wxLogLastError("MoveWindow(buddy)");
+        return FALSE;

     }
     }

+    return TRUE;
+} // end of wxSpinCtrl::Show

 
 

-    x += widthText + MARGIN_BETWEEN;
-    if ( !::MoveWindow(GetHwnd(), x, y, widthBtn, height, TRUE) )
-    {
-        wxLogLastError("MoveWindow");
-    }
-*/
-}
+#endif //wxUSE_SPINBTN
\ No newline at end of file