fixed TREE_ITEM_MENU generation from right mouse clicks: don't pass WM_RBUTTONDOWN...

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

diff --git a/src/cocoa/bmpbuttn.mm b/src/cocoa/bmpbuttn.mm
index 50da8d7cdcac74332055904b1c94ea95a37173a5..5081c6a5ac1bb730a93b14bdcea4f36f92ee204c 100644 (file)
--- a/src/cocoa/bmpbuttn.mm
+++ b/src/cocoa/bmpbuttn.mm
@@ -6,10 +6,13 @@
 // Created:     2003/03/16
 // RCS-ID:      $Id:
 // Copyright:   (c) 2003 David Elliott
-// Licence:    wxWindows license
+// Licence:    wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
+
+#if wxUSE_BMPBUTTON
+
 #ifndef WX_PRECOMP
     #include "wx/defs.h"
     #include "wx/bmpbuttn.h"
@@ -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