guarding open combo box against AppDefined NSEvents issued by wxEventLoop::WakeUp...

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

diff --git a/src/osx/cocoa/tglbtn.mm b/src/osx/cocoa/tglbtn.mm
index 8f752de7d20adb32df2b8dfe900ef94511cd8d25..ab7aab16f73395520fcdd94ed9cee622ca4a44dc 100644 (file)
--- a/src/osx/cocoa/tglbtn.mm
+++ b/src/osx/cocoa/tglbtn.mm
@@ -5,9 +5,9 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     08.02.01
-// RCS-ID:      $Id: tglbtn.cpp 54129 2008-06-11 19:30:52Z SC $
+// RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// License:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -27,30 +27,34 @@
 
 // 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),
-                                    wxWindowID WXUNUSED(id),
-                                    const wxString& WXUNUSED(label),
+                                    wxWindowID winid,
+                                    const wxString& label,
                                     const wxPoint& pos,
                                     const wxSize& size,
-                                    long WXUNUSED(style),
+                                    long style,
                                     long WXUNUSED(extraStyle))
 {
     NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
     wxNSButton* v = [[wxNSButton alloc] initWithFrame:r];
 
-    SetBezelStyleFromBorderFlags(v, style);
+    SetBezelStyleFromBorderFlags(v, style, winid, label);
 
     [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),
-                                    wxWindowID WXUNUSED(id),
+                                    wxWindowID winid,
                                     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];
 
-    if (label.Ok())
+    SetBezelStyleFromBorderFlags(v, style, winid, wxString(), label);
+    
+    if (label.IsOk())
         [v setImage:label.GetNSImage() ];
 
-    SetBezelStyleFromBorderFlags(v, style);
-
     [v setButtonType:NSOnOffButton];
-    wxWidgetCocoaImpl* c = new wxWidgetCocoaImpl( wxpeer, v );
+    wxWidgetCocoaImpl* c = new wxButtonCocoaImpl( wxpeer, v );
     return c;
 }