Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Align initial size handling with other ports.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35020 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2005-07-30 17:09:56 +00:00
parent c9429ecf52
commit f920436385
2 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/motif/textctrl.cpp
View File

@@ -196,12 +196,8 @@ bool wxTextCtrl::Create(wxWindow *parent,
// font
ChangeFont(false);
wxSize best = GetBestSize();
if( size.x != -1 ) best.x = size.x;
if( size.y != -1 ) best.y = size.y;
AttachWidget (parent, m_mainWidget, (WXWidget) NULL,
pos.x, pos.y, best.x, best.y);
pos.x, pos.y, size.x, size.y);
ChangeBackgroundColour();
@@ -683,7 +679,13 @@ wxSize wxDoGetSingleTextCtrlBestSize( Widget textWidget,
wxSize wxTextCtrl::DoGetBestSize() const
{
if( IsSingleLine() )
return wxDoGetSingleTextCtrlBestSize( (Widget)m_mainWidget, this );
{
wxSize best = wxControl::DoGetBestSize();
if( best.x < 110 ) best.x = 110;
return best;
}
else
return wxWindow::DoGetBestSize();
}