more Unicode fixes

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

diff --git a/src/cocoa/statbox.mm b/src/cocoa/statbox.mm
index 33320f707c4085b222bab44da1be034a94c90418..00a22bc123ba94846934e6e60ebb6dd79740e91a 100644 (file)
--- a/src/cocoa/statbox.mm
+++ b/src/cocoa/statbox.mm
@@ -12,6 +12,8 @@
 #include "wx/app.h"
 #include "wx/statbox.h"
 
+#include "wx/cocoa/autorelease.h"
+
 #import <AppKit/NSBox.h>
 #import <Foundation/NSString.h>
 
@@ -27,19 +29,35 @@ 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)]);
+    SetNSBox([[NSBox alloc] initWithFrame:MakeDefaultNSRect(size)]);
     [GetNSBox() setTitle:[NSString stringWithCString:title.c_str()]];
     if(m_parent)
         m_parent->CocoaAddChild(this);
+    SetInitialFrameRect(pos,size);
+
     return true;
 }
 
 wxStaticBox::~wxStaticBox()
 {
-    CocoaRemoveFromParent();
-    SetNSBox(NULL);
+    DisassociateNSBox(m_cocoaNSView);
+}
+
+void wxStaticBox::GetBordersForSizer(int *borderTop, int *borderOther) const
+{
+    NSRect contentRect = [[GetNSBox() contentView] frame];
+    NSRect thisRect = [m_cocoaNSView frame];
+    *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 = (int)contentRect.origin.x;
+    if(nextBorder > *borderOther)
+        *borderOther = nextBorder;
 }