Sizing fixes according to patch #1523304.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40194 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -118,12 +118,8 @@ bool wxSpinButton::Create(
|
||||
::WinQueryWindowPos(m_hWnd, &vSwp);
|
||||
SetXComp(vSwp.x);
|
||||
SetYComp(vSwp.y-5); // compensate for the associated TextControl border
|
||||
wxFont* pTextFont = new wxFont( 10
|
||||
,wxMODERN
|
||||
,wxNORMAL
|
||||
,wxNORMAL
|
||||
);
|
||||
SetFont(*pTextFont);
|
||||
|
||||
SetFont(*wxSMALL_FONT);
|
||||
//
|
||||
// For OS/2 we want to hide the text portion so we can substitute an
|
||||
// independent text ctrl in its place.
|
||||
@@ -144,7 +140,6 @@ bool wxSpinButton::Create(
|
||||
::WinSetWindowULong(GetHwnd(), QWL_USER, (LONG)this);
|
||||
fnWndProcSpinCtrl = (WXFARPROC)::WinSubclassWindow(m_hWnd, (PFNWP)wxSpinCtrlWndProc);
|
||||
#endif
|
||||
delete pTextFont;
|
||||
return TRUE;
|
||||
} // end of wxSpinButton::Create
|
||||
|
||||
@@ -159,12 +154,12 @@ wxSpinButton::~wxSpinButton()
|
||||
wxSize wxSpinButton::DoGetBestSize() const
|
||||
{
|
||||
//
|
||||
// OS/2 PM does not really have system metrics so we'll just set it to
|
||||
// 26x20 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(26,20);
|
||||
return best;
|
||||
RECTL vRect;
|
||||
::WinQueryWindowRect(GetHwnd(),&vRect);
|
||||
return wxSize(vRect.yTop,vRect.yTop);
|
||||
} // end of wxSpinButton::DoGetBestSize
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
|
Reference in New Issue
Block a user