]> git.saurik.com Git - wxWidgets.git/blobdiff - src/osx/cocoa/tglbtn.mm
Make public headers compatible with Objective-C++ with ARC.
[wxWidgets.git] / src / osx / cocoa / tglbtn.mm
index 837a3969ef1d50d7246c8252f5f0f1eedfce0004..3dd6dedd8722cd1bbdff2f1c9ad666b82516e057 100644 (file)
@@ -5,7 +5,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     08.02.01
-// RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -30,7 +29,8 @@
 extern "C" void SetBezelStyleFromBorderFlags(NSButton *v,
                                              long style,
                                              wxWindowID winid = wxID_ANY,
-                                             const wxString& label = wxString());
+                                             const wxString& label = wxString(),
+                                             const wxBitmap& bitmap = wxBitmap());
 
 wxWidgetImplType* wxWidgetImpl::CreateToggleButton( wxWindowMac* wxpeer,
                                     wxWindowMac* WXUNUSED(parent),
@@ -63,7 +63,7 @@ wxWidgetImplType* wxWidgetImpl::CreateBitmapToggleButton( wxWindowMac* wxpeer,
     NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
     wxNSButton* v = [[wxNSButton alloc] initWithFrame:r];
 
-    SetBezelStyleFromBorderFlags(v, style, winid);
+    SetBezelStyleFromBorderFlags(v, style, winid, wxString(), label);
     
     if (label.IsOk())
         [v setImage:label.GetNSImage() ];