Use "&Help" so wxMac doesn't make an extra help menu

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

diff --git a/src/cocoa/statline2.mm b/src/cocoa/statline2.mm
index 8ad30c325092a188c8e0cea93cbc5a2d73f37bf3..283ca293a8d98154efcfe4a525934f197d56f286 100644 (file)
--- a/src/cocoa/statline2.mm
+++ b/src/cocoa/statline2.mm
@@ -9,10 +9,15 @@
 // Licence:    wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-#include "wx/app.h"
+#include "wx/wxprec.h"
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+#endif //WX_PRECOMP
 #include "wx/statline.h"
 
-#import <AppKit/NSView.h>
+#include "wx/cocoa/autorelease.h"
+
+#import <AppKit/NSBox.h>
 
 IMPLEMENT_DYNAMIC_CLASS(wxStaticLine, wxControl)
 BEGIN_EVENT_TABLE(wxStaticLine, wxStaticLineBase)
@@ -25,18 +30,20 @@ bool wxStaticLine::Create(wxWindow *parent, wxWindowID winid,
            long style,
            const wxString& name)
 {
+    wxAutoNSAutoreleasePool pool;
     if(!CreateControl(parent,winid,pos,size,style,wxDefaultValidator,name))
         return false;
-    SetNSView([[NSView alloc] initWithFrame: NSMakeRect(10,10,20,20)]);
+    SetNSView([[NSBox alloc] initWithFrame: MakeDefaultNSRect(size)]);
     [m_cocoaNSView release];
+    [(NSBox*)m_cocoaNSView setBoxType: NSBoxSeparator];
     if(m_parent)
         m_parent->CocoaAddChild(this);
+    SetInitialFrameRect(pos,size);
+
     return true;
 }
 
 wxStaticLine::~wxStaticLine()
 {
-    CocoaRemoveFromParent();
-    SetNSView(NULL);
 }