Better default sizes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36686 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -117,7 +117,7 @@ bool wxSpinButton::Create(
|
|||||||
|
|
||||||
::WinQueryWindowPos(m_hWnd, &vSwp);
|
::WinQueryWindowPos(m_hWnd, &vSwp);
|
||||||
SetXComp(vSwp.x);
|
SetXComp(vSwp.x);
|
||||||
SetYComp(vSwp.y);
|
SetYComp(vSwp.y-5); // compensate for the associated TextControl border
|
||||||
wxFont* pTextFont = new wxFont( 10
|
wxFont* pTextFont = new wxFont( 10
|
||||||
,wxMODERN
|
,wxMODERN
|
||||||
,wxNORMAL
|
,wxNORMAL
|
||||||
@@ -126,11 +126,12 @@ bool wxSpinButton::Create(
|
|||||||
SetFont(*pTextFont);
|
SetFont(*pTextFont);
|
||||||
//
|
//
|
||||||
// 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
|
SetSize( nX - GetXComp()
|
||||||
,nY
|
,nY - GetYComp()
|
||||||
,10L
|
,nWidth
|
||||||
,nHeight
|
,nHeight
|
||||||
);
|
);
|
||||||
wxAssociateWinWithHandle( m_hWnd
|
wxAssociateWinWithHandle( m_hWnd
|
||||||
@@ -159,10 +160,10 @@ wxSize wxSpinButton::DoGetBestSize() const
|
|||||||
{
|
{
|
||||||
//
|
//
|
||||||
// OS/2 PM does not really have system metrics so we'll just set it to
|
// 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.
|
// 26x20 which is the size of the buttons and the borders.
|
||||||
// Also we have no horizontal spin buttons.
|
// Also we have no horizontal spin buttons.
|
||||||
//
|
//
|
||||||
wxSize best(24,20);
|
wxSize best(26,20);
|
||||||
return best;
|
return best;
|
||||||
} // end of wxSpinButton::DoGetBestSize
|
} // end of wxSpinButton::DoGetBestSize
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user