construct brush used for painting disabled bitmap buttons dynamically (heavily modified patch 1027243)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29197 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2004-09-18 12:34:45 +00:00
parent 8b573fb839
commit d50dbf7c6a
3 changed files with 39 additions and 26 deletions

View File

@@ -111,8 +111,6 @@ const wxChar *wxMDIFrameClassNameNoRedraw = wxT("wxMDIFrameClassNR");
const wxChar *wxMDIChildFrameClassName = wxT("wxMDIChildFrameClass");
const wxChar *wxMDIChildFrameClassNameNoRedraw = wxT("wxMDIChildFrameClassNR");
HBRUSH wxDisableButtonBrush = (HBRUSH) 0;
// ----------------------------------------------------------------------------
// private functions
// ----------------------------------------------------------------------------
@@ -325,20 +323,6 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
RegisterWindowClasses();
#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
// Create the brush for disabling bitmap buttons
LOGBRUSH lb;
lb.lbStyle = BS_PATTERN;
lb.lbColor = 0;
lb.lbHatch = (int)LoadBitmap( wxhInstance, wxT("wxDISABLE_BUTTON_BITMAP") );
if ( lb.lbHatch )
{
wxDisableButtonBrush = ::CreateBrushIndirect( &lb );
::DeleteObject( (HGDIOBJ)lb.lbHatch );
}
//else: wxWidgets resources are probably not linked in
#endif // !__WXMICROWIN__ && !__WXWINCE__
#if wxUSE_PENWINDOWS
wxRegisterPenWin();
#endif
@@ -512,9 +496,6 @@ void wxApp::CleanUp()
wxCleanUpPenWin();
#endif
if ( wxDisableButtonBrush )
::DeleteObject( wxDisableButtonBrush );
#if wxUSE_OLE
#ifdef __WXWINCE__
::CoUninitialize();