X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/065e208ec09e3d08d51d9604497f92f53c210f93..ba49d2acf95d53517719c4fd9ac2ad5aaa13540b:/src/cocoa/statbox.mm?ds=sidebyside

diff --git a/src/cocoa/statbox.mm b/src/cocoa/statbox.mm
index f63ff5f9c0..ac443b5aa0 100644
--- a/src/cocoa/statbox.mm
+++ b/src/cocoa/statbox.mm
@@ -1,18 +1,20 @@
 /////////////////////////////////////////////////////////////////////////////
-// 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:   	wxWidgets licence
+// 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"
@@ -21,24 +23,20 @@
 #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:wxNSStringWithWxString(wxStripMenuCodes(title))];
+    CocoaSetLabelForObject(title, GetNSBox());
     if(m_parent)
         m_parent->CocoaAddChild(this);
     SetInitialFrameRect(pos,size);
@@ -65,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]);
+}