adapting to init pattern

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

diff --git a/src/msw/button.cpp b/src/msw/button.cpp
index 280947275dbb5ec0c2723df69b7135c4ca4cd924..10bb135fb5c71fd46515a2427ccd58765483e146 100644 (file)
--- a/src/msw/button.cpp
+++ b/src/msw/button.cpp
@@ -115,6 +115,10 @@ using namespace wxMSWImpl;
     #define BCM_SETSHIELD       0x160c
 #endif
 
     #define BCM_SETSHIELD       0x160c
 #endif
 

+#if wxUSE_UXTHEME
+extern wxWindowMSW *wxWindowBeingErased; // From src/msw/window.cpp
+#endif // wxUSE_UXTHEME
+

 // ----------------------------------------------------------------------------
 // button image data
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // button image data
 // ----------------------------------------------------------------------------


@@ -153,6 +157,7 @@ public:
     wxODButtonImageData(wxButton *btn, const wxBitmap& bitmap)
     {
         SetBitmap(bitmap, wxButton::State_Normal);
     wxODButtonImageData(wxButton *btn, const wxBitmap& bitmap)
     {
         SetBitmap(bitmap, wxButton::State_Normal);

+        SetBitmap(bitmap.ConvertToDisabled(), wxButton::State_Disabled);

 
         m_dir = wxLEFT;
 
 
         m_dir = wxLEFT;
 


@@ -221,10 +226,11 @@ public:
                 wxButton::State_Max),
           m_hwndBtn(GetHwndOf(btn))
     {
                 wxButton::State_Max),
           m_hwndBtn(GetHwndOf(btn))
     {

-        // initialize all bitmaps to normal state
+        // initialize all bitmaps except for the disabled one to normal state

         for ( int n = 0; n < wxButton::State_Max; n++ )
         {
         for ( int n = 0; n < wxButton::State_Max; n++ )
         {

-            m_iml.Add(bitmap);
+            m_iml.Add(n == wxButton::State_Disabled ? bitmap.ConvertToDisabled()
+                                                    : bitmap);

         }
 
         m_data.himl = GetHimagelistOf(&m_iml);
         }
 
         m_data.himl = GetHimagelistOf(&m_iml);


@@ -512,7 +518,7 @@ WXDWORD wxButton::MSWGetStyle(long style, WXDWORD *exstyle) const
                       );
 
     // we must use WS_CLIPSIBLINGS with the buttons or they would draw over
                       );
 
     // we must use WS_CLIPSIBLINGS with the buttons or they would draw over

-    // each other in any resizeable dialog which has more than one button in
+    // each other in any resizable dialog which has more than one button in

     // the bottom
     msStyle |= WS_CLIPSIBLINGS;
 
     // the bottom
     msStyle |= WS_CLIPSIBLINGS;
 


@@ -1315,7 +1321,20 @@ void DrawXPBackground(wxButton *button, HDC hdc, RECT& rectBtn, UINT state)
                     iState
                  ) )
     {
                     iState
                  ) )
     {

+        // Set this button as the one whose background is being erased: this
+        // allows our WM_ERASEBKGND handler used by DrawThemeParentBackground()
+        // to correctly align the background brush with this window instead of
+        // the parent window to which WM_ERASEBKGND is sent. Notice that this
+        // doesn't work with custom user-defined EVT_ERASE_BACKGROUND handlers
+        // as they won't be aligned but unfortunately all the attempts to fix
+        // it by shifting DC origin before calling DrawThemeParentBackground()
+        // failed to work so we at least do this, even though this is far from
+        // being the perfect solution.
+        wxWindowBeingErased = button;
+

         engine->DrawThemeParentBackground(GetHwndOf(button), hdc, &rectBtn);
         engine->DrawThemeParentBackground(GetHwndOf(button), hdc, &rectBtn);

+
+        wxWindowBeingErased = NULL;

     }
 
     // draw background
     }
 
     // draw background