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

Improve default size. If the control is auto-fit its size won't be less

Browse Source 
than 70 pixels.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22817 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Elliott
2003-08-13 20:39:19 +00:00
parent d77ea20c75
commit 9ba1d264f7
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/cocoa/textctrl.mm
View File

@@ -36,12 +36,19 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID winid,
if(!CreateControl(parent,winid,pos,size,style,validator,name)) if(!CreateControl(parent,winid,pos,size,style,validator,name))
return false; return false;
m_cocoaNSView = NULL; m_cocoaNSView = NULL;
SetNSTextField([[NSTextField alloc] initWithFrame:NSMakeRect(0,0,30,30)]); SetNSTextField([[NSTextField alloc] initWithFrame:MakeDefaultNSRect(size)]);
[m_cocoaNSView release]; [m_cocoaNSView release];
[GetNSTextField() setStringValue:[NSString stringWithCString:value.c_str()]]; [GetNSTextField() setStringValue:[NSString stringWithCString:value.c_str()]];
[GetNSControl() sizeToFit]; [GetNSControl() sizeToFit];
NSRect currentFrame = [m_cocoaNSView frame];
if(currentFrame.size.width < 70)
{
currentFrame.size.width = 70;
[m_cocoaNSView setFrame:currentFrame];
}
if(m_parent) if(m_parent)
m_parent->CocoaAddChild(this); m_parent->CocoaAddChild(this);
SetInitialFrameRect(pos,size);
return true; return true;
} }