/////////////////////////////////////////////////////////////////////////////
-// Name: app.cpp
+// Name: src/msw/app.cpp
// Purpose: wxApp
// Author: Julian Smart
// Modified by:
// headers
// ---------------------------------------------------------------------------
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma implementation "app.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#endif
#ifndef WX_PRECOMP
+ #include "wx/msw/wrapcctl.h"
+ #include "wx/dynarray.h"
#include "wx/frame.h"
#include "wx/app.h"
#include "wx/utils.h"
#include "wx/dialog.h"
#include "wx/msgdlg.h"
#include "wx/intl.h"
- #include "wx/dynarray.h"
- #include "wx/wxchar.h"
- #include "wx/icon.h"
+ #include "wx/crt.h"
#include "wx/log.h"
+ #include "wx/module.h"
#endif
#include "wx/apptrait.h"
#include "wx/filename.h"
-#include "wx/module.h"
#include "wx/dynlib.h"
+#include "wx/evtloop.h"
#include "wx/msw/private.h"
#include "wx/msw/ole/oleutils.h"
+#include "wx/msw/private/timer.h"
#if wxUSE_TOOLTIPS
#include "wx/tooltip.h"
#include <string.h>
#include <ctype.h>
-#include "wx/msw/wrapcctl.h"
+#include "wx/msw/missing.h"
-// For MB_TASKMODAL
-#ifdef __WXWINCE__
-#include "wx/msw/wince/missing.h"
-#endif
+// instead of including <shlwapi.h> which is not part of the core SDK and not
+// shipped at all with other compilers, we always define the parts of it we
+// need here ourselves
+//
+// NB: DLLVER_PLATFORM_WINDOWS will be defined if shlwapi.h had been somehow
+// included already
+#ifndef DLLVER_PLATFORM_WINDOWS
+ // hopefully we don't need to change packing as DWORDs should be already
+ // correctly aligned
+ struct DLLVERSIONINFO
+ {
+ DWORD cbSize;
+ DWORD dwMajorVersion; // Major version
+ DWORD dwMinorVersion; // Minor version
+ DWORD dwBuildNumber; // Build number
+ DWORD dwPlatformID; // DLLVER_PLATFORM_*
+ };
+
+ typedef HRESULT (CALLBACK* DLLGETVERSIONPROC)(DLLVERSIONINFO *);
+#endif // defined(DLLVERSIONINFO)
-// For DLLVER_PLATFORM_WINDOWS
-#if (!defined(__MINGW32__) || wxCHECK_W32API_VERSION( 2, 0 )) && \
- !defined(__CYGWIN__) && !defined(__DIGITALMARS__) && !defined(__WXWINCE__) && \
- (!defined(_MSC_VER) || (_MSC_VER > 1100))
- #include <shlwapi.h>
-#endif
// ---------------------------------------------------------------------------
// global variables
// ---------------------------------------------------------------------------
-extern wxList WXDLLEXPORT wxPendingDelete;
-
#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
extern void wxSetKeyboardHook(bool doIt);
#endif
{
// we should return false only if the app should exit, i.e. only if
// Dispatch() determines that the main event loop should terminate
- return !wxTheApp || wxTheApp->Dispatch();
+ wxEventLoopBase * const evtLoop = wxEventLoop::GetActive();
+ if ( !evtLoop || !evtLoop->Pending() )
+ {
+ // no events means no quit event
+ return true;
+ }
+
+ return evtLoop->Dispatch();
}
-wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo()
+DWORD wxGUIAppTraits::WaitForThread(WXHANDLE hThread)
{
- static wxToolkitInfo info;
- wxToolkitInfo& baseInfo = wxAppTraits::GetToolkitInfo();
- info.versionMajor = baseInfo.versionMajor;
- info.versionMinor = baseInfo.versionMinor;
- info.os = baseInfo.os;
- info.shortName = _T("msw");
- info.name = _T("wxMSW");
-#ifdef __WXUNIVERSAL__
- info.shortName << _T("univ");
- info.name << _T("/wxUniversal");
+ // if we don't have a running event loop, we shouldn't wait for the
+ // messages as we never remove them from the message queue and so we enter
+ // an infinite loop as MsgWaitForMultipleObjects() keeps returning
+ // WAIT_OBJECT_0 + 1
+ if ( !wxEventLoop::GetActive() )
+ return DoSimpleWaitForThread(hThread);
+
+ return ::MsgWaitForMultipleObjects
+ (
+ 1, // number of objects to wait for
+ (HANDLE *)&hThread, // the objects
+ false, // wait for any objects, not all
+ INFINITE, // no timeout
+ QS_ALLINPUT | // return as soon as there are any events
+ QS_ALLPOSTMESSAGE
+ );
+}
+
+wxPortId wxGUIAppTraits::GetToolkitVersion(int *majVer, int *minVer) const
+{
+ OSVERSIONINFO info;
+ wxZeroMemory(info);
+
+ // on Windows, the toolkit version is the same of the OS version
+ // as Windows integrates the OS kernel with the GUI toolkit.
+ info.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+ if ( ::GetVersionEx(&info) )
+ {
+ if ( majVer )
+ *majVer = info.dwMajorVersion;
+ if ( minVer )
+ *minVer = info.dwMinorVersion;
+ }
+
+#if defined(__WXHANDHELD__) || defined(__WXWINCE__)
+ return wxPORT_WINCE;
+#else
+ return wxPORT_MSW;
#endif
- return info;
+}
+
+#if wxUSE_TIMER
+
+wxTimerImpl *wxGUIAppTraits::CreateTimerImpl(wxTimer *timer)
+{
+ return new wxMSWTimerImpl(timer);
+}
+
+#endif // wxUSE_TIMER
+
+wxEventLoopBase* wxGUIAppTraits::CreateEventLoop()
+{
+ return new wxEventLoop;
}
// ===========================================================================
#ifdef __WXWINCE__
wxString tmp = GetAppName();
tmp += wxT("ClassName");
- wxCanvasClassName = wxStrdup( tmp.c_str() );
+ wxCanvasClassName = wxStrdup( tmp.wc_str() );
tmp += wxT("NR");
- wxCanvasClassNameNR = wxStrdup( tmp.c_str() );
+ wxCanvasClassNameNR = wxStrdup( tmp.wc_str() );
HWND hWnd = FindWindow( wxCanvasClassNameNR, NULL );
if (hWnd)
{
}
#endif
-#if defined(__WIN95__) && !defined(__WXMICROWIN__)
+#if !defined(__WXMICROWIN__)
InitCommonControls();
-#endif // __WIN95__
+#endif // !defined(__WXMICROWIN__)
#if defined(__SMARTPHONE__) || defined(__POCKETPC__)
SHInitExtraControls();
#endif
+#ifndef __WXWINCE__
+ // Don't show a message box if a function such as SHGetFileInfo
+ // fails to find a device.
+ SetErrorMode(SEM_FAILCRITICALERRORS|SEM_NOOPENFILEERRORBOX);
+#endif
+
wxOleInitialize();
RegisterWindowClasses();
-#if wxUSE_PENWINDOWS
- wxRegisterPenWin();
-#endif
-
wxWinHandleHash = new wxWinHashTable(wxKEY_INTEGER, 100);
#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
wxSetKeyboardHook(false);
#endif
-#if wxUSE_PENWINDOWS
- wxCleanUpPenWin();
-#endif
-
wxOleUninitialize();
// for an EXE the classes are unregistered when it terminates but DLL may
delete wxWinHandleHash;
wxWinHandleHash = NULL;
-
+
#ifdef __WXWINCE__
free( wxCanvasClassName );
free( wxCanvasClassNameNR );
wxApp::~wxApp()
{
- // our cmd line arguments are allocated inside wxEntry(HINSTANCE), they
- // don't come from main(), so we have to free them
-
- while ( argc )
- {
- // m_argv elements were allocated by wxStrdup()
- free(argv[--argc]);
- }
-
- // but m_argv itself -- using new[]
- delete [] argv;
}
// ----------------------------------------------------------------------------
// wxApp idle handling
// ----------------------------------------------------------------------------
-void wxApp::OnIdle(wxIdleEvent& event)
+void wxApp::OnIdle(wxIdleEvent& WXUNUSED(event))
{
- wxAppBase::OnIdle(event);
-
#if wxUSE_DC_CACHEING
// automated DC cache management: clear the cached DCs and bitmap
// if it's likely that the app has finished with them, that is, we
// we're prepared to handle the errors
wxLogNull noLog;
+#if wxUSE_DYNLIB_CLASS
// do we have it?
wxDynamicLibrary dllComCtl32(_T("comctl32.dll"), wxDL_VERBATIM);
// if so, then we can check for the version
if ( dllComCtl32.IsLoaded() )
{
-#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_
+ // now check if the function is available during run-time
wxDYNLIB_FUNCTION( DLLGETVERSIONPROC, DllGetVersion, dllComCtl32 );
if ( pfnDllGetVersion )
{
}
}
}
+#endif
}
return s_verComCtl32;
\"Retry\" to exit the program normally and \"Ignore\" to try to continue."),
_T("Unhandled exception"),
MB_ABORTRETRYIGNORE |
- MB_ICONERROR|
+ MB_ICONERROR|
MB_TASKMODAL
)
)
}
#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
-
projects / wxWidgets.git / blobdiff