// headers
// ---------------------------------------------------------------------------
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "app.h"
#endif
#include "wx/apptrait.h"
#include "wx/filename.h"
#include "wx/module.h"
+#include "wx/dynlib.h"
#include "wx/msw/private.h"
-#if wxUSE_THREADS
- #include "wx/thread.h"
-
- // define the array of MSG strutures
- WX_DECLARE_OBJARRAY(MSG, wxMsgArray);
-
- #include "wx/arrimpl.cpp"
-
- WX_DEFINE_OBJARRAY(wxMsgArray);
-#endif // wxUSE_THREADS
-
#if wxUSE_TOOLTIPS
#include "wx/tooltip.h"
#endif // wxUSE_TOOLTIPS
#include <string.h>
#include <ctype.h>
-#if defined(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__WXMICROWIN__)) && !defined(__CYGWIN10__))
- #include <commctrl.h>
-#endif
+#include "wx/msw/wrapcctl.h"
-// ----------------------------------------------------------------------------
-// conditional compilation
-// ----------------------------------------------------------------------------
-
-// The macro _WIN32_IE is defined by commctrl.h (unless it had already been
-// defined before) and shows us what common control features are available
-// during the compile time (it doesn't mean that they will be available during
-// the run-time, use GetComCtl32Version() to test for them!). The possible
-// values are:
-//
-// 0x0200 for comctl32.dll 4.00 shipped with Win95/NT 4.0
-// 0x0300 4.70 IE 3.x
-// 0x0400 4.71 IE 4.0
-// 0x0401 4.72 IE 4.01 and Win98
-// 0x0500 5.00 IE 5.x and NT 5.0 (Win2000)
-
-#ifndef _WIN32_IE
- // minimal set of features by default
- #define _WIN32_IE 0x0200
+// For MB_TASKMODAL
+#ifdef __WXWINCE__
+#include "wx/msw/wince/missing.h"
#endif
-#if _WIN32_IE >= 0x0300 && \
- (!defined(__MINGW32__) || wxCHECK_W32API_VERSION( 2, 0 )) && \
- !defined(__CYGWIN__) && !defined(__WXWINCE__)
+#if (!defined(__MINGW32__) || wxCHECK_W32API_VERSION( 2, 0 )) && \
+ !defined(__CYGWIN__) && !defined(__DIGITALMARS__) && !defined(__WXWINCE__) && \
+ (!defined(_MSC_VER) || (_MSC_VER > 1100))
#include <shlwapi.h>
#endif
extern void wxSetKeyboardHook(bool doIt);
#endif
-MSG s_currentMsg;
-
// NB: all "NoRedraw" classes must have the same names as the "normal" classes
// with NR suffix - wxWindow::MSWCreate() supposes this
-const wxChar *wxCanvasClassName = wxT("wxWindowClass");
-const wxChar *wxCanvasClassNameNR = wxT("wxWindowClassNR");
-const wxChar *wxMDIFrameClassName = wxT("wxMDIFrameClass");
-const wxChar *wxMDIFrameClassNameNoRedraw = wxT("wxMDIFrameClassNR");
-const wxChar *wxMDIChildFrameClassName = wxT("wxMDIChildFrameClass");
-const wxChar *wxMDIChildFrameClassNameNoRedraw = wxT("wxMDIChildFrameClassNR");
-
-HBRUSH wxDisableButtonBrush = (HBRUSH) 0;
+#ifdef __WXWINCE__
+WXDLLIMPEXP_CORE wxChar *wxCanvasClassName;
+WXDLLIMPEXP_CORE wxChar *wxCanvasClassNameNR;
+#else
+WXDLLIMPEXP_CORE const wxChar *wxCanvasClassName = wxT("wxWindowClass");
+WXDLLIMPEXP_CORE const wxChar *wxCanvasClassNameNR = wxT("wxWindowClassNR");
+#endif
+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()
{
- return !wxTheApp || wxTheApp->DoMessage();
+ // 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();
+}
+
+wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo()
+{
+ 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");
+#endif
+ return info;
}
// ===========================================================================
// ensure that base cleanup is done if we return too early
wxCallBaseCleanup callBaseCleanup(this);
+#ifdef __WXWINCE__
+ wxString tmp = GetAppName();
+ tmp += wxT("ClassName");
+ wxCanvasClassName = wxStrdup( tmp.c_str() );
+ tmp += wxT("NR");
+ wxCanvasClassNameNR = wxStrdup( tmp.c_str() );
+ HWND hWnd = FindWindow( wxCanvasClassNameNR, NULL );
+ if (hWnd)
+ {
+ SetForegroundWindow( (HWND)(((DWORD)hWnd)|0x01) );
+ return false;
+ }
+#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
(
NULL,
_T("This program uses Unicode and requires Windows NT/2000/XP/CE.\nProgram aborted."),
- _T("wxWindows Fatal Error"),
+ _T("wxWidgets Fatal Error"),
MB_ICONERROR | MB_OK
);
- return FALSE;
+ return false;
}
#endif // wxUSE_UNICODE && !wxUSE_UNICODE_MSLU
#if wxUSE_OLE || wxUSE_DRAG_AND_DROP
-#ifdef __WIN16__
- // for OLE, enlarge message queue to be as large as possible
- int iMsg = 96;
- while (!SetMessageQueue(iMsg) && (iMsg -= 8))
- ;
-#endif // Win16
-
#if wxUSE_OLE
// we need to initialize OLE library
#ifdef __WXWINCE__
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
wxWinHandleHash = new wxWinHashTable(wxKEY_INTEGER, 100);
- // This is to foil optimizations in Visual C++ that throw out dummy.obj.
- // PLEASE DO NOT ALTER THIS.
-#if defined(__VISUALC__) && defined(__WIN16__) && !defined(WXMAKINGDLL)
- extern char wxDummyChar;
- if (wxDummyChar) wxDummyChar++;
-#endif
-
#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
- wxSetKeyboardHook(TRUE);
+ wxSetKeyboardHook(true);
#endif
callBaseCleanup.Dismiss();
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;
wxLogLastError(wxT("RegisterClass(no redraw MDI child)"));
}
- return TRUE;
+ return true;
}
// ---------------------------------------------------------------------------
bool wxApp::UnregisterWindowClasses()
{
- bool retval = TRUE;
+ bool retval = true;
#ifndef __WXMICROWIN__
// MDI frame window class.
{
wxLogLastError(wxT("UnregisterClass(MDI parent)"));
- retval = FALSE;
+ retval = false;
}
// "no redraw" MDI frame
{
wxLogLastError(wxT("UnregisterClass(no redraw MDI parent frame)"));
- retval = FALSE;
+ retval = false;
}
// MDI child frame window class.
{
wxLogLastError(wxT("UnregisterClass(MDI child)"));
- retval = FALSE;
+ retval = false;
}
// "no redraw" MDI child frame
{
wxLogLastError(wxT("UnregisterClass(no redraw MDI child)"));
- retval = FALSE;
+ retval = false;
}
// canvas class name
{
wxLogLastError(wxT("UnregisterClass(canvas)"));
- retval = FALSE;
+ retval = false;
}
if ( !::UnregisterClass(wxCanvasClassNameNR, wxhInstance) )
{
wxLogLastError(wxT("UnregisterClass(no redraw canvas)"));
- retval = FALSE;
+ retval = false;
}
#endif // __WXMICROWIN__
void wxApp::CleanUp()
{
+ // all objects pending for deletion must be deleted first, otherwise we
+ // would crash when they use wxWinHandleHash (and UnregisterWindowClasses()
+ // call wouldn't succeed as long as any windows still exist), so call the
+ // base class method first and only then do our clean up
+ 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();
delete wxWinHandleHash;
wxWinHandleHash = NULL;
-
- wxAppBase::CleanUp();
+
+#ifdef __WXWINCE__
+ free( wxCanvasClassName );
+ free( wxCanvasClassNameNR );
+#endif
}
// ----------------------------------------------------------------------------
delete [] argv;
}
-bool wxApp::Initialized()
-{
-#ifndef _WINDLL
- if (GetTopWindow())
- return TRUE;
- else
- return FALSE;
-#else // Assume initialized if DLL (no way of telling)
- return TRUE;
-#endif
-}
-
-/*
- * Get and process a message, returning FALSE if WM_QUIT
- * received (and also set the flag telling the app to exit the main loop)
- *
- */
-bool wxApp::DoMessage()
-{
- BOOL rc = ::GetMessage(&s_currentMsg, (HWND) NULL, 0, 0);
- if ( rc == 0 )
- {
- // got WM_QUIT
- m_keepGoing = FALSE;
-
- return FALSE;
- }
- else if ( rc == -1 )
- {
- // should never happen, but let's test for it nevertheless
- wxLogLastError(wxT("GetMessage"));
- }
- else
- {
-#if wxUSE_THREADS
- wxASSERT_MSG( wxThread::IsMain(),
- wxT("only the main thread can process Windows messages") );
-
- static bool s_hadGuiLock = TRUE;
- static wxMsgArray s_aSavedMessages;
-
- // if a secondary thread owns is doing GUI calls, save all messages for
- // later processing - we can't process them right now because it will
- // lead to recursive library calls (and we're not reentrant)
- if ( !wxGuiOwnedByMainThread() )
- {
- s_hadGuiLock = FALSE;
-
- // leave out WM_COMMAND messages: too dangerous, sometimes
- // the message will be processed twice
- if ( !wxIsWaitingForThread() ||
- s_currentMsg.message != WM_COMMAND )
- {
- s_aSavedMessages.Add(s_currentMsg);
- }
-
- return TRUE;
- }
- else
- {
- // have we just regained the GUI lock? if so, post all of the saved
- // messages
- //
- // FIXME of course, it's not _exactly_ the same as processing the
- // messages normally - expect some things to break...
- if ( !s_hadGuiLock )
- {
- s_hadGuiLock = TRUE;
-
- size_t count = s_aSavedMessages.GetCount();
- for ( size_t n = 0; n < count; n++ )
- {
- MSG& msg = s_aSavedMessages[n];
-
- DoMessage((WXMSG *)&msg);
- }
-
- s_aSavedMessages.Empty();
- }
- }
-#endif // wxUSE_THREADS
-
- // Process the message
- DoMessage((WXMSG *)&s_currentMsg);
- }
-
- return TRUE;
-}
-
-void wxApp::DoMessage(WXMSG *pMsg)
-{
- if ( !ProcessMessage(pMsg) )
- {
- ::TranslateMessage((MSG *)pMsg);
- ::DispatchMessage((MSG *)pMsg);
- }
-}
-
-/*
- * Keep trying to process messages until WM_QUIT
- * received.
- *
- * If there are messages to be processed, they will all be
- * processed and OnIdle will not be called.
- * When there are no more messages, OnIdle is called.
- * If OnIdle requests more time,
- * it will be repeatedly called so long as there are no pending messages.
- * A 'feature' of this is that once OnIdle has decided that no more processing
- * is required, then it won't get processing time until further messages
- * are processed (it'll sit in DoMessage).
- */
-
-int wxApp::MainLoop()
-{
- m_keepGoing = TRUE;
-
- while ( m_keepGoing )
- {
-#if wxUSE_THREADS
- wxMutexGuiLeaveOrEnter();
-#endif // wxUSE_THREADS
-
- while ( !Pending() && ProcessIdle() )
- ;
-
- // a message came or no more idle processing to do
- DoMessage();
- }
-
- return s_currentMsg.wParam;
-}
-
-void wxApp::ExitMainLoop()
-{
- // this will set m_keepGoing to FALSE a bit later
- ::PostQuitMessage(0);
-}
-
-bool wxApp::Pending()
-{
- return ::PeekMessage(&s_currentMsg, 0, 0, 0, PM_NOREMOVE) != 0;
-}
-
-void wxApp::Dispatch()
-{
- DoMessage();
-}
-
-/*
- * Give all windows a chance to preprocess
- * the message. Some may have accelerator tables, or have
- * MDI complications.
- */
-
-bool wxApp::ProcessMessage(WXMSG *wxmsg)
-{
- MSG *msg = (MSG *)wxmsg;
- HWND hwnd = msg->hwnd;
- wxWindow *wndThis = wxGetWindowFromHWND((WXHWND)hwnd);
-
- // this may happen if the event occured in a standard modeless dialog (the
- // only example of which I know of is the find/replace dialog) - then call
- // IsDialogMessage() to make TAB navigation in it work
- if ( !wndThis )
- {
- // we need to find the dialog containing this control as
- // IsDialogMessage() just eats all the messages (i.e. returns TRUE for
- // them) if we call it for the control itself
- while ( hwnd && ::GetWindowLong(hwnd, GWL_STYLE) & WS_CHILD )
- {
- hwnd = ::GetParent(hwnd);
- }
-
- return hwnd && ::IsDialogMessage(hwnd, msg) != 0;
- }
-
-#if wxUSE_TOOLTIPS
- // we must relay WM_MOUSEMOVE events to the tooltip ctrl if we want it to
- // popup the tooltip bubbles
- if ( (msg->message == WM_MOUSEMOVE) )
- {
- wxToolTip *tt = wndThis->GetToolTip();
- if ( tt )
- {
- tt->RelayEvent(wxmsg);
- }
- }
-#endif // wxUSE_TOOLTIPS
-
- // allow the window to prevent certain messages from being
- // translated/processed (this is currently used by wxTextCtrl to always
- // grab Ctrl-C/V/X, even if they are also accelerators in some parent)
- if ( !wndThis->MSWShouldPreProcessMessage(wxmsg) )
- {
- return FALSE;
- }
-
- // try translations first: the accelerators override everything
- wxWindow *wnd;
-
- for ( wnd = wndThis; wnd; wnd = wnd->GetParent() )
- {
- if ( wnd->MSWTranslateMessage(wxmsg))
- return TRUE;
-
- // stop at first top level window, i.e. don't try to process the key
- // strokes originating in a dialog using the accelerators of the parent
- // frame - this doesn't make much sense
- if ( wnd->IsTopLevel() )
- break;
- }
-
- // now try the other hooks (kbd navigation is handled here): we start from
- // wndThis->GetParent() because wndThis->MSWProcessMessage() was already
- // called above
- for ( wnd = wndThis->GetParent(); wnd; wnd = wnd->GetParent() )
- {
- if ( wnd->MSWProcessMessage(wxmsg) )
- return TRUE;
- }
-
- // no special preprocessing for this message, dispatch it normally
- return FALSE;
-}
-
-// this is a temporary hack and will be replaced by using wxEventLoop in the
-// future
-//
-// it is needed to allow other event loops (currently only one: the modal
-// dialog one) to reset the OnIdle() semaphore because otherwise OnIdle()
-// wouldn't do anything while a modal dialog shown from OnIdle() call is shown.
-bool wxIsInOnIdleFlag = FALSE;
+// ----------------------------------------------------------------------------
+// wxApp idle handling
+// ----------------------------------------------------------------------------
void wxApp::OnIdle(wxIdleEvent& event)
{
- // Avoid recursion (via ProcessEvent default case)
- if ( wxIsInOnIdleFlag )
- return;
-
- wxIsInOnIdleFlag = TRUE;
-
- // If there are pending events, we must process them: pending events
- // are either events to the threads other than main or events posted
- // with wxPostEvent() functions
- // GRG: I have moved this here so that all pending events are processed
- // before starting to delete any objects. This behaves better (in
- // particular, wrt wxPostEvent) and is coherent with wxGTK's current
- // behaviour. Changed Feb/2000 before 2.1.14
- ProcessPendingEvents();
-
- // 'Garbage' collection of windows deleted with Close().
- DeletePendingObjects();
-
-#if wxUSE_LOG
- // flush the logged messages if any
- wxLog::FlushActive();
-#endif // wxUSE_LOG
+ wxAppBase::OnIdle(event);
#if wxUSE_DC_CACHEING
// automated DC cache management: clear the cached DCs and bitmap
if (!::GetKeyState(MK_LBUTTON) && !::GetKeyState(MK_MBUTTON) && !::GetKeyState(MK_RBUTTON))
wxDC::ClearCache();
#endif // wxUSE_DC_CACHEING
-
- // Send OnIdle events to all windows
- if ( SendIdleEvents() )
- {
- // SendIdleEvents() returns TRUE if at least one window requested more
- // idle events
- event.RequestMore(TRUE);
- }
-
- wxIsInOnIdleFlag = FALSE;
}
void wxApp::WakeUpIdle()
}
}
+// ----------------------------------------------------------------------------
+// other wxApp event hanlders
+// ----------------------------------------------------------------------------
+
void wxApp::OnEndSession(wxCloseEvent& WXUNUSED(event))
{
if (GetTopWindow())
- GetTopWindow()->Close(TRUE);
+ GetTopWindow()->Close(true);
}
// Default behaviour: close the application with prompts. The
if (GetTopWindow())
{
if (!GetTopWindow()->Close(!event.CanVeto()))
- event.Veto(TRUE);
+ event.Veto(true);
}
}
-typedef struct _WXADllVersionInfo
-{
- DWORD cbSize;
- DWORD dwMajorVersion; // Major version
- DWORD dwMinorVersion; // Minor version
- DWORD dwBuildNumber; // Build number
- DWORD dwPlatformID; // DLLVER_PLATFORM_*
-} WXADLLVERSIONINFO;
-
-typedef HRESULT (CALLBACK* WXADLLGETVERSIONPROC)(WXADLLVERSIONINFO *);
+// ----------------------------------------------------------------------------
+// miscellaneous
+// ----------------------------------------------------------------------------
/* static */
int wxApp::GetComCtl32Version()
return 0;
#else
// cache the result
+ //
+ // NB: this is MT-ok as in the worst case we'd compute s_verComCtl32 twice,
+ // but as its value should be the same both times it doesn't matter
static int s_verComCtl32 = -1;
- wxCRIT_SECT_DECLARE(csComCtl32);
- wxCRIT_SECT_LOCKER(lock, csComCtl32);
-
if ( s_verComCtl32 == -1 )
{
// initally assume no comctl32.dll at all
s_verComCtl32 = 0;
+ // we're prepared to handle the errors
+ wxLogNull noLog;
+
// do we have it?
- HMODULE hModuleComCtl32 = ::GetModuleHandle(wxT("COMCTL32"));
- BOOL bFreeComCtl32 = FALSE ;
- if(!hModuleComCtl32)
- {
- hModuleComCtl32 = ::LoadLibrary(wxT("COMCTL32.DLL")) ;
- if(hModuleComCtl32)
- {
- bFreeComCtl32 = TRUE ;
- }
- }
+ wxDynamicLibrary dllComCtl32(_T("comctl32.dll"), wxDL_VERBATIM);
// if so, then we can check for the version
- if ( hModuleComCtl32 )
+ if ( dllComCtl32.IsLoaded() )
{
+#ifdef DLLVER_PLATFORM_WINDOWS
// try to use DllGetVersion() if available in _headers_
- WXADLLGETVERSIONPROC pfnDllGetVersion = (WXADLLGETVERSIONPROC)
- ::GetProcAddress(hModuleComCtl32, "DllGetVersion");
- if ( pfnDllGetVersion )
+ wxDYNLIB_FUNCTION( DLLGETVERSIONPROC, DllGetVersion, dllComCtl32 );
+ if ( pfnDllGetVersion )
+ {
+ DLLVERSIONINFO dvi;
+ dvi.cbSize = sizeof(dvi);
+
+ HRESULT hr = (*pfnDllGetVersion)(&dvi);
+ if ( FAILED(hr) )
{
- WXADLLVERSIONINFO dvi;
- dvi.cbSize = sizeof(dvi);
+ wxLogApiError(_T("DllGetVersion"), hr);
+ }
+ else
+ {
+ // this is incompatible with _WIN32_IE values, but
+ // compatible with the other values returned by
+ // GetComCtl32Version()
+ s_verComCtl32 = 100*dvi.dwMajorVersion +
+ dvi.dwMinorVersion;
+ }
+ }
+#endif
- HRESULT hr = (*pfnDllGetVersion)(&dvi);
- if ( FAILED(hr) )
- {
- wxLogApiError(_T("DllGetVersion"), hr);
- }
- else
- {
- // this is incompatible with _WIN32_IE values, but
- // compatible with the other values returned by
- // GetComCtl32Version()
- s_verComCtl32 = 100*dvi.dwMajorVersion +
- dvi.dwMinorVersion;
- }
+ // if DllGetVersion() is unavailable either during compile or
+ // run-time, try to guess the version otherwise
+ if ( !s_verComCtl32 )
+ {
+ // InitCommonControlsEx is unique to 4.70 and later
+ void *pfn = dllComCtl32.GetSymbol(_T("InitCommonControlsEx"));
+ if ( !pfn )
+ {
+ // not found, must be 4.00
+ s_verComCtl32 = 400;
}
- // DllGetVersion() unavailable either during compile or
- // run-time, try to guess the version otherwise
- if ( !s_verComCtl32 )
+ else // 4.70+
{
- // InitCommonControlsEx is unique to 4.70 and later
- FARPROC theProc = ::GetProcAddress
- (
- hModuleComCtl32,
- "InitCommonControlsEx"
- );
-
- if ( !theProc )
+ // many symbols appeared in comctl32 4.71, could use any of
+ // them except may be DllInstall()
+ pfn = dllComCtl32.GetSymbol(_T("InitializeFlatSB"));
+ if ( !pfn )
{
- // not found, must be 4.00
- s_verComCtl32 = 400;
+ // not found, must be 4.70
+ s_verComCtl32 = 470;
}
else
{
- // many symbols appeared in comctl32 4.71, could use
- // any of them except may be DllInstall
- theProc = ::GetProcAddress
- (
- hModuleComCtl32,
- "InitializeFlatSB"
- );
- if ( !theProc )
- {
- // not found, must be 4.70
- s_verComCtl32 = 470;
- }
- else
- {
- // found, must be 4.71
- s_verComCtl32 = 471;
- }
+ // found, must be 4.71 or later
+ s_verComCtl32 = 471;
}
}
- }
-
- if(bFreeComCtl32)
- {
- ::FreeLibrary(hModuleComCtl32) ;
+ }
}
}
return s_verComCtl32;
-#endif
+#endif // Microwin/!Microwin
}
// Yield to incoming messages
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
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
wxMutexGuiLeaveOrEnter();
#endif // wxUSE_THREADS
- if ( !wxTheApp->DoMessage() )
+ if ( !wxTheApp->Dispatch() )
break;
}
wxLog::Resume();
#endif // wxUSE_LOG
- s_inYield = FALSE;
+ s_inYield = false;
- return TRUE;
+ return true;
}
+#if wxUSE_EXCEPTIONS
+
+// ----------------------------------------------------------------------------
+// exception handling
+// ----------------------------------------------------------------------------
+
+bool wxApp::OnExceptionInMainLoop()
+{
+ // ask the user about what to do: use the Win32 API function here as it
+ // could be dangerous to use any wxWidgets code in this state
+ switch (
+ ::MessageBox
+ (
+ NULL,
+ _T("An unhandled exception occurred. Press \"Abort\" to \
+terminate the program,\r\n\
+\"Retry\" to exit the program normally and \"Ignore\" to try to continue."),
+ _T("Unhandled exception"),
+ MB_ABORTRETRYIGNORE |
+ MB_ICONERROR|
+ MB_TASKMODAL
+ )
+ )
+ {
+ case IDABORT:
+ throw;
+
+ default:
+ wxFAIL_MSG( _T("unexpected MessageBox() return code") );
+ // fall through
+
+ case IDRETRY:
+ return false;
+
+ case IDIGNORE:
+ return true;
+ }
+}
+
+#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