Applied patch [ 1701723 ] wxAUI: Added event for doubleclicks on the tabbar bg

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

diff --git a/src/msw/bmpbuttn.cpp b/src/msw/bmpbuttn.cpp
index e20d012df28efde3d4c441636c169acb45616705..83f7efc9d5edfd2c64cbbd278ce0a29274178c14 100644 (file)
--- a/src/msw/bmpbuttn.cpp
+++ b/src/msw/bmpbuttn.cpp
@@ -130,7 +130,7 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id,
     const wxValidator& wxVALIDATOR_PARAM(validator),
     const wxString& name)
 {
     const wxValidator& wxVALIDATOR_PARAM(validator),
     const wxString& name)
 {

-    m_bmpNormal = bitmap;
+    SetBitmapLabel(bitmap);

     SetName(name);
 
 #if wxUSE_VALIDATORS
     SetName(name);
 
 #if wxUSE_VALIDATORS


@@ -224,7 +224,19 @@ void wxBitmapButton::OnMouseEnterOrLeave(wxMouseEvent& event)
     event.Skip();
 }
 
     event.Skip();
 }
 

-void wxBitmapButton::OnSetBitmap()
+void wxBitmapButton::SetBitmapLabel(const wxBitmap& bitmap)
+{
+#if wxUSE_IMAGE
+    if ( !HasFlag(wxBU_AUTODRAW) && !m_disabledSetByUser )
+    {
+        m_bmpDisabled = wxBitmap(bitmap.ConvertToImage().ConvertToGreyscale());
+    }
+#endif // wxUSE_IMAGE
+
+    wxBitmapButtonBase::SetBitmapLabel(bitmap);
+}
+
+void wxBitmapButton::SetBitmapFocus(const wxBitmap& focus)

 {
     // if the focus bitmap is specified but hover one isn't, use the focus
     // bitmap for hovering as well if this is consistent with the current
 {
     // if the focus bitmap is specified but hover one isn't, use the focus
     // bitmap for hovering as well if this is consistent with the current


@@ -233,15 +245,26 @@ void wxBitmapButton::OnSetBitmap()
     // rationale: this is compatible with the old wxGTK behaviour and also
     // makes it much easier to do "the right thing" for all platforms (some of
     // them, such as Windows XP, have "hot" buttons while others don't)
     // rationale: this is compatible with the old wxGTK behaviour and also
     // makes it much easier to do "the right thing" for all platforms (some of
     // them, such as Windows XP, have "hot" buttons while others don't)

-    if ( !m_bmpHover.Ok() &&
-            m_bmpFocus.Ok() &&
-                wxUxThemeEngine::GetIfActive() )
-    {
+    if ( focus.Ok() && !m_hoverSetByUser )

         m_bmpHover = m_bmpFocus;
         m_bmpHover = m_bmpFocus;

-    }

 
 

-    // this will redraw us
-    wxBitmapButtonBase::OnSetBitmap();
+    wxBitmapButtonBase::SetBitmapFocus(focus);
+}
+
+void wxBitmapButton::SetBitmapDisabled(const wxBitmap& disabled)
+{
+    if ( disabled.IsOk() )
+        m_disabledSetByUser = true;
+
+    wxBitmapButtonBase::SetBitmapDisabled(disabled);
+}
+
+void wxBitmapButton::SetBitmapHover(const wxBitmap& hover)
+{
+    if ( hover.IsOk() )
+        m_hoverSetByUser = true;
+
+    wxBitmapButtonBase::SetBitmapHover(hover);

 }
 
 #if wxUSE_UXTHEME
 }
 
 #if wxUSE_UXTHEME