X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/46fa338b6f7462b684b2d6c694849769f75a2cf9..b9efe021b554fa3967d1442cf758435c5cd5ae8f:/src/msw/app.cpp diff --git a/src/msw/app.cpp b/src/msw/app.cpp index 6c4e94bacd..529d6688c0 100644 --- a/src/msw/app.cpp +++ b/src/msw/app.cpp @@ -54,6 +54,7 @@ #include "wx/dynlib.h" #include "wx/msw/private.h" +#include "wx/msw/ole/oleutils.h" #if wxUSE_TOOLTIPS #include "wx/tooltip.h" @@ -67,6 +68,10 @@ #define wxUSE_OLE 0 #endif // broken compilers +#if defined(__POCKETPC__) || defined(__SMARTPHONE__) +#include +#endif + #if wxUSE_OLE #include #endif @@ -81,6 +86,7 @@ #include "wx/msw/wince/missing.h" #endif +// For DLLVER_PLATFORM_WINDOWS #if (!defined(__MINGW32__) || wxCHECK_W32API_VERSION( 2, 0 )) && \ !defined(__CYGWIN__) && !defined(__DIGITALMARS__) && !defined(__WXWINCE__) && \ (!defined(_MSC_VER) || (_MSC_VER > 1100)) @@ -100,18 +106,16 @@ extern void wxSetKeyboardHook(bool doIt); // NB: all "NoRedraw" classes must have the same names as the "normal" classes // with NR suffix - wxWindow::MSWCreate() supposes this #ifdef __WXWINCE__ - wxChar *wxCanvasClassName; - wxChar *wxCanvasClassNameNR; +WXDLLIMPEXP_CORE wxChar *wxCanvasClassName; +WXDLLIMPEXP_CORE wxChar *wxCanvasClassNameNR; #else -const wxChar *wxCanvasClassName = wxT("wxWindowClass"); -const wxChar *wxCanvasClassNameNR = wxT("wxWindowClassNR"); +WXDLLIMPEXP_CORE const wxChar *wxCanvasClassName = wxT("wxWindowClass"); +WXDLLIMPEXP_CORE const wxChar *wxCanvasClassNameNR = wxT("wxWindowClassNR"); #endif -const wxChar *wxMDIFrameClassName = wxT("wxMDIFrameClass"); -const wxChar *wxMDIFrameClassNameNoRedraw = wxT("wxMDIFrameClassNR"); -const wxChar *wxMDIChildFrameClassName = wxT("wxMDIChildFrameClass"); -const wxChar *wxMDIChildFrameClassNameNoRedraw = wxT("wxMDIChildFrameClassNR"); - -HBRUSH wxDisableButtonBrush = (HBRUSH) 0; +WXDLLIMPEXP_CORE const wxChar *wxMDIFrameClassName = wxT("wxMDIFrameClass"); +WXDLLIMPEXP_CORE const wxChar *wxMDIFrameClassNameNoRedraw = wxT("wxMDIFrameClassNR"); +WXDLLIMPEXP_CORE const wxChar *wxMDIChildFrameClassName = wxT("wxMDIChildFrameClass"); +WXDLLIMPEXP_CORE const wxChar *wxMDIChildFrameClassNameNoRedraw = wxT("wxMDIChildFrameClassNR"); // ---------------------------------------------------------------------------- // private functions @@ -185,7 +189,7 @@ void wxGUIAppTraits::AfterChildWaitLoop(void *dataOrig) { wxEndBusyCursor(); - const ChildWaitLoopData * const data = (ChildWaitLoopData *)dataOrig; + ChildWaitLoopData * const data = (ChildWaitLoopData *)dataOrig; delete data->wd; @@ -193,6 +197,9 @@ void wxGUIAppTraits::AfterChildWaitLoop(void *dataOrig) // the other windows reenabled, the activation is going to return to the // window which had had it before data->winActive->Destroy(); + + // also delete the temporary data object itself + delete data; } bool wxGUIAppTraits::DoMessageFromThreadWait() @@ -273,70 +280,18 @@ bool wxApp::Initialize(int& argc, wxChar **argv) } #endif - // the first thing to do is to check if we're trying to run an Unicode - // program under Win9x w/o MSLU emulation layer - if so, abort right now - // as it has no chance to work -#if wxUSE_UNICODE && !wxUSE_UNICODE_MSLU - if ( wxGetOsVersion() != wxWINDOWS_NT && wxGetOsVersion() != wxWINDOWS_CE ) - { - // note that we can use MessageBoxW() as it's implemented even under - // Win9x - OTOH, we can't use wxGetTranslation() because the file APIs - // used by wxLocale are not - ::MessageBox - ( - NULL, - _T("This program uses Unicode and requires Windows NT/2000/XP/CE.\nProgram aborted."), - _T("wxWindows Fatal Error"), - MB_ICONERROR | MB_OK - ); - - return FALSE; - } -#endif // wxUSE_UNICODE && !wxUSE_UNICODE_MSLU - #if defined(__WIN95__) && !defined(__WXMICROWIN__) InitCommonControls(); #endif // __WIN95__ -#if wxUSE_OLE || wxUSE_DRAG_AND_DROP - -#if wxUSE_OLE - // we need to initialize OLE library -#ifdef __WXWINCE__ - if ( FAILED(::CoInitializeEx(NULL, COINIT_MULTITHREADED)) ) - wxLogError(_("Cannot initialize OLE")); -#else - if ( FAILED(::OleInitialize(NULL)) ) - wxLogError(_("Cannot initialize OLE")); -#endif +#if defined(__SMARTPHONE__) || defined(__POCKETPC__) + SHInitExtraControls(); #endif -#endif // wxUSE_OLE - -#if wxUSE_CTL3D - if (!Ctl3dRegister(wxhInstance)) - wxLogError(wxT("Cannot register CTL3D")); - - Ctl3dAutoSubclass(wxhInstance); -#endif // wxUSE_CTL3D + wxOleInitialize(); 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: wxWindows resources are probably not linked in -#endif - #if wxUSE_PENWINDOWS wxRegisterPenWin(); #endif @@ -344,7 +299,7 @@ bool wxApp::Initialize(int& argc, wxChar **argv) wxWinHandleHash = new wxWinHashTable(wxKEY_INTEGER, 100); #if !defined(__WXMICROWIN__) && !defined(__WXWINCE__) - wxSetKeyboardHook(TRUE); + wxSetKeyboardHook(true); #endif callBaseCleanup.Dismiss(); @@ -374,8 +329,8 @@ bool wxApp::RegisterWindowClasses() wndclass.hInstance = wxhInstance; wndclass.hCursor = ::LoadCursor((HINSTANCE)NULL, IDC_ARROW); - // Register the frame window class. - wndclass.hbrBackground = (HBRUSH)(COLOR_APPWORKSPACE + 1); + // register the class for all normal windows + wndclass.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1); wndclass.lpszClassName = wxCanvasClassName; wndclass.style = styleNormal; @@ -431,7 +386,7 @@ bool wxApp::RegisterWindowClasses() wxLogLastError(wxT("RegisterClass(no redraw MDI child)")); } - return TRUE; + return true; } // --------------------------------------------------------------------------- @@ -440,7 +395,7 @@ bool wxApp::RegisterWindowClasses() bool wxApp::UnregisterWindowClasses() { - bool retval = TRUE; + bool retval = true; #ifndef __WXMICROWIN__ // MDI frame window class. @@ -448,7 +403,7 @@ bool wxApp::UnregisterWindowClasses() { wxLogLastError(wxT("UnregisterClass(MDI parent)")); - retval = FALSE; + retval = false; } // "no redraw" MDI frame @@ -456,7 +411,7 @@ bool wxApp::UnregisterWindowClasses() { wxLogLastError(wxT("UnregisterClass(no redraw MDI parent frame)")); - retval = FALSE; + retval = false; } // MDI child frame window class. @@ -464,7 +419,7 @@ bool wxApp::UnregisterWindowClasses() { wxLogLastError(wxT("UnregisterClass(MDI child)")); - retval = FALSE; + retval = false; } // "no redraw" MDI child frame @@ -472,7 +427,7 @@ bool wxApp::UnregisterWindowClasses() { wxLogLastError(wxT("UnregisterClass(no redraw MDI child)")); - retval = FALSE; + retval = false; } // canvas class name @@ -480,14 +435,14 @@ bool wxApp::UnregisterWindowClasses() { wxLogLastError(wxT("UnregisterClass(canvas)")); - retval = FALSE; + retval = false; } if ( !::UnregisterClass(wxCanvasClassNameNR, wxhInstance) ) { wxLogLastError(wxT("UnregisterClass(no redraw canvas)")); - retval = FALSE; + retval = false; } #endif // __WXMICROWIN__ @@ -503,23 +458,14 @@ void wxApp::CleanUp() wxAppBase::CleanUp(); #if !defined(__WXMICROWIN__) && !defined(__WXWINCE__) - wxSetKeyboardHook(FALSE); + wxSetKeyboardHook(false); #endif #if wxUSE_PENWINDOWS wxCleanUpPenWin(); #endif - if ( wxDisableButtonBrush ) - ::DeleteObject( wxDisableButtonBrush ); - -#if wxUSE_OLE -#ifdef __WXWINCE__ - ::CoUninitialize(); -#else - ::OleUninitialize(); -#endif -#endif + wxOleUninitialize(); // for an EXE the classes are unregistered when it terminates but DLL may // be loaded several times (load/unload/load) into the same process in @@ -527,10 +473,6 @@ void wxApp::CleanUp() // unregister the classes now UnregisterWindowClasses(); -#if wxUSE_CTL3D - Ctl3dUnregister(wxhInstance); -#endif - delete wxWinHandleHash; wxWinHandleHash = NULL; @@ -605,7 +547,7 @@ void wxApp::WakeUpIdle() void wxApp::OnEndSession(wxCloseEvent& WXUNUSED(event)) { if (GetTopWindow()) - GetTopWindow()->Close(TRUE); + GetTopWindow()->Close(true); } // Default behaviour: close the application with prompts. The @@ -615,7 +557,7 @@ void wxApp::OnQueryEndSession(wxCloseEvent& event) if (GetTopWindow()) { if (!GetTopWindow()->Close(!event.CanVeto())) - event.Veto(TRUE); + event.Veto(true); } } @@ -626,8 +568,7 @@ void wxApp::OnQueryEndSession(wxCloseEvent& event) /* static */ int wxApp::GetComCtl32Version() { -//FIX ME FOR DIGITALMARS!! -#if defined(__WXMICROWIN__) || defined(__WXWINCE__) || defined(__DIGITALMARS__) +#if defined(__WXMICROWIN__) || defined(__WXWINCE__) return 0; #else // cache the result @@ -650,7 +591,17 @@ int wxApp::GetComCtl32Version() // if so, then we can check for the version if ( dllComCtl32.IsLoaded() ) { -#ifdef DLLVER_PLATFORM_WINDOWS +#ifndef DLLVER_PLATFORM_WINDOWS + typedef struct _DllVersionInfo + { + DWORD cbSize; + DWORD dwMajorVersion; // Major version + DWORD dwMinorVersion; // Minor version + DWORD dwBuildNumber; // Build number + DWORD dwPlatformID; // DLLVER_PLATFORM_* + } DLLVERSIONINFO; + typedef HRESULT (CALLBACK* DLLGETVERSIONPROC)(DLLVERSIONINFO *); +#endif // try to use DllGetVersion() if available in _headers_ wxDYNLIB_FUNCTION( DLLGETVERSIONPROC, DllGetVersion, dllComCtl32 ); if ( pfnDllGetVersion ) @@ -672,7 +623,6 @@ int wxApp::GetComCtl32Version() dvi.dwMinorVersion; } } -#endif // if DllGetVersion() is unavailable either during compile or // run-time, try to guess the version otherwise @@ -714,7 +664,7 @@ int wxApp::GetComCtl32Version() bool wxApp::Yield(bool onlyIfNeeded) { // MT-FIXME - static bool s_inYield = FALSE; + static bool s_inYield = false; #if wxUSE_LOG // disable log flushing from here because a call to wxYield() shouldn't @@ -729,10 +679,10 @@ bool wxApp::Yield(bool onlyIfNeeded) wxFAIL_MSG( wxT("wxYield called recursively" ) ); } - return FALSE; + return false; } - s_inYield = TRUE; + s_inYield = true; // we don't want to process WM_QUIT from here - it should be processed in // the main event loop in order to stop it @@ -756,9 +706,9 @@ bool wxApp::Yield(bool onlyIfNeeded) wxLog::Resume(); #endif // wxUSE_LOG - s_inYield = FALSE; + s_inYield = false; - return TRUE; + return true; } #if wxUSE_EXCEPTIONS @@ -770,7 +720,7 @@ bool wxApp::Yield(bool onlyIfNeeded) bool wxApp::OnExceptionInMainLoop() { // ask the user about what to do: use the Win32 API function here as it - // could be dangerous to use any wxWindows code in this state + // could be dangerous to use any wxWidgets code in this state switch ( ::MessageBox ( @@ -801,3 +751,33 @@ terminate the program,\r\n\ } #endif // wxUSE_EXCEPTIONS + +// ---------------------------------------------------------------------------- +// deprecated event loop functions +// ---------------------------------------------------------------------------- + +#if WXWIN_COMPATIBILITY_2_4 + +#include "wx/evtloop.h" + +void wxApp::DoMessage(WXMSG *pMsg) +{ + wxEventLoop *evtLoop = wxEventLoop::GetActive(); + if ( evtLoop ) + evtLoop->ProcessMessage(pMsg); +} + +bool wxApp::DoMessage() +{ + wxEventLoop *evtLoop = wxEventLoop::GetActive(); + return evtLoop ? evtLoop->Dispatch() : false; +} + +bool wxApp::ProcessMessage(WXMSG* pMsg) +{ + wxEventLoop *evtLoop = wxEventLoop::GetActive(); + return evtLoop && evtLoop->PreProcessMessage(pMsg); +} + +#endif // WXWIN_COMPATIBILITY_2_4 +