A little clarification

[wxWidgets.git] / src / mac / bmpbuttn.cpp

diff --git a/src/mac/bmpbuttn.cpp b/src/mac/bmpbuttn.cpp
index f29677665210d7a71aecda0a6ec3210ca45dcf44..9d66f2da5140b79bbee23e9327008319caacdb9a 100644 (file)
--- a/src/mac/bmpbuttn.cpp
+++ b/src/mac/bmpbuttn.cpp
@@ -23,23 +23,41 @@ IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton)
 #include "wx/mac/uma.h"
 #include "wx/bitmap.h"
 
 #include "wx/mac/uma.h"
 #include "wx/bitmap.h"
 

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

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

-    if ( !wxBitmapButtonBase::Create(parent, id, _T(""), pos, size,
+    // since bitmapbuttonbase is subclass of button calling wxBitmapButtonBase::Create
+    // essentially creates an additional button
+    if ( !wxControl::Create(parent, id, pos, size,

                                      style, validator, name) )
         return false;
 
     m_bmpNormal = bitmap;
  
                                      style, validator, name) )
         return false;
 
     m_bmpNormal = bitmap;
  

-    m_marginX = 0;
-    m_marginY = 0;
+    if (style & wxBU_AUTODRAW)
+    {
+        m_marginX = wxDEFAULT_BUTTON_MARGIN;
+        m_marginY = wxDEFAULT_BUTTON_MARGIN;
+    }
+    else
+    {
+        m_marginX = 0;
+        m_marginY = 0;
+    }

 
 

-    // int x = pos.x;
-    // int y = pos.y;

     int width = size.x;
     int height = size.y;
 
     int width = size.x;
     int height = size.y;