X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4dd9fdf82749bb5f9e2bf9c2ad1bbd59e0eeb00e..ff1e36afc063262750da38ca866784645be13520:/src/osx/cocoa/statbox.mm?ds=inline diff --git a/src/osx/cocoa/statbox.mm b/src/osx/cocoa/statbox.mm index 6c5bff4a67..aad08e0f76 100644 --- a/src/osx/cocoa/statbox.mm +++ b/src/osx/cocoa/statbox.mm @@ -21,7 +21,7 @@ + (void)initialize { static BOOL initialized = NO; - if (!initialized) + if (!initialized) { initialized = YES; wxOSXCocoaClassAddWXMethods( self ); @@ -30,18 +30,49 @@ @end -wxWidgetImplType* wxWidgetImpl::CreateGroupBox( wxWindowMac* wxpeer, - wxWindowMac* parent, - wxWindowID id, - const wxString& label, - const wxPoint& pos, +namespace +{ + class wxStaticBoxCocoaImpl : public wxWidgetCocoaImpl + { + public: + wxStaticBoxCocoaImpl(wxWindowMac *wxpeer, wxNSBox *v) + : wxWidgetCocoaImpl(wxpeer, v) + { + } + + virtual void SetLabel( const wxString& title, wxFontEncoding encoding ) + { + if (title.empty()) + [GetNSBox() setTitlePosition:NSNoTitle]; + else + [GetNSBox() setTitlePosition:NSAtTop]; + + wxWidgetCocoaImpl::SetLabel(title, encoding); + } + + private: + NSBox *GetNSBox() const + { + wxASSERT( [m_osxView isKindOfClass:[NSBox class]] ); + + return static_cast(m_osxView); + } + }; +} // anonymous namespace + + +wxWidgetImplType* wxWidgetImpl::CreateGroupBox( wxWindowMac* wxpeer, + wxWindowMac* WXUNUSED(parent), + wxWindowID WXUNUSED(id), + const wxString& WXUNUSED(label), + const wxPoint& pos, const wxSize& size, - long style, - long extraStyle) + long WXUNUSED(style), + long WXUNUSED(extraStyle)) { NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ; wxNSBox* v = [[wxNSBox alloc] initWithFrame:r]; - wxWidgetCocoaImpl* c = new wxWidgetCocoaImpl( wxpeer, v ); + wxStaticBoxCocoaImpl* c = new wxStaticBoxCocoaImpl( wxpeer, v ); c->SetFlipped(false); return c; }