Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update the disabled buttons appearance when system colours change (followup to patch 1027243)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29620 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2004-10-03 13:46:11 +00:00
parent 8093538cc5
commit a6fd0fde4c
2 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/wx/msw/bmpbuttn.h
View File

@@ -59,8 +59,15 @@ public:
protected: protected:
virtual wxSize DoGetBestSize() const; virtual wxSize DoGetBestSize() const;
// invalidate m_brushDisabled when system colours change
void OnSysColourChanged(wxSysColourChangedEvent& event);
// the brush we use to draw disabled buttons
wxBrush m_brushDisabled; wxBrush m_brushDisabled;
DECLARE_EVENT_TABLE()
DECLARE_DYNAMIC_CLASS_NO_COPY(wxBitmapButton) DECLARE_DYNAMIC_CLASS_NO_COPY(wxBitmapButton)
}; };

17
src/msw/bmpbuttn.cpp
View File

@@ -89,6 +89,10 @@ wxCONSTRUCTOR_5( wxBitmapButton , wxWindow* , Parent , wxWindowID , Id , wxBitma
IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton) IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton)
#endif #endif
BEGIN_EVENT_TABLE(wxBitmapButton, wxBitmapButtonBase)
EVT_SYS_COLOUR_CHANGED(wxBitmapButton::OnSysColourChanged)
END_EVENT_TABLE()
/* /*
TODO PROPERTIES : TODO PROPERTIES :
@@ -183,6 +187,19 @@ bool wxBitmapButton::SetBackgroundColour(const wxColour& colour)
return true; return true;
} }
void wxBitmapButton::OnSysColourChanged(wxSysColourChangedEvent& event)
{
m_brushDisabled = wxNullBrush;
if ( !IsEnabled() )
{
// this change affects our current state
Refresh();
}
event.Skip();
}
// VZ: should be at the very least less than wxDEFAULT_BUTTON_MARGIN // VZ: should be at the very least less than wxDEFAULT_BUTTON_MARGIN
#define FOCUS_MARGIN 3 #define FOCUS_MARGIN 3