X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/51036b441d580061db2afa4f58cdb56b77b146cb..45b323521bcc3b79c6aa02acc48269eb7e5a80f0:/src/msw/app.cpp?ds=sidebyside diff --git a/src/msw/app.cpp b/src/msw/app.cpp index 602be108da..ea195db53c 100644 --- a/src/msw/app.cpp +++ b/src/msw/app.cpp @@ -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 // ---------------------------------------------------------------------------- @@ -185,7 +183,7 @@ void wxGUIAppTraits::AfterChildWaitLoop(void *dataOrig) { wxEndBusyCursor(); - const ChildWaitLoopData * const data = (ChildWaitLoopData *)dataOrig; + ChildWaitLoopData * const data = (ChildWaitLoopData *)dataOrig; delete data->wd; @@ -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();