X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4850cc8b2e1037cd394806db4ddcf73868588a4c..a51e79e87db3512823258d487849bb7e7947b700:/src/osx/cocoa/statbox.mm?ds=inline diff --git a/src/osx/cocoa/statbox.mm b/src/osx/cocoa/statbox.mm index 6f7fecfc38..93838c3b73 100644 --- a/src/osx/cocoa/statbox.mm +++ b/src/osx/cocoa/statbox.mm @@ -1,10 +1,10 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: statbox.cpp +// Name: src/osx/cocoa/statbox.mm // Purpose: wxStaticBox // Author: Stefan Csomor // Modified by: // Created: 1998-01-01 -// RCS-ID: $Id: statbox.cpp 54129 2008-06-11 19:30:52Z SC $ +// RCS-ID: $Id$ // Copyright: (c) Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -18,36 +18,62 @@ @implementation wxNSBox -- (void)setImplementation: (wxWidgetCocoaImpl *) theImplementation ++ (void)initialize { - impl = theImplementation; + static BOOL initialized = NO; + if (!initialized) + { + initialized = YES; + wxOSXCocoaClassAddWXMethods( self ); + } } -- (wxWidgetCocoaImpl*) implementation -{ - return impl; -} +@end -- (BOOL) isFlipped +namespace { - return NO; -} + 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 -@end -wxWidgetImplType* wxWidgetImpl::CreateGroupBox( wxWindowMac* wxpeer, - wxWindowMac* parent, - wxWindowID id, - const wxString& label, - const wxPoint& pos, +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 ); - [v setImplementation:c]; + wxStaticBoxCocoaImpl* c = new wxStaticBoxCocoaImpl( wxpeer, v ); + c->SetFlipped(false); return c; }