include jconfig.vc under OS/2 too

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

diff --git a/src/msw/bmpbuttn.cpp b/src/msw/bmpbuttn.cpp
index 8f0acde1a926be3f57df3f6682e5d81eee5d6770..333ab7a25bff5c4a6a3bdff74c663ab75a4292eb 100644 (file)
--- a/src/msw/bmpbuttn.cpp
+++ b/src/msw/bmpbuttn.cpp
@@ -23,10 +23,10 @@
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/dcmemory.h"
+    #include "wx/image.h"
 #endif
 
 #include "wx/msw/private.h"
-#include "wx/image.h"
 
 #include "wx/msw/uxtheme.h"
 
@@ -130,7 +130,7 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id,
     const wxValidator& wxVALIDATOR_PARAM(validator),
     const wxString& name)
 {
-    m_bmpNormal = bitmap;
+    SetBitmapLabel(bitmap);
     SetName(name);
 
 #if wxUSE_VALIDATORS
@@ -184,7 +184,7 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id,
     SubclassWin(m_hWnd);
 
     SetPosition(pos);
-    SetBestSize(size);
+    SetInitialSize(size);
 
     return true;
 }
@@ -224,7 +224,19 @@ void wxBitmapButton::OnMouseEnterOrLeave(wxMouseEvent& event)
     event.Skip();
 }
 
-void wxBitmapButton::OnSetBitmap()
+void wxBitmapButton::SetBitmapLabel(const wxBitmap& bitmap)
+{
+#if wxUSE_IMAGE
+    if ( !HasFlag(wxBU_AUTODRAW) && !m_disabledSetByUser && bitmap.IsOk() )
+    {
+        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
@@ -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)
-    if ( !m_bmpHover.Ok() &&
-            m_bmpFocus.Ok() &&
-                wxUxThemeEngine::GetIfActive() )
-    {
+    if ( focus.Ok() && !m_hoverSetByUser )
         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
@@ -408,8 +431,7 @@ bool wxBitmapButton::MSWOnDraw(WXDRAWITEMSTRUCT *item)
         }
 
         // draw the bitmap
-        wxClientDC dst;
-        dst.SetHDC((WXHDC) hDC, false);
+        wxDCTemp dst((WXHDC)hDC);
         dst.DrawBitmap(*bitmap, x1, y1, true);
 
         return true;
@@ -583,11 +605,6 @@ wxBitmapButton::DrawButtonDisable( WXHDC dc,
     ::PatBlt( (HDC) dc, left, top, right, bottom, PATTERNPAINT);
 }
 
-void wxBitmapButton::SetDefault()
-{
-    wxButton::SetDefault();
-}
-
 wxSize wxBitmapButton::DoGetBestSize() const
 {
     if ( m_bmpNormal.Ok() )
@@ -619,8 +636,10 @@ wxSize wxBitmapButton::DoGetBestSize() const
             // them and it just makes them appear larger than needed
             if ( !HasFlag(wxBORDER_NONE) )
             {
-                marginH = margins.cxLeftWidth + margins.cxRightWidth;
-                marginV = margins.cyTopHeight + margins.cyBottomHeight;
+                // we need 2 extra pixels for the focus rectangle, without them
+                // it's overwritten by the bitmap itself
+                marginH = margins.cxLeftWidth + margins.cxRightWidth + 2;
+                marginV = margins.cyTopHeight + margins.cyBottomHeight + 2;
             }
         }
         else