Fix wrong tab order in wxAuiNotebook after dragging.

[wxWidgets.git] / src / osx / cocoa / tglbtn.mm

diff --git a/src/osx/cocoa/tglbtn.mm b/src/osx/cocoa/tglbtn.mm
index af184af177e5460b11ad7dab691dc9f3fcd2fe5b..ab7aab16f73395520fcdd94ed9cee622ca4a44dc 100644 (file)
--- a/src/osx/cocoa/tglbtn.mm
+++ b/src/osx/cocoa/tglbtn.mm
@@ -27,12 +27,16 @@
 
 // from button.mm
 
 
 // from button.mm
 

-extern "C" void SetBezelStyleFromBorderFlags(NSButton *v, long style);
+extern "C" void SetBezelStyleFromBorderFlags(NSButton *v,
+                                             long style,
+                                             wxWindowID winid = wxID_ANY,
+                                             const wxString& label = wxString(),
+                                             const wxBitmap& bitmap = wxBitmap());

 
 wxWidgetImplType* wxWidgetImpl::CreateToggleButton( wxWindowMac* wxpeer,
                                     wxWindowMac* WXUNUSED(parent),
 
 wxWidgetImplType* wxWidgetImpl::CreateToggleButton( wxWindowMac* wxpeer,
                                     wxWindowMac* WXUNUSED(parent),

-                                    wxWindowID WXUNUSED(id),
-                                    const wxString& WXUNUSED(label),
+                                    wxWindowID winid,
+                                    const wxString& label,

                                     const wxPoint& pos,
                                     const wxSize& size,
                                     long style,
                                     const wxPoint& pos,
                                     const wxSize& size,
                                     long style,


@@ -41,16 +45,16 @@ wxWidgetImplType* wxWidgetImpl::CreateToggleButton( wxWindowMac* wxpeer,
     NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
     wxNSButton* v = [[wxNSButton alloc] initWithFrame:r];
 
     NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
     wxNSButton* v = [[wxNSButton alloc] initWithFrame:r];
 

-    SetBezelStyleFromBorderFlags(v, style);
+    SetBezelStyleFromBorderFlags(v, style, winid, label);

 
     [v setButtonType:NSOnOffButton];
 
     [v setButtonType:NSOnOffButton];

-    wxWidgetCocoaImpl* c = new wxWidgetCocoaImpl( wxpeer, v );
+    wxWidgetCocoaImpl* c = new wxButtonCocoaImpl( wxpeer, v );

     return c;
 }
 
 wxWidgetImplType* wxWidgetImpl::CreateBitmapToggleButton( wxWindowMac* wxpeer,
                                     wxWindowMac* WXUNUSED(parent),
     return c;
 }
 
 wxWidgetImplType* wxWidgetImpl::CreateBitmapToggleButton( wxWindowMac* wxpeer,
                                     wxWindowMac* WXUNUSED(parent),

-                                    wxWindowID WXUNUSED(id),
+                                    wxWindowID winid,

                                     const wxBitmap& label,
                                     const wxPoint& pos,
                                     const wxSize& size,
                                     const wxBitmap& label,
                                     const wxPoint& pos,
                                     const wxSize& size,


@@ -60,13 +64,13 @@ wxWidgetImplType* wxWidgetImpl::CreateBitmapToggleButton( wxWindowMac* wxpeer,
     NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
     wxNSButton* v = [[wxNSButton alloc] initWithFrame:r];
 
     NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
     wxNSButton* v = [[wxNSButton alloc] initWithFrame:r];
 

-    if (label.Ok())
+    SetBezelStyleFromBorderFlags(v, style, winid, wxString(), label);
+    
+    if (label.IsOk())

         [v setImage:label.GetNSImage() ];
 
         [v setImage:label.GetNSImage() ];
 

-    SetBezelStyleFromBorderFlags(v, style);
-

     [v setButtonType:NSOnOffButton];
     [v setButtonType:NSOnOffButton];

-    wxWidgetCocoaImpl* c = new wxWidgetCocoaImpl( wxpeer, v );
+    wxWidgetCocoaImpl* c = new wxButtonCocoaImpl( wxpeer, v );

     return c;
 }
 
     return c;
 }