GetMenuBar() now traverses up the hierarchy so it no longer has to be done here.

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

diff --git a/src/cocoa/statbox.mm b/src/cocoa/statbox.mm
index 23dd3261d615fd009a3a8adeb87c91b931676e50..202608a7be39548cbd6dc8fa948cd34782474686 100644 (file)
--- a/src/cocoa/statbox.mm
+++ b/src/cocoa/statbox.mm
@@ -9,8 +9,14 @@
 // 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/string.h"
 
 #import <AppKit/NSBox.h>
 #import <Foundation/NSString.h>
@@ -27,32 +33,34 @@ bool wxStaticBox::Create(wxWindow *parent, wxWindowID winid,
            long style, const wxValidator& validator,
            const wxString& name)
 {
+    wxAutoNSAutoreleasePool pool;
     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);
+    SetInitialFrameRect(pos,size);
+
     return true;
 }
 
 wxStaticBox::~wxStaticBox()
 {
-    CocoaRemoveFromParent();
-    SetNSBox(NULL);
+    DisassociateNSBox(GetNSBox());
 }
 
 void wxStaticBox::GetBordersForSizer(int *borderTop, int *borderOther) const
 {
     NSRect contentRect = [[GetNSBox() contentView] frame];
     NSRect thisRect = [m_cocoaNSView frame];
-    *borderTop = thisRect.size.height - (contentRect.origin.y+contentRect.size.height);
-    *borderOther = thisRect.size.width - (contentRect.origin.x+contentRect.size.width);
-    int nextBorder = contentRect.origin.y;
+    *borderTop = (int)(thisRect.size.height - (contentRect.origin.y+contentRect.size.height));
+    *borderOther = (int)(thisRect.size.width - (contentRect.origin.x+contentRect.size.width));
+    int nextBorder = (int)contentRect.origin.y;
     if(nextBorder > *borderOther)
         *borderOther = nextBorder;
-    nextBorder = contentRect.origin.x;
+    nextBorder = (int)contentRect.origin.x;
     if(nextBorder > *borderOther)
         *borderOther = nextBorder;
 }