Fix Tab navigation when focused control is disabled.

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

diff --git a/src/cocoa/statline2.mm b/src/cocoa/statline2.mm
index 8ad30c325092a188c8e0cea93cbc5a2d73f37bf3..b77cc99f5bf72cc4cb51679941b15d058c070839 100644 (file)
--- a/src/cocoa/statline2.mm
+++ b/src/cocoa/statline2.mm
@@ -4,15 +4,20 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/02/15
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/02/15

-// RCS-ID:      $Id: 
+// RCS-ID:      $Id$

 // Copyright:   (c) 2003 David Elliott
 // 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"
 
 #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)
 
 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)
 {
            long style,
            const wxString& name)
 {

+    wxAutoNSAutoreleasePool pool;

     if(!CreateControl(parent,winid,pos,size,style,wxDefaultValidator,name))
         return false;
     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];
     [m_cocoaNSView release];

+    [(NSBox*)m_cocoaNSView setBoxType: NSBoxSeparator];

     if(m_parent)
         m_parent->CocoaAddChild(this);
     if(m_parent)
         m_parent->CocoaAddChild(this);

+    SetInitialFrameRect(pos,size);
+

     return true;
 }
 
 wxStaticLine::~wxStaticLine()
 {
     return true;
 }
 
 wxStaticLine::~wxStaticLine()
 {

-    CocoaRemoveFromParent();
-    SetNSView(NULL);

 }
 
 }