Don't reset bullet number and outline number when applying style sheet.

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

diff --git a/src/os2/spinbutt.cpp b/src/os2/spinbutt.cpp
index 14ac821f31d33c43fb6c02bff65e20455b25bac0..533b209728ae3466a5c77174d234491e21ad510e 100644 (file)
--- a/src/os2/spinbutt.cpp
+++ b/src/os2/spinbutt.cpp
@@ -9,11 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-    #pragma implementation "spinbutt.h"
-    #pragma implementation "spinbutbase.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -68,8 +63,11 @@ bool wxSpinButton::Create(
         m_windowId = NewControlId();
     else
         m_windowId = vId;
         m_windowId = NewControlId();
     else
         m_windowId = vId;

-    m_backgroundColour = pParent->GetBackgroundColour();
-    m_foregroundColour = pParent->GetForegroundColour();
+    if (pParent)
+    {
+        m_backgroundColour = pParent->GetBackgroundColour();
+        m_foregroundColour = pParent->GetForegroundColour();
+    }

     SetName(rsName);
     SetParent(pParent);
     m_windowStyle      = lStyle;
     SetName(rsName);
     SetParent(pParent);
     m_windowStyle      = lStyle;


@@ -122,20 +120,17 @@ bool wxSpinButton::Create(
 
     ::WinQueryWindowPos(m_hWnd, &vSwp);
     SetXComp(vSwp.x);
 
     ::WinQueryWindowPos(m_hWnd, &vSwp);
     SetXComp(vSwp.x);

-    SetYComp(vSwp.y);
-    wxFont*                          pTextFont = new wxFont( 10
-                                                            ,wxMODERN
-                                                            ,wxNORMAL
-                                                            ,wxNORMAL
-                                                           );
-    SetFont(*pTextFont);
+    SetYComp(vSwp.y-5); // compensate for the associated TextControl border
+
+    SetFont(*wxSMALL_FONT);

     //
     // For OS/2 we want to hide the text portion so we can substitute an
     //
     // For OS/2 we want to hide the text portion so we can substitute an

-    // independent text ctrl in its place.  10 device units does this
+    // independent text ctrl in its place.
+    // Therefore we must override any user given width with our best guess.

     //
     //

-    SetSize( nX
-            ,nY
-            ,10L
+    SetSize( nX - GetXComp()
+            ,nY - GetYComp()
+            ,nWidth

             ,nHeight
            );
     wxAssociateWinWithHandle( m_hWnd
             ,nHeight
            );
     wxAssociateWinWithHandle( m_hWnd


@@ -148,7 +143,6 @@ bool wxSpinButton::Create(
     ::WinSetWindowULong(GetHwnd(), QWL_USER, (LONG)this);
     fnWndProcSpinCtrl = (WXFARPROC)::WinSubclassWindow(m_hWnd, (PFNWP)wxSpinCtrlWndProc);
 #endif
     ::WinSetWindowULong(GetHwnd(), QWL_USER, (LONG)this);
     fnWndProcSpinCtrl = (WXFARPROC)::WinSubclassWindow(m_hWnd, (PFNWP)wxSpinCtrlWndProc);
 #endif

-    delete pTextFont;

     return TRUE;
 } // end of wxSpinButton::Create
 
     return TRUE;
 } // end of wxSpinButton::Create
 


@@ -163,12 +157,12 @@ wxSpinButton::~wxSpinButton()
 wxSize wxSpinButton::DoGetBestSize() const
 {
     //
 wxSize wxSpinButton::DoGetBestSize() const
 {
     //

-    // OS/2 PM does not really have system metrics so we'll just set  it to
-    // 24x20 which is the size of the buttons and the borders.
-    // Also we have no horizontal spin buttons.
+    // OS/2 PM does not really have system metrics so we'll just set it to
+    // a square based on its height.

     //
     //

-    wxSize best(24,20);
-    return best;
+    RECTL   vRect;
+    ::WinQueryWindowRect(GetHwnd(),&vRect);
+    return wxSize(vRect.yTop,vRect.yTop);

 } // end of wxSpinButton::DoGetBestSize
 
 // ----------------------------------------------------------------------------
 } // end of wxSpinButton::DoGetBestSize
 
 // ----------------------------------------------------------------------------


@@ -196,14 +190,14 @@ bool wxSpinButton::OS2OnScroll( int    WXUNUSED(nOrientation),
                                 WXWORD wPos,
                                 WXHWND hControl )
 {
                                 WXWORD wPos,
                                 WXHWND hControl )
 {

-    wxCHECK_MSG(hControl, false, wxT("scrolling what?") )
+    wxCHECK_MSG(hControl, false, wxT("scrolling what?") );

 
     wxSpinEvent vEvent( wxEVT_SCROLL_THUMBTRACK, m_windowId );
     int nVal = (int)wPos;    // cast is important for negative values!
 
     vEvent.SetPosition(nVal);
     vEvent.SetEventObject(this);
 
     wxSpinEvent vEvent( wxEVT_SCROLL_THUMBTRACK, m_windowId );
     int nVal = (int)wPos;    // cast is important for negative values!
 
     vEvent.SetPosition(nVal);
     vEvent.SetEventObject(this);

-    return(GetEventHandler()->ProcessEvent(vEvent));
+    return(HandleWindowEvent(vEvent));

 } // end of wxSpinButton::OS2OnScroll
 
 bool wxSpinButton::OS2Command( WXUINT WXUNUSED(uCmd),
 } // end of wxSpinButton::OS2OnScroll
 
 bool wxSpinButton::OS2Command( WXUINT WXUNUSED(uCmd),