removed 68K targets and preferences and renamed output libraries

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

diff --git a/src/os2/spinctrl.cpp b/src/os2/spinctrl.cpp
index ed056cafaf5b1f5c975a81dba26a99c5a3890be0..8c2735901ef9b6ba91f8dceeea7e244240134bb4 100644 (file)
--- a/src/os2/spinctrl.cpp
+++ b/src/os2/spinctrl.cpp
@@ -44,6 +44,7 @@ extern void  wxAssociateWinWithHandle( HWND         hWnd
                                       ,wxWindowOS2* pWin
                                      );
 static WXFARPROC fnWndProcSpinCtrl = (WXFARPROC)NULL;
                                       ,wxWindowOS2* pWin
                                      );
 static WXFARPROC fnWndProcSpinCtrl = (WXFARPROC)NULL;

+wxArraySpins                        wxSpinCtrl::m_svAllSpins;

 
 IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl, wxControl)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl, wxControl)
 


@@ -128,6 +129,8 @@ bool wxSpinCtrl::Create(
 , const wxString&                   rsName
 )
 {
 , const wxString&                   rsName
 )
 {

+    SWP                             vSwp;
+

     if (vId == -1)
         m_windowId = NewControlId();
     else
     if (vId == -1)
         m_windowId = NewControlId();
     else


@@ -175,7 +178,15 @@ bool wxSpinCtrl::Create(
     m_hWndBuddy = m_hWnd; // One in the same for OS/2
     if(pParent)
         pParent->AddChild((wxSpinButton *)this);
     m_hWndBuddy = m_hWnd; // One in the same for OS/2
     if(pParent)
         pParent->AddChild((wxSpinButton *)this);

-    SetFont(pParent->GetFont());
+    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
     SetSize( rPos.x
             ,rPos.y
             ,rSize.x


@@ -194,6 +205,7 @@ bool wxSpinCtrl::Create(
     ::WinSetWindowULong(GetHwnd(), QWL_USER, (LONG)this);
     fnWndProcSpinCtrl = (WXFARPROC)::WinSubclassWindow(m_hWnd, (PFNWP)wxSpinCtrlWndProc);
     m_svAllSpins.Add(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
 
     return TRUE;
 } // end of wxSpinCtrl::Create
 


@@ -261,12 +273,9 @@ void wxSpinCtrl::DoMoveWindow(
 
     if (pParent)
     {
 
     if (pParent)
     {

-        if (pParent->IsKindOf(CLASSINFO(wxFrame)))
-        {
-            nY = pParent->GetClientSize().y - (nY + nHeight);
-        }
-        else
-            nY = pParent->GetSize().y - (nY + nHeight);
+        int                         nOS2Height = GetOS2ParentHeight(pParent);
+
+        nY = nOS2Height - (nY + nHeight);

     }
     else
     {
     }
     else
     {