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

support framelayout for choice

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66888 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2011-02-14 19:13:04 +00:00
parent 31b81622d3
commit 026e7dcba0
1 changed files with 48 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/osx/cocoa/choice.mm
View File

@@ -52,6 +52,53 @@
@end
@interface NSView(PossibleSizeMethods)
- (NSControlSize)controlSize;
@end
class wxChoiceCocoaImpl : public wxWidgetCocoaImpl
{
public:
wxChoiceCocoaImpl(wxWindowMac *wxpeer, wxNSPopUpButton *v)
: wxWidgetCocoaImpl(wxpeer, v)
{
}
void GetLayoutInset(int &left , int &top , int &right, int &bottom) const
{
left = top = right = bottom = 0;
NSControlSize size = NSRegularControlSize;
if ( [m_osxView respondsToSelector:@selector(controlSize)] )
size = [m_osxView controlSize];
else if ([m_osxView respondsToSelector:@selector(cell)])
{
id cell = [(id)m_osxView cell];
if ([cell respondsToSelector:@selector(controlSize)])
size = [cell controlSize];
}
switch( size )
{
case NSRegularControlSize:
left = right = 3;
top = 2;
bottom = 4;
break;
case NSSmallControlSize:
left = right = 3;
top = 1;
bottom = 4;
break;
case NSMiniControlSize:
left = 1;
right = 2;
top = 0;
bottom = 0;
break;
}
}
};
wxWidgetImplType* wxWidgetImpl::CreateChoice( wxWindowMac* wxpeer,
wxWindowMac* WXUNUSED(parent),
wxWindowID WXUNUSED(id),
@@ -65,7 +112,7 @@ wxWidgetImplType* wxWidgetImpl::CreateChoice( wxWindowMac* wxpeer,
wxNSPopUpButton* v = [[wxNSPopUpButton alloc] initWithFrame:r pullsDown:NO];
[v setMenu: menu->GetHMenu()];
[v setAutoenablesItems:NO];
wxWidgetCocoaImpl* c = new wxWidgetCocoaImpl( wxpeer, v );
wxWidgetCocoaImpl* c = new wxChoiceCocoaImpl( wxpeer, v );
return c;
}