X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/449c567346a1b3937e532cd87aac007faad76b04..eea4d01c65f9b29baa1193db762b4c6b8144af24:/src/cocoa/statbox.mm

diff --git a/src/cocoa/statbox.mm b/src/cocoa/statbox.mm
index a54fc3fb4f..ac443b5aa0 100644
--- a/src/cocoa/statbox.mm
+++ b/src/cocoa/statbox.mm
@@ -1,43 +1,42 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        cocoa/statbox.mm
+// Name:        src/cocoa/statbox.mm
 // Purpose:     wxStaticBox
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/02/15
-// RCS-ID:      $Id: 
+// RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
-// Licence:   	wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
+
+#include "wx/statbox.h"
+
 #ifndef WX_PRECOMP
     #include "wx/app.h"
-    #include "wx/statbox.h"
 #endif //WX_PRECOMP
 
 #include "wx/cocoa/autorelease.h"
+#include "wx/cocoa/string.h"
 
 #import <AppKit/NSBox.h>
 #import <Foundation/NSString.h>
 
-IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl)
 BEGIN_EVENT_TABLE(wxStaticBox, wxStaticBoxBase)
 END_EVENT_TABLE()
 WX_IMPLEMENT_COCOA_OWNER(wxStaticBox,NSBox,NSView,NSView)
 
 bool wxStaticBox::Create(wxWindow *parent, wxWindowID winid,
-           const wxString& title,
-           const wxPoint& pos,
-           const wxSize& size,
-           long style, const wxValidator& validator,
-           const wxString& name)
+           const wxString& title, const wxPoint& pos, const wxSize& size,
+           long style, const wxString& name)
 {
     wxAutoNSAutoreleasePool pool;
-    if(!CreateControl(parent,winid,pos,size,style,validator,name))
+    if(!CreateControl(parent,winid,pos,size,style,wxDefaultValidator,name))
         return false;
     m_cocoaNSView = NULL;
     SetNSBox([[NSBox alloc] initWithFrame:MakeDefaultNSRect(size)]);
-    [GetNSBox() setTitle:[NSString stringWithCString:title.c_str()]];
+    CocoaSetLabelForObject(title, GetNSBox());
     if(m_parent)
         m_parent->CocoaAddChild(this);
     SetInitialFrameRect(pos,size);
@@ -47,7 +46,7 @@ bool wxStaticBox::Create(wxWindow *parent, wxWindowID winid,
 
 wxStaticBox::~wxStaticBox()
 {
-    DisassociateNSBox(m_cocoaNSView);
+    DisassociateNSBox(GetNSBox());
 }
 
 void wxStaticBox::GetBordersForSizer(int *borderTop, int *borderOther) const
@@ -64,3 +63,14 @@ void wxStaticBox::GetBordersForSizer(int *borderTop, int *borderOther) const
         *borderOther = nextBorder;
 }
 
+void wxStaticBox::SetLabel(const wxString& label)
+{
+   wxAutoNSAutoreleasePool pool;
+   CocoaSetLabelForObject(label, GetNSBox());
+}
+
+wxString wxStaticBox::GetLabel() const
+{
+   wxAutoNSAutoreleasePool pool;
+   return wxStringWithNSString([GetNSBox() title]);
+}