AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests 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
Show Stats 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();
}

21
src/motif/window.cpp
View File

@ -364,7 +364,7 @@ wxWindow::~wxWindow()
g_captureWindow = NULL;
m_isBeingDeleted = true;
// Motif-specific actions first
WXWidget wMain = GetMainWidget();
if ( wMain )
@ -1436,6 +1436,8 @@ void wxWindow::DoMoveWindowIntr(int xx, int yy, int w, int h,
}
else
{
if( xx < 0 ) xx = 0;
if( yy < 0 ) yy = 0;
if( w < 1 ) w = 1;
if( h < 1 ) h = 1;
@ -1832,13 +1834,18 @@ bool wxWindow::AttachWidget (wxWindow* WXUNUSED(parent), WXWidget mainWidget,
XtFree ((char *) ptr);
}
if (x == -1)
x = 0;
if (y == -1)
y = 0;
SetSize (x, y, width, height);
SetInitialBestSize(wxSize(width, height));
return TRUE;
if (x != -1 || y != -1)
{
if (x == -1)
x = 0;
if (y == -1)
y = 0;
Move(x, y);
}
return true;
}
// Remove event handler, remove from hash table