Propagate the event handling fixes to wxVarScrollHelperBase.

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

diff --git a/src/cocoa/bmpbuttn.mm b/src/cocoa/bmpbuttn.mm
index 3b12f4224fc3202bc24d6a5d2039e52b3d690bc0..99e9cbd4b7aa50036d0242979a0e3ccc86960392 100644 (file)
--- a/src/cocoa/bmpbuttn.mm
+++ b/src/cocoa/bmpbuttn.mm
@@ -1,18 +1,20 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        cocoa/bmpbuttn.mm
+// Name:        src/cocoa/bmpbuttn.mm

 // Purpose:     wxBitmapButton
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/03/16
 // Purpose:     wxBitmapButton
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/03/16

-// RCS-ID:      $Id:

 // Copyright:   (c) 2003 David Elliott
 // Copyright:   (c) 2003 David Elliott

-// Licence:    wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"

+
+#if wxUSE_BMPBUTTON
+
+#include "wx/bmpbuttn.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include "wx/defs.h"
-    #include "wx/bmpbuttn.h"

     #include "wx/log.h"
 #endif
 
     #include "wx/log.h"
 #endif
 


@@ -21,39 +23,28 @@
 #import <AppKit/NSButton.h>
 #import <Foundation/NSString.h>
 
 #import <AppKit/NSButton.h>
 #import <Foundation/NSString.h>
 

-IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxControl)

 BEGIN_EVENT_TABLE(wxBitmapButton, wxBitmapButtonBase)
 END_EVENT_TABLE()
 WX_IMPLEMENT_COCOA_OWNER(wxBitmapButton,NSButton,NSControl,NSView)
 
 BEGIN_EVENT_TABLE(wxBitmapButton, wxBitmapButtonBase)
 END_EVENT_TABLE()
 WX_IMPLEMENT_COCOA_OWNER(wxBitmapButton,NSButton,NSControl,NSView)
 

-wxBitmapButtonBase::wxBitmapButtonBase()
-                                      : m_bmpNormal(), 
-                                        m_bmpSelected(), 
-                                        m_bmpFocus(), 
-                                        m_bmpDisabled(), 
-                                        m_marginX(0), 
-                                        m_marginY(0)
-{
-}
-

 bool wxBitmapButton::Create(wxWindow *parent, wxWindowID winid,
             const wxBitmap& bitmap, const wxPoint& pos,
             const wxSize& size, long style,
             const wxValidator& validator, const wxString& name)
 {
     wxAutoNSAutoreleasePool pool;
 bool wxBitmapButton::Create(wxWindow *parent, wxWindowID winid,
             const wxBitmap& bitmap, const wxPoint& pos,
             const wxSize& size, long style,
             const wxValidator& validator, const wxString& name)
 {
     wxAutoNSAutoreleasePool pool;

-    wxLogDebug("Creating control with id=%d",winid);
+    wxLogTrace(wxTRACE_COCOA,wxT("Creating control with id=%d"),winid);

     if(!CreateControl(parent,winid,pos,size,style,validator,name))
         return false;
     if(!CreateControl(parent,winid,pos,size,style,validator,name))
         return false;

-    wxLogDebug("Created control with id=%d",GetId());
+    wxLogTrace(wxTRACE_COCOA,wxT("Created control with id=%d"),GetId());

     m_cocoaNSView = NULL;
     SetNSButton([[NSButton alloc] initWithFrame: MakeDefaultNSRect(size)]);
     // NOTE: YES we want to release this (to match the alloc).
     // DoAddChild(this) will retain us again since addSubView doesn't.
     [m_cocoaNSView release];
 
     m_cocoaNSView = NULL;
     SetNSButton([[NSButton alloc] initWithFrame: MakeDefaultNSRect(size)]);
     // NOTE: YES we want to release this (to match the alloc).
     // 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)
     [GetNSControl() sizeToFit];
 
     if(m_parent)


@@ -70,9 +61,10 @@ wxBitmapButton::~wxBitmapButton()
 
 void wxBitmapButton::Cocoa_wxNSButtonAction(void)
 {
 
 void wxBitmapButton::Cocoa_wxNSButtonAction(void)
 {

-    wxLogDebug("YAY!");
-    wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, GetId());
+    wxLogTrace(wxTRACE_COCOA,wxT("YAY!"));
+    wxCommandEvent event(wxEVT_BUTTON, GetId());

     InitCommandEvent(event); //    event.SetEventObject(this);
     Command(event);
 }
 
     InitCommandEvent(event); //    event.SetEventObject(this);
     Command(event);
 }
 

+#endif