Fixing icon drawing and implementing HitTest and GetItemRect for native OS X list...

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

diff --git a/src/univ/bmpbuttn.cpp b/src/univ/bmpbuttn.cpp
index 5efb9f76a320246e53a088dbb9f7bc284c5add96..2a9f873cccbc1b84a506867ff3bcb813aea97b44 100644 (file)
--- a/src/univ/bmpbuttn.cpp
+++ b/src/univ/bmpbuttn.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        univ/bmpbuttn.cpp
+// Name:        src/univ/bmpbuttn.cpp
 // Purpose:     wxBitmapButton implementation
 // Author:      Vadim Zeitlin
 // Modified by:
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "univbmpbuttn.h"
-#endif
-
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
@@ -29,9 +25,10 @@
 
 #if wxUSE_BMPBUTTON
 
+#include "wx/bmpbuttn.h"
+
 #ifndef WX_PRECOMP
     #include "wx/dc.h"
-    #include "wx/bmpbuttn.h"
     #include "wx/validate.h"
 #endif
 
@@ -52,32 +49,6 @@ END_EVENT_TABLE()
 // wxBitmapButton
 // ----------------------------------------------------------------------------
 
-wxBitmapButtonBase::wxBitmapButtonBase()
-                                      : m_bmpNormal(), 
-                                        m_bmpSelected(), 
-                                        m_bmpFocus(), 
-                                        m_bmpDisabled(), 
-                                        m_marginX(0), 
-                                        m_marginY(0)
-{
-}
-
-wxBitmapButton::wxBitmapButton()
-{
-}
-
-wxBitmapButton::wxBitmapButton(wxWindow *parent,
-                               wxWindowID id,
-                               const wxBitmap& bitmap,
-                               const wxPoint& pos,
-                               const wxSize& size,
-                               long style,
-                               const wxValidator& validator,
-                               const wxString& name)
-{
-    Create(parent, id, bitmap, pos, size, style, validator, name);
-}
-
 bool wxBitmapButton::Create(wxWindow *parent,
                             wxWindowID id,
                             const wxBitmap& bitmap,
@@ -90,13 +61,13 @@ bool wxBitmapButton::Create(wxWindow *parent,
     // we add wxBU_EXACTFIT because the bitmap buttons are not the standard
     // ones and so shouldn't be forced to be of the standard size which is
     // typically too big for them
-    if ( !wxButton::Create(parent, id, bitmap, _T(""),
+    if ( !wxButton::Create(parent, id, bitmap, wxEmptyString,
                            pos, size, style | wxBU_EXACTFIT, validator, name) )
-        return FALSE;
+        return false;
 
     m_bmpNormal = bitmap;
 
-    return TRUE;
+    return true;
 }
 
 void wxBitmapButton::OnSetBitmap()
@@ -125,25 +96,23 @@ void wxBitmapButton::OnSetBitmap()
 bool wxBitmapButton::ChangeBitmap(const wxBitmap& bmp)
 {
     wxBitmap bitmap = bmp.Ok() ? bmp : m_bmpNormal;
-    if ( bitmap != m_bitmap )
-    {
-        m_bitmap = bitmap;
+    if ( bitmap.IsSameAs(m_bitmap) )
+        return false;
 
-        return TRUE;
-    }
+    m_bitmap = bitmap;
 
-    return FALSE;
+    return true;
 }
 
 bool wxBitmapButton::Enable(bool enable)
 {
     if ( !wxButton::Enable(enable) )
-        return FALSE;
+        return false;
 
     if ( !enable && ChangeBitmap(m_bmpDisabled) )
         Refresh();
 
-    return TRUE;
+    return true;
 }
 
 bool wxBitmapButton::SetCurrent(bool doit)
@@ -184,4 +153,3 @@ void wxBitmapButton::Release()
 }
 
 #endif // wxUSE_BMPBUTTON
-