update button style to include BS_MULTILINE when a multiline label is set

[wxWidgets.git] / src / cocoa / statbox.mm

diff --git a/src/cocoa/statbox.mm b/src/cocoa/statbox.mm
index 202608a7be39548cbd6dc8fa948cd34782474686..6bfc8111dd7c15420025578920b71b582023b796 100644 (file)
--- 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
 // Purpose:     wxStaticBox
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/02/15

-// RCS-ID:      $Id: 
+// RCS-ID:      $Id$

 // Copyright:   (c) 2003 David Elliott
 // Copyright:   (c) 2003 David Elliott

-// Licence:    wxWindows license
+// Licence:     wxWidgets licence

 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"

+
+#include "wx/statbox.h"
+

 #ifndef WX_PRECOMP
     #include "wx/app.h"
 #ifndef WX_PRECOMP
     #include "wx/app.h"

-    #include "wx/statbox.h"

 #endif //WX_PRECOMP
 
 #include "wx/cocoa/autorelease.h"
 #endif //WX_PRECOMP
 
 #include "wx/cocoa/autorelease.h"


@@ -27,18 +29,15 @@ END_EVENT_TABLE()
 WX_IMPLEMENT_COCOA_OWNER(wxStaticBox,NSBox,NSView,NSView)
 
 bool wxStaticBox::Create(wxWindow *parent, wxWindowID winid,
 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;
 {
     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)]);
         return false;
     m_cocoaNSView = NULL;
     SetNSBox([[NSBox alloc] initWithFrame:MakeDefaultNSRect(size)]);

-    [GetNSBox() setTitle:wxNSStringWithWxString(wxStripMenuCodes(title))];
+    [GetNSBox() setTitle:wxNSStringWithWxString(GetLabelText(title))];

     if(m_parent)
         m_parent->CocoaAddChild(this);
     SetInitialFrameRect(pos,size);
     if(m_parent)
         m_parent->CocoaAddChild(this);
     SetInitialFrameRect(pos,size);


@@ -65,3 +64,14 @@ void wxStaticBox::GetBordersForSizer(int *borderTop, int *borderOther) const
         *borderOther = nextBorder;
 }
 
         *borderOther = nextBorder;
 }
 

+void wxStaticBox::SetLabel(const wxString& label)
+{
+   wxAutoNSAutoreleasePool pool;
+   [GetNSBox() setTitle:wxNSStringWithWxString(label)];
+}
+
+wxString wxStaticBox::GetLabel() const
+{
+   wxAutoNSAutoreleasePool pool;
+   return wxStringWithNSString([GetNSBox() title]);
+}