use focused bitmap as fallback for the hover one

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36078 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/latex/wx/bbutton.tex b/docs/latex/wx/bbutton.tex
index dea75ce92596489e4ca117a15fc635c1fab06a5a..b6c7cf679716bc064e74b0ea460ebb1102396e90 100644 (file)
--- a/docs/latex/wx/bbutton.tex
+++ b/docs/latex/wx/bbutton.tex
@@ -40,7 +40,11 @@ to be set.}
 \twocolitem{\windowstyle{focus}}{Bitmap shown when the button has keyboard
 focus but is not pressed.}
 \twocolitem{\windowstyle{hover}}{Bitmap shown when the mouse is over the
-button (but it is not pressed).}
+button (but it is not pressed). Notice that if hover bitmap is not specified
+but the current platform UI uses hover images for the buttons (such as Windows
+XP or GTK+), then the focus bitmap is used for hover state as well. This makes
+it possible to set focus bitmap only to get reasonably good behaviour on all
+platforms.}
 \end{twocollist}
 
 

diff --git a/include/wx/msw/bmpbuttn.h b/include/wx/msw/bmpbuttn.h
index 2c4ec78da198129e97dc0ede55c48a6a61d62f4d..93ee168fa79f72db9971063c7269b76d4b069f84 100644 (file)
--- a/include/wx/msw/bmpbuttn.h
+++ b/include/wx/msw/bmpbuttn.h
@@ -51,7 +51,9 @@ public:
     virtual void DrawButtonDisable( WXHDC dc, int left, int top, int right, int bottom, bool with_marg );
 
 protected:
+    // reimplement some base class virtuals
     virtual wxSize DoGetBestSize() const;
+    virtual void OnSetBitmap();
 
     // invalidate m_brushDisabled when system colours change
     void OnSysColourChanged(wxSysColourChangedEvent& event);

diff --git a/src/msw/bmpbuttn.cpp b/src/msw/bmpbuttn.cpp
index 0ff7de542409dc207813f2a9b3519bdd405ba44f..3ca9fe2050fcfea8521c4f62b7a9981f72a88ba8 100644 (file)
--- a/src/msw/bmpbuttn.cpp
+++ b/src/msw/bmpbuttn.cpp
@@ -26,6 +26,7 @@
 
 #include "wx/msw/private.h"
 #include "wx/image.h"
+#include "wx/msw/uxtheme.h"
 
 // ----------------------------------------------------------------------------
 // macros
@@ -204,6 +205,26 @@ void wxBitmapButton::OnMouseEnterOrLeave(wxMouseEvent& event)
     event.Skip();
 }
 
+void wxBitmapButton::OnSetBitmap()
+{
+    // 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
+    // Windows version look and feel
+    //
+    // 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() )
+    {
+        m_bmpHover = m_bmpFocus;
+    }
+
+    // this will redraw us
+    wxBitmapButtonBase::OnSetBitmap();
+}
+
 // VZ: should be at the very least less than wxDEFAULT_BUTTON_MARGIN
 #define FOCUS_MARGIN 3