removed src/gtk/eggtrayicon.h

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

diff --git a/src/cocoa/statbox.mm b/src/cocoa/statbox.mm
index cc8487588116043c708cf5fcc20aea7e8f3cefdb..f60c482e30400994ec9186ea874641d80869e39a 100644 (file)
--- a/src/cocoa/statbox.mm
+++ b/src/cocoa/statbox.mm
@@ -6,11 +6,17 @@
 // Created:     2003/02/15
 // RCS-ID:      $Id: 
 // Copyright:   (c) 2003 David Elliott
 // Created:     2003/02/15
 // RCS-ID:      $Id: 
 // Copyright:   (c) 2003 David Elliott

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

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#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>
 
 #import <AppKit/NSBox.h>
 #import <Foundation/NSString.h>


@@ -21,26 +27,25 @@ 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)

 {
 {

-    if(!CreateControl(parent,winid,pos,size,style,validator,name))
+    wxAutoNSAutoreleasePool pool;
+    if(!CreateControl(parent,winid,pos,size,style,wxDefaultValidator,name))

         return false;
     m_cocoaNSView = NULL;
         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()
 {

-    CocoaRemoveFromParent();
-    SetNSBox(NULL);
+    DisassociateNSBox(GetNSBox());

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