Fixed [ 1561693 ] wxGIFDecoder creates incorrect wxPalette

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

diff --git a/src/cocoa/bmpbuttn.mm b/src/cocoa/bmpbuttn.mm
index 50da8d7cdcac74332055904b1c94ea95a37173a5..c35d8ea44b768fe7a7899d635a0b6bb7f5e8339c 100644 (file)
--- a/src/cocoa/bmpbuttn.mm
+++ b/src/cocoa/bmpbuttn.mm
@@ -1,18 +1,21 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        cocoa/bmpbuttn.mm
+// Name:        src/cocoa/bmpbuttn.mm
 // Purpose:     wxBitmapButton
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/03/16
-// RCS-ID:      $Id:
+// RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
-// Licence:    wxWindows license
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
+
+#if wxUSE_BMPBUTTON
+
+#include "wx/bmpbuttn.h"
+
 #ifndef WX_PRECOMP
-    #include "wx/defs.h"
-    #include "wx/bmpbuttn.h"
     #include "wx/log.h"
 #endif
 
@@ -42,8 +45,8 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID winid,
     // DoAddChild(this) will retain us again since addSubView doesn't.
     [m_cocoaNSView release];
 
-    [GetNSButton() setBezelStyle:NSRoundedBezelStyle];
-    [GetNSButton() setTitle:@"Bitmap Button"];
+    [GetNSButton() setBezelStyle: NSRegularSquareBezelStyle];
+    [GetNSButton() setImage:bitmap.GetNSImage(true)];
     [GetNSControl() sizeToFit];
 
     if(m_parent)
@@ -66,3 +69,4 @@ void wxBitmapButton::Cocoa_wxNSButtonAction(void)
     Command(event);
 }
 
+#endif