/////////////////////////////////////////////////////////////////////////////
-// 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/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/log.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"
#if wxUSE_TOOLTIPS
#include "wx/tooltip.h"
#define wxUSE_OLE 0
#endif // broken compilers
+#if defined(__POCKETPC__) || defined(__SMARTPHONE__)
+ #include <ole2.h>
+ #include <aygshell.h>
+#endif
+
#if wxUSE_OLE
#include <ole2.h>
#endif
#include "wx/msw/wince/missing.h"
#endif
-#if (!defined(__MINGW32__) || wxCHECK_W32API_VERSION( 2, 0 )) && \
- !defined(__CYGWIN__) && !defined(__DIGITALMARS__) && !defined(__WXWINCE__) && \
- (!defined(_MSC_VER) || (_MSC_VER > 1100))
- #include <shlwapi.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)
+
// ---------------------------------------------------------------------------
// global variables
// 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
{
wxEndBusyCursor();
- const ChildWaitLoopData * const data = (ChildWaitLoopData *)dataOrig;
+ ChildWaitLoopData * const data = (ChildWaitLoopData *)dataOrig;
delete data->wd;
// 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()
{
// 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();
+ wxEventLoop *evtLoop = wxEventLoop::GetActive();
+ if ( !evtLoop || !evtLoop->Pending() )
+ {
+ // no events means no quit event
+ return true;
+ }
+
+ return evtLoop->Dispatch();
}
wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo()
}
#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("wxWidgets Fatal Error"),
- MB_ICONERROR | MB_OK
- );
-
- return false;
- }
-#endif // wxUSE_UNICODE && !wxUSE_UNICODE_MSLU
-
-#if defined(__WIN95__) && !defined(__WXMICROWIN__)
+#if !defined(__WXMICROWIN__)
InitCommonControls();
-#endif // __WIN95__
+#endif // !defined(__WXMICROWIN__)
-#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"));
+#if defined(__SMARTPHONE__) || defined(__POCKETPC__)
+ SHInitExtraControls();
#endif
-#endif
-
-#endif // wxUSE_OLE
-#if wxUSE_CTL3D
- if (!Ctl3dRegister(wxhInstance))
- wxLogError(wxT("Cannot register CTL3D"));
+#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
- 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: wxWidgets resources are probably not linked in
-#endif // !__WXMICROWIN__ && !__WXWINCE__
-
-#if wxUSE_PENWINDOWS
- wxRegisterPenWin();
-#endif
-
wxWinHandleHash = new wxWinHashTable(wxKEY_INTEGER, 100);
#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
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;
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
// unregister the classes now
UnregisterWindowClasses();
-#if wxUSE_CTL3D
- Ctl3dUnregister(wxhInstance);
-#endif
-
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;
}
// ----------------------------------------------------------------------------
// 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() )
{
-#ifdef DLLVER_PLATFORM_WINDOWS
- // 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 )
{
dvi.dwMinorVersion;
}
}
-#endif
// if DllGetVersion() is unavailable either during compile or
// run-time, try to guess the version otherwise
}
}
}
+#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
+
+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