Return NULL from wxWindow::GetCapture() when the capture is being lost.

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

diff --git a/src/cocoa/statline2.mm b/src/cocoa/statline2.mm
index 6afc341f54c869d2d313a19da57ee7befa736f06..0696c005ac520be356eb2104d7e6224917b20634 100644 (file)
--- a/src/cocoa/statline2.mm
+++ b/src/cocoa/statline2.mm
@@ -1,20 +1,23 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        cocoa/statline.mm
+// Name:        src/cocoa/statline2.mm
 // Purpose:     wxStaticLine
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/02/15
-// RCS-ID:      $Id: 
 // Copyright:   (c) 2003 David Elliott
-// Licence:    wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#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)
 END_EVENT_TABLE()
 // WX_IMPLEMENT_COCOA_OWNER(wxStaticLine,NSTextField,NSControl,NSView)
@@ -25,12 +28,16 @@ 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;
 }