removed Win16 code (patch 905241), last version with remains of Win16 support tagged...

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

diff --git a/src/cocoa/statbox.mm b/src/cocoa/statbox.mm
index 0a8ecab19054ae54fbea22b2ad31d0e18cfe58db..202608a7be39548cbd6dc8fa948cd34782474686 100644 (file)
--- a/src/cocoa/statbox.mm
+++ b/src/cocoa/statbox.mm
@@ -9,10 +9,14 @@
 // Licence:    wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

-#include "wx/app.h"
-#include "wx/statbox.h"
+#include "wx/wxprec.h"
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/statbox.h"
+#endif //WX_PRECOMP

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

+#include "wx/cocoa/string.h"

 
 #import <AppKit/NSBox.h>
 #import <Foundation/NSString.h>
 
 #import <AppKit/NSBox.h>
 #import <Foundation/NSString.h>


@@ -33,16 +37,18 @@ bool wxStaticBox::Create(wxWindow *parent, wxWindowID winid,
     if(!CreateControl(parent,winid,pos,size,style,validator,name))
         return false;
     m_cocoaNSView = NULL;
     if(!CreateControl(parent,winid,pos,size,style,validator,name))
         return false;
     m_cocoaNSView = NULL;

-    SetNSBox([[NSBox alloc] initWithFrame:NSMakeRect(0,0,30,30)]);
-    [GetNSBox() setTitle:[NSString stringWithCString:title.c_str()]];
+    SetNSBox([[NSBox alloc] initWithFrame:MakeDefaultNSRect(size)]);
+    [GetNSBox() setTitle:wxNSStringWithWxString(wxStripMenuCodes(title))];

     if(m_parent)
         m_parent->CocoaAddChild(this);
     if(m_parent)
         m_parent->CocoaAddChild(this);

+    SetInitialFrameRect(pos,size);
+

     return true;
 }
 
 wxStaticBox::~wxStaticBox()
 {
     return true;
 }
 
 wxStaticBox::~wxStaticBox()
 {

-    DisassociateNSBox(m_cocoaNSView);
+    DisassociateNSBox(GetNSBox());

 }
 
 void wxStaticBox::GetBordersForSizer(int *borderTop, int *borderOther) const
 }
 
 void wxStaticBox::GetBordersForSizer(int *borderTop, int *borderOther) const