// Modified by:
// Created: 04/01/98
// RCS-ID: $Id$
-// Copyright: (c) Julian Smart and Markus Holzem
-// Licence: wxWindows license
+// Copyright: (c) Julian Smart
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// ===========================================================================
#include "wx/dynarray.h"
#include "wx/wxchar.h"
#include "wx/icon.h"
+ #include "wx/log.h"
#endif
-#include "wx/log.h"
+#include "wx/apptrait.h"
+#include "wx/filename.h"
#include "wx/module.h"
#include "wx/msw/private.h"
WX_DEFINE_OBJARRAY(wxMsgArray);
#endif // wxUSE_THREADS
-#if wxUSE_WX_RESOURCES
- #include "wx/resource.h"
-#endif
+#if wxUSE_TOOLTIPS
+ #include "wx/tooltip.h"
+#endif // wxUSE_TOOLTIPS
-// OLE is used for drag-and-drop, clipboard, OLE Automation...
-#ifndef wxUSE_NORLANDER_HEADERS
-#if defined(__GNUWIN32__) || defined(__SC__) || defined(__SALFORDC__)
+// OLE is used for drag-and-drop, clipboard, OLE Automation..., but some
+// compilers don't support it (missing headers, libs, ...)
+#if defined(__GNUWIN32_OLD__) || defined(__SYMANTEC__) || defined(__SALFORDC__)
#undef wxUSE_OLE
#define wxUSE_OLE 0
#endif // broken compilers
-#endif
#if wxUSE_OLE
#include <ole2.h>
#include <string.h>
#include <ctype.h>
-#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__) || defined(wxUSE_NORLANDER_HEADERS)
+#if defined(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__WXMICROWIN__)) && !defined(__CYGWIN10__))
#include <commctrl.h>
#endif
-#include "wx/msw/msvcrt.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
+#endif
+
+#if _WIN32_IE >= 0x0300 && \
+ (!defined(__MINGW32__) || wxCHECK_W32API_VERSION( 2, 0 )) && \
+ !defined(__CYGWIN__) && !defined(__WXWINCE__)
+ #include <shlwapi.h>
+#endif
// ---------------------------------------------------------------------------
// global variables
// ---------------------------------------------------------------------------
-extern wxChar *wxBuffer;
-extern wxChar *wxOsVersion;
-extern wxList *wxWinHandleList;
extern wxList WXDLLEXPORT wxPendingDelete;
+
+#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
extern void wxSetKeyboardHook(bool doIt);
-extern wxCursor *g_globalCursor;
+#endif
-HINSTANCE wxhInstance = 0;
MSG s_currentMsg;
-wxApp *wxTheApp = NULL;
-
-// FIXME why not const? and not static?
// NB: all "NoRedraw" classes must have the same names as the "normal" classes
// with NR suffix - wxWindow::MSWCreate() supposes this
-wxChar wxFrameClassName[] = wxT("wxFrameClass");
-wxChar wxFrameClassNameNoRedraw[] = wxT("wxFrameClassNR");
-wxChar wxMDIFrameClassName[] = wxT("wxMDIFrameClass");
-wxChar wxMDIFrameClassNameNoRedraw[] = wxT("wxMDIFrameClassNR");
-wxChar wxMDIChildFrameClassName[] = wxT("wxMDIChildFrameClass");
-wxChar wxMDIChildFrameClassNameNoRedraw[] = wxT("wxMDIChildFrameClassNR");
-wxChar wxPanelClassName[] = wxT("wxPanelClass");
-wxChar wxCanvasClassName[] = wxT("wxCanvasClass");
-
-HICON wxSTD_FRAME_ICON = (HICON) NULL;
-HICON wxSTD_MDICHILDFRAME_ICON = (HICON) NULL;
-HICON wxSTD_MDIPARENTFRAME_ICON = (HICON) NULL;
-
-HICON wxDEFAULT_FRAME_ICON = (HICON) NULL;
-HICON wxDEFAULT_MDICHILDFRAME_ICON = (HICON) NULL;
-HICON wxDEFAULT_MDIPARENTFRAME_ICON = (HICON) NULL;
+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;
-LRESULT APIENTRY wxWndProc(HWND, UINT, WPARAM, LPARAM);
-
-#if defined(__WIN95__) && !defined(__TWIN32__)
- #define wxUSE_RICHEDIT 1
-#else
- #define wxUSE_RICHEDIT 0
-#endif
+// ----------------------------------------------------------------------------
+// private functions
+// ----------------------------------------------------------------------------
-#if wxUSE_RICHEDIT
- static HINSTANCE gs_hRichEdit = (HINSTANCE) NULL;
-#endif
+LRESULT WXDLLEXPORT APIENTRY wxWndProc(HWND, UINT, WPARAM, LPARAM);
// ===========================================================================
-// implementation
+// wxGUIAppTraits implementation
// ===========================================================================
-// ---------------------------------------------------------------------------
-// wxApp
-// ---------------------------------------------------------------------------
+// private class which we use to pass parameters from BeforeChildWaitLoop() to
+// AfterChildWaitLoop()
+struct ChildWaitLoopData
+{
+ ChildWaitLoopData(wxWindowDisabler *wd_, wxWindow *winActive_)
+ {
+ wd = wd_;
+ winActive = winActive_;
+ }
-#if !USE_SHARED_LIBRARY
- IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
+ wxWindowDisabler *wd;
+ wxWindow *winActive;
+};
- BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
- EVT_IDLE(wxApp::OnIdle)
- EVT_END_SESSION(wxApp::OnEndSession)
- EVT_QUERY_END_SESSION(wxApp::OnQueryEndSession)
- END_EVENT_TABLE()
-#endif
+void *wxGUIAppTraits::BeforeChildWaitLoop()
+{
+ /*
+ We use a dirty hack here to disable all application windows (which we
+ must do because otherwise the calls to wxYield() could lead to some very
+ unexpected reentrancies in the users code) but to avoid losing
+ focus/activation entirely when the child process terminates which would
+ happen if we simply disabled everything using wxWindowDisabler. Indeed,
+ remember that Windows will never activate a disabled window and when the
+ last childs window is closed and Windows looks for a window to activate
+ all our windows are still disabled. There is no way to enable them in
+ time because we don't know when the childs windows are going to be
+ closed, so the solution we use here is to keep one special tiny frame
+ enabled all the time. Then when the child terminates it will get
+ activated and when we close it below -- after reenabling all the other
+ windows! -- the previously active window becomes activated again and
+ everything is ok.
+ */
+ wxBeginBusyCursor();
+
+ // first disable all existing windows
+ wxWindowDisabler *wd = new wxWindowDisabler;
+
+ // then create an "invisible" frame: it has minimal size, is positioned
+ // (hopefully) outside the screen and doesn't appear on the taskbar
+ wxWindow *winActive = new wxFrame
+ (
+ wxTheApp->GetTopWindow(),
+ wxID_ANY,
+ wxEmptyString,
+ wxPoint(32600, 32600),
+ wxSize(1, 1),
+ wxDEFAULT_FRAME_STYLE | wxFRAME_NO_TASKBAR
+ );
+ winActive->Show();
+
+ return new ChildWaitLoopData(wd, winActive);
+}
-//// Initialize
-bool wxApp::Initialize()
+void wxGUIAppTraits::AlwaysYield()
{
- // Some people may wish to use this, but
- // probably it shouldn't be here by default.
-#ifdef __WXDEBUG__
- // wxRedirectIOToConsole();
-#endif
+ wxYield();
+}
- wxBuffer = new wxChar[1500]; // FIXME
+void wxGUIAppTraits::AfterChildWaitLoop(void *dataOrig)
+{
+ wxEndBusyCursor();
- wxClassInfo::InitializeClasses();
+ const ChildWaitLoopData * const data = (ChildWaitLoopData *)dataOrig;
-#if wxUSE_RESOURCES
- wxGetResource(wxT("wxWindows"), wxT("OsVersion"), &wxOsVersion);
-#endif
+ delete data->wd;
-#if wxUSE_THREADS
- wxPendingEventsLocker = new wxCriticalSection;
-#endif
+ // finally delete the dummy frame and, as wd has been already destroyed and
+ // the other windows reenabled, the activation is going to return to the
+ // window which had had it before
+ data->winActive->Destroy();
+}
- wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING);
- wxTheColourDatabase->Initialize();
+bool wxGUIAppTraits::DoMessageFromThreadWait()
+{
+ return !wxTheApp || wxTheApp->DoMessage();
+}
- wxInitializeStockLists();
- wxInitializeStockObjects();
+// ===========================================================================
+// wxApp implementation
+// ===========================================================================
-#if wxUSE_WX_RESOURCES
- wxInitializeResourceSystem();
-#endif
+int wxApp::m_nCmdShow = SW_SHOWNORMAL;
- wxBitmap::InitStandardHandlers();
+// ---------------------------------------------------------------------------
+// wxWin macros
+// ---------------------------------------------------------------------------
-#if defined(__WIN95__)
- InitCommonControls();
+IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
+
+BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
+ EVT_IDLE(wxApp::OnIdle)
+ EVT_END_SESSION(wxApp::OnEndSession)
+ EVT_QUERY_END_SESSION(wxApp::OnQueryEndSession)
+END_EVENT_TABLE()
+
+// class to ensure that wxAppBase::CleanUp() is called if our Initialize()
+// fails
+class wxCallBaseCleanup
+{
+public:
+ wxCallBaseCleanup(wxApp *app) : m_app(app) { }
+ ~wxCallBaseCleanup() { if ( m_app ) m_app->wxAppBase::CleanUp(); }
+
+ void Dismiss() { m_app = NULL; }
+
+private:
+ wxApp *m_app;
+};
-#if wxUSE_RICHEDIT
- gs_hRichEdit = LoadLibrary(wxT("RICHED32.DLL"));
+//// Initialize
+bool wxApp::Initialize(int& argc, wxChar **argv)
+{
+ if ( !wxAppBase::Initialize(argc, argv) )
+ return false;
- if (gs_hRichEdit == (HINSTANCE) NULL)
+ // ensure that base cleanup is done if we return too early
+ wxCallBaseCleanup callBaseCleanup(this);
+
+ // 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 )
{
- wxLogError(_("Could not initialise Rich Edit DLL"));
+ // 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_RICHEDIT
+#endif // wxUSE_UNICODE && !wxUSE_UNICODE_MSLU
+#if defined(__WIN95__) && !defined(__WXMICROWIN__)
+ InitCommonControls();
#endif // __WIN95__
-#if wxUSE_OLE
+#if wxUSE_OLE || wxUSE_DRAG_AND_DROP
#ifdef __WIN16__
// for OLE, enlarge message queue to be as large as possible
while (!SetMessageQueue(iMsg) && (iMsg -= 8))
;
#endif // Win16
+
+#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
+#endif
+
#endif // wxUSE_OLE
#if wxUSE_CTL3D
wxLogError(wxT("Cannot register CTL3D"));
Ctl3dAutoSubclass(wxhInstance);
-#endif
-
- g_globalCursor = new wxCursor;
-
- wxSTD_FRAME_ICON = LoadIcon(wxhInstance, wxT("wxSTD_FRAME"));
- wxSTD_MDIPARENTFRAME_ICON = LoadIcon(wxhInstance, wxT("wxSTD_MDIPARENTFRAME"));
- wxSTD_MDICHILDFRAME_ICON = LoadIcon(wxhInstance, wxT("wxSTD_MDICHILDFRAME"));
-
- wxDEFAULT_FRAME_ICON = LoadIcon(wxhInstance, wxT("wxDEFAULT_FRAME"));
- wxDEFAULT_MDIPARENTFRAME_ICON = LoadIcon(wxhInstance, wxT("wxDEFAULT_MDIPARENTFRAME"));
- wxDEFAULT_MDICHILDFRAME_ICON = LoadIcon(wxhInstance, wxT("wxDEFAULT_MDICHILDFRAME"));
+#endif // wxUSE_CTL3D
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 )
{
::DeleteObject( (HGDIOBJ)lb.lbHatch );
}
//else: wxWindows resources are probably not linked in
+#endif
#if wxUSE_PENWINDOWS
wxRegisterPenWin();
#endif
- wxWinHandleList = new wxList(wxKEY_INTEGER);
+ 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(WXMAKINGDLL)
+#if defined(__VISUALC__) && defined(__WIN16__) && !defined(WXMAKINGDLL)
extern char wxDummyChar;
if (wxDummyChar) wxDummyChar++;
#endif
+#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
wxSetKeyboardHook(TRUE);
+#endif
- wxModule::RegisterModules();
- if (!wxModule::InitializeModules())
- return FALSE;
- return TRUE;
+ callBaseCleanup.Dismiss();
+
+ return true;
}
// ---------------------------------------------------------------------------
bool wxApp::RegisterWindowClasses()
{
WNDCLASS wndclass;
+ wxZeroMemory(wndclass);
// for each class we register one with CS_(V|H)REDRAW style and one
// without for windows created with wxNO_FULL_REDRAW_ON_REPAINT flag
// the fields which are common to all classes
wndclass.lpfnWndProc = (WNDPROC)wxWndProc;
- wndclass.cbClsExtra = 0;
- wndclass.cbWndExtra = sizeof( DWORD ); // VZ: what is this DWORD used for?
wndclass.hInstance = wxhInstance;
- wndclass.hIcon = (HICON) NULL;
wndclass.hCursor = ::LoadCursor((HINSTANCE)NULL, IDC_ARROW);
- wndclass.lpszMenuName = NULL;
// Register the frame window class.
wndclass.hbrBackground = (HBRUSH)(COLOR_APPWORKSPACE + 1);
- wndclass.lpszClassName = wxFrameClassName;
+ wndclass.lpszClassName = wxCanvasClassName;
wndclass.style = styleNormal;
if ( !RegisterClass(&wndclass) )
{
- wxLogLastError("RegisterClass(frame)");
-
- return FALSE;
+ wxLogLastError(wxT("RegisterClass(frame)"));
}
// "no redraw" frame
- wndclass.lpszClassName = wxFrameClassNameNoRedraw;
+ wndclass.lpszClassName = wxCanvasClassNameNR;
wndclass.style = styleNoRedraw;
if ( !RegisterClass(&wndclass) )
{
- wxLogLastError("RegisterClass(no redraw frame)");
-
- return FALSE;
+ wxLogLastError(wxT("RegisterClass(no redraw frame)"));
}
// Register the MDI frame window class.
if ( !RegisterClass(&wndclass) )
{
- wxLogLastError("RegisterClass(MDI parent)");
-
- return FALSE;
+ wxLogLastError(wxT("RegisterClass(MDI parent)"));
}
// "no redraw" MDI frame
if ( !RegisterClass(&wndclass) )
{
- wxLogLastError("RegisterClass(no redraw MDI parent frame)");
-
- return FALSE;
+ wxLogLastError(wxT("RegisterClass(no redraw MDI parent frame)"));
}
// Register the MDI child frame window class.
if ( !RegisterClass(&wndclass) )
{
- wxLogLastError("RegisterClass(MDI child)");
-
- return FALSE;
+ wxLogLastError(wxT("RegisterClass(MDI child)"));
}
// "no redraw" MDI child frame
if ( !RegisterClass(&wndclass) )
{
- wxLogLastError("RegisterClass(no redraw MDI child)");
-
- return FALSE;
- }
-
- // Register the panel window class.
- wndclass.hbrBackground = (HBRUSH) GetStockObject( LTGRAY_BRUSH );
- wndclass.lpszClassName = wxPanelClassName;
- wndclass.style = styleNormal;
-
- if ( !RegisterClass(&wndclass) )
- {
- wxLogLastError("RegisterClass(panel)");
-
- return FALSE;
- }
-
- // Register the canvas and textsubwindow class name
- wndclass.hbrBackground = (HBRUSH)NULL;
- wndclass.lpszClassName = wxCanvasClassName;
-
- if ( !RegisterClass(&wndclass) )
- {
- wxLogLastError("RegisterClass(canvas)");
-
- return FALSE;
+ wxLogLastError(wxT("RegisterClass(no redraw MDI child)"));
}
return TRUE;
}
// ---------------------------------------------------------------------------
-// Convert Windows to argc, argv style
+// UnregisterWindowClasses
// ---------------------------------------------------------------------------
-void wxApp::ConvertToStandardCommandArgs(char* lpCmdLine)
+bool wxApp::UnregisterWindowClasses()
{
- wxStringList args;
+ bool retval = TRUE;
- wxString cmdLine(lpCmdLine);
- int count = 0;
+#ifndef __WXMICROWIN__
+ // MDI frame window class.
+ if ( !::UnregisterClass(wxMDIFrameClassName, wxhInstance) )
+ {
+ wxLogLastError(wxT("UnregisterClass(MDI parent)"));
- // Get application name
- wxChar name[260]; // 260 is MAX_PATH value from windef.h
- ::GetModuleFileName(wxhInstance, name, WXSIZEOF(name));
+ retval = FALSE;
+ }
- args.Add(name);
- count++;
+ // "no redraw" MDI frame
+ if ( !::UnregisterClass(wxMDIFrameClassNameNoRedraw, wxhInstance) )
+ {
+ wxLogLastError(wxT("UnregisterClass(no redraw MDI parent frame)"));
- wxStrcpy(name, wxFileNameFromPath(name));
- wxStripExtension(name);
- wxTheApp->SetAppName(name);
+ retval = FALSE;
+ }
- // Break up string
- // Treat strings enclosed in double-quotes as single arguments
- int i = 0;
- int len = cmdLine.Length();
- while (i < len)
+ // MDI child frame window class.
+ if ( !::UnregisterClass(wxMDIChildFrameClassName, wxhInstance) )
{
- // Skip whitespace
- while ((i < len) && wxIsspace(cmdLine.GetChar(i)))
- i ++;
-
- if (i < len)
- {
- if (cmdLine.GetChar(i) == wxT('"')) // We found the start of a string
- {
- i ++;
- int first = i;
- while ((i < len) && (cmdLine.GetChar(i) != wxT('"')))
- i ++;
+ wxLogLastError(wxT("UnregisterClass(MDI child)"));
- wxString arg(cmdLine.Mid(first, (i - first)));
+ retval = FALSE;
+ }
- args.Add(arg);
- count ++;
+ // "no redraw" MDI child frame
+ if ( !::UnregisterClass(wxMDIChildFrameClassNameNoRedraw, wxhInstance) )
+ {
+ wxLogLastError(wxT("UnregisterClass(no redraw MDI child)"));
- if (i < len)
- i ++; // Skip past 2nd quote
- }
- else // Unquoted argument
- {
- int first = i;
- while ((i < len) && !wxIsspace(cmdLine.GetChar(i)))
- i ++;
+ retval = FALSE;
+ }
- wxString arg(cmdLine.Mid(first, (i - first)));
+ // canvas class name
+ if ( !::UnregisterClass(wxCanvasClassName, wxhInstance) )
+ {
+ wxLogLastError(wxT("UnregisterClass(canvas)"));
- args.Add(arg);
- count ++;
- }
- }
+ retval = FALSE;
}
- wxTheApp->argv = new wxChar*[count + 1];
- for (i = 0; i < count; i++)
+ if ( !::UnregisterClass(wxCanvasClassNameNR, wxhInstance) )
{
- wxString arg(args[i]);
- wxTheApp->argv[i] = copystring((const wxChar*)arg);
+ wxLogLastError(wxT("UnregisterClass(no redraw canvas)"));
+
+ retval = FALSE;
}
- wxTheApp->argv[count] = NULL; // argv[] is a NULL-terminated list
- wxTheApp->argc = count;
-}
+#endif // __WXMICROWIN__
-//// Cleans up any wxWindows internal structures left lying around
+ return retval;
+}
void wxApp::CleanUp()
{
- //// COMMON CLEANUP
-
-#if wxUSE_LOG
- // flush the logged messages if any and install a 'safer' log target: the
- // default one (wxLogGui) can't be used after the resources are freed just
- // below and the user suppliedo ne might be even more unsafe (using any
- // wxWindows GUI function is unsafe starting from now)
- wxLog::DontCreateOnDemand();
-
- // this will flush the old messages if any
- delete wxLog::SetActiveTarget(new wxLogStderr);
-#endif // wxUSE_LOG
-
- // One last chance for pending objects to be cleaned up
- wxTheApp->DeletePendingObjects();
-
- wxModule::CleanUpModules();
-
-#if wxUSE_WX_RESOURCES
- wxCleanUpResourceSystem();
-
- // wxDefaultResourceTable->ClearTable();
-#endif
-
- // Indicate that the cursor can be freed, so that cursor won't be deleted
- // by deleting the bitmap list before g_globalCursor goes out of scope
- // (double deletion of the cursor).
- wxSetCursor(wxNullCursor);
- delete g_globalCursor;
- g_globalCursor = NULL;
-
- wxDeleteStockObjects();
-
- // Destroy all GDI lists, etc.
- wxDeleteStockLists();
-
- delete wxTheColourDatabase;
- wxTheColourDatabase = NULL;
-
- wxBitmap::CleanUpHandlers();
-
- delete[] wxBuffer;
- wxBuffer = NULL;
-
- //// WINDOWS-SPECIFIC CLEANUP
-
+#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
wxSetKeyboardHook(FALSE);
-
-#ifdef __WIN95__
-
-#if wxUSE_RICHEDIT
- if (gs_hRichEdit != (HINSTANCE) NULL)
- FreeLibrary(gs_hRichEdit);
-#endif
-
#endif
#if wxUSE_PENWINDOWS
wxCleanUpPenWin();
#endif
- if (wxSTD_FRAME_ICON)
- DestroyIcon(wxSTD_FRAME_ICON);
- if (wxSTD_MDICHILDFRAME_ICON)
- DestroyIcon(wxSTD_MDICHILDFRAME_ICON);
- if (wxSTD_MDIPARENTFRAME_ICON)
- DestroyIcon(wxSTD_MDIPARENTFRAME_ICON);
-
- if (wxDEFAULT_FRAME_ICON)
- DestroyIcon(wxDEFAULT_FRAME_ICON);
- if (wxDEFAULT_MDICHILDFRAME_ICON)
- DestroyIcon(wxDEFAULT_MDICHILDFRAME_ICON);
- if (wxDEFAULT_MDIPARENTFRAME_ICON)
- DestroyIcon(wxDEFAULT_MDIPARENTFRAME_ICON);
-
if ( wxDisableButtonBrush )
::DeleteObject( wxDisableButtonBrush );
#if wxUSE_OLE
+#ifdef __WXWINCE__
+ ::CoUninitialize();
+#else
::OleUninitialize();
#endif
-
-#if wxUSE_CTL3D
- Ctl3dUnregister(wxhInstance);
#endif
- if (wxWinHandleList)
- delete wxWinHandleList;
+ // 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
+ // which case the registration will fail after the first time if we don't
+ // unregister the classes now
+ UnregisterWindowClasses();
- // GL: I'm annoyed ... I don't know where to put this and I don't want to
- // create a module for that as it's part of the core.
- delete wxPendingEvents;
-#if wxUSE_THREADS
- delete wxPendingEventsLocker;
- // If we don't do the following, we get an apparent memory leak.
- ((wxEvtHandler&) wxDefaultValidator).ClearEventLocker();
+#if wxUSE_CTL3D
+ Ctl3dUnregister(wxhInstance);
#endif
- wxClassInfo::CleanUpClasses();
-
- delete wxTheApp;
- wxTheApp = NULL;
-
-#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
- // At this point we want to check if there are any memory
- // blocks that aren't part of the wxDebugContext itself,
- // as a special case. Then when dumping we need to ignore
- // wxDebugContext, too.
- if (wxDebugContext::CountObjectsLeft(TRUE) > 0)
- {
- wxLogDebug(wxT("There were memory leaks."));
- wxDebugContext::Dump();
- wxDebugContext::PrintStatistics();
- }
- // wxDebugContext::SetStream(NULL, NULL);
-#endif
+ delete wxWinHandleHash;
+ wxWinHandleHash = NULL;
-#if wxUSE_LOG
- // do it as the very last thing because everything else can log messages
- delete wxLog::SetActiveTarget(NULL);
-#endif // wxUSE_LOG
+ wxAppBase::CleanUp();
}
-#if !defined(_WINDLL) || (defined(_WINDLL) && defined(WXMAKINGDLL))
-
-// temporarily disable this warning which would be generated in release builds
-// because of __try
-#ifdef __VISUALC__
- #pragma warning(disable: 4715) // not all control paths return a value
-#endif // Visual C++
-
-//// Main wxWindows entry point
-int wxEntry(WXHINSTANCE hInstance,
- WXHINSTANCE WXUNUSED(hPrevInstance),
- char *lpCmdLine,
- int nCmdShow,
- bool enterLoop)
-{
- // do check for memory leaks on program exit
- // (another useful flag is _CRTDBG_DELAY_FREE_MEM_DF which doesn't free
- // deallocated memory which may be used to simulate low-memory condition)
- wxCrtSetDbgFlag(_CRTDBG_LEAK_CHECK_DF);
-
- // take everything into a try-except block in release build
- // FIXME other compilers must support Win32 SEH (structured exception
- // handling) too, just find the appropriate keyword in their docs!
- // Please note that it's _not_ the same as C++ exceptions!
-#if !defined(__WXDEBUG__) && defined(__VISUALC__)
- #define CATCH_PROGRAM_EXCEPTIONS
-
- __try {
-#else
- #undef CATCH_PROGRAM_EXCEPTIONS
-#endif
-
- wxhInstance = (HINSTANCE) hInstance;
-
- if (!wxApp::Initialize())
- return 0;
-
- // create the application object or ensure that one already exists
- if (!wxTheApp)
- {
- // The app may have declared a global application object, but we recommend
- // the IMPLEMENT_APP macro is used instead, which sets an initializer
- // function for delayed, dynamic app object construction.
- wxCHECK_MSG( wxApp::GetInitializerFunction(), 0,
- wxT("No initializer - use IMPLEMENT_APP macro.") );
-
- wxTheApp = (*wxApp::GetInitializerFunction()) ();
- }
-
- wxCHECK_MSG( wxTheApp, 0, wxT("You have to define an instance of wxApp!") );
-
- // save the WinMain() parameters
- wxTheApp->ConvertToStandardCommandArgs(lpCmdLine);
- wxTheApp->m_nCmdShow = nCmdShow;
-
- // GUI-specific initialisation. In fact on Windows we don't have any,
- // but this call is provided for compatibility across platforms.
- wxTheApp->OnInitGui();
-
- int retValue = 0;
-
- if ( wxTheApp->OnInit() )
- {
- if ( enterLoop )
- {
- retValue = wxTheApp->OnRun();
- }
- else
- // We want to initialize, but not run or exit immediately.
- return 1;
- }
- //else: app initialization failed, so we skipped OnRun()
-
- wxWindow *topWindow = wxTheApp->GetTopWindow();
- if ( topWindow )
- {
- // Forcibly delete the window.
- if ( topWindow->IsKindOf(CLASSINFO(wxFrame)) ||
- topWindow->IsKindOf(CLASSINFO(wxDialog)) )
- {
- topWindow->Close(TRUE);
- wxTheApp->DeletePendingObjects();
- }
- else
- {
- delete topWindow;
- wxTheApp->SetTopWindow(NULL);
- }
- }
-
- wxTheApp->OnExit();
-
- wxApp::CleanUp();
-
- return retValue;
-
-#ifdef CATCH_PROGRAM_EXCEPTIONS
- }
- __except ( EXCEPTION_EXECUTE_HANDLER ) {
- /*
- if ( wxTheApp )
- wxTheApp->OnFatalException();
- */
-
- // using wxLog would be unsafe here
- ::MessageBox(NULL,
- _("Unrecoverable program error detected: "
- " the application will terminate."),
- _("Fatal Error"),
- MB_APPLMODAL | MB_ICONSTOP | MB_OK);
-
- ::ExitProcess(3); // the same exit code as abort()
-
- // NOTREACHED
- }
-#endif // CATCH_PROGRAM_EXCEPTIONS
-}
-
-// restore warning state
-#ifdef __VISUALC__
- #pragma warning(default: 4715) // not all control paths return a value
-#endif // Visual C++
-
-#else /* _WINDLL */
-
-//// Entry point for DLLs
-
-int wxEntry(WXHINSTANCE hInstance)
-{
- wxhInstance = (HINSTANCE) hInstance;
- wxApp::Initialize();
-
- // The app may have declared a global application object, but we recommend
- // the IMPLEMENT_APP macro is used instead, which sets an initializer function
- // for delayed, dynamic app object construction.
- if (!wxTheApp)
- {
- wxCHECK_MSG( wxApp::GetInitializerFunction(), 0,
- "No initializer - use IMPLEMENT_APP macro." );
-
- wxTheApp = (* wxApp::GetInitializerFunction()) ();
- }
-
- wxCHECK_MSG( wxTheApp, 0, "You have to define an instance of wxApp!" );
-
- wxTheApp->argc = 0;
- wxTheApp->argv = NULL;
-
- wxTheApp->OnInitGui();
-
- wxTheApp->OnInit();
-
- wxWindow *topWindow = wxTheApp->GetTopWindow();
- if ( topWindow && topWindow->GetHWND())
- {
- topWindow->Show(TRUE);
- }
-
- return 1;
-}
-#endif // _WINDLL
-
-//// Static member initialization
-
-wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL;
+// ----------------------------------------------------------------------------
+// wxApp ctor/dtor
+// ----------------------------------------------------------------------------
wxApp::wxApp()
{
- m_topWindow = NULL;
- wxTheApp = this;
- m_wantDebugOutput = TRUE;
-
- argc = 0;
- argv = NULL;
m_printMode = wxPRINT_WINDOWS;
- m_exitOnFrameDelete = TRUE;
- m_auto3D = TRUE;
}
wxApp::~wxApp()
{
- // Delete command-line args
- int i;
- for (i = 0; i < argc; i++)
+ // our cmd line arguments are allocated inside wxEntry(HINSTANCE), they
+ // don't come from main(), so we have to free them
+
+ while ( argc )
{
- delete[] argv[i];
+ // m_argv elements were allocated by wxStrdup()
+ free(argv[--argc]);
}
- delete[] argv;
+
+ // but m_argv itself -- using new[]
+ delete [] argv;
}
bool wxApp::Initialized()
return TRUE;
else
return FALSE;
-#endif
-#ifdef _WINDLL // Assume initialized if DLL (no way of telling)
+#else // Assume initialized if DLL (no way of telling)
return TRUE;
#endif
}
else if ( rc == -1 )
{
// should never happen, but let's test for it nevertheless
- wxLogLastError("GetMessage");
+ wxLogLastError(wxT("GetMessage"));
}
else
{
{
s_hadGuiLock = TRUE;
- size_t count = s_aSavedMessages.Count();
+ size_t count = s_aSavedMessages.GetCount();
for ( size_t n = 0; n < count; n++ )
{
MSG& msg = s_aSavedMessages[n];
- if ( !ProcessMessage((WXMSG *)&msg) )
- {
- ::TranslateMessage(&msg);
- ::DispatchMessage(&msg);
- }
+ DoMessage((WXMSG *)&msg);
}
s_aSavedMessages.Empty();
#endif // wxUSE_THREADS
// Process the message
- if ( !ProcessMessage((WXMSG *)&s_currentMsg) )
- {
- ::TranslateMessage(&s_currentMsg);
- ::DispatchMessage(&s_currentMsg);
- }
+ 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.
wxMutexGuiLeaveOrEnter();
#endif // wxUSE_THREADS
- while ( !::PeekMessage(&s_currentMsg, 0, 0, 0, PM_NOREMOVE) &&
- ProcessIdle() )
- {
- }
-
+ while ( !Pending() && ProcessIdle() )
+ ;
+ // a message came or no more idle processing to do
DoMessage();
}
return s_currentMsg.wParam;
}
-// Returns TRUE if more time is needed.
-bool wxApp::ProcessIdle()
-{
- wxIdleEvent event;
- event.SetEventObject(this);
- ProcessEvent(event);
-
- return event.MoreRequested();
-}
-
void wxApp::ExitMainLoop()
{
- m_keepGoing = FALSE;
+ // 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);
+ return ::PeekMessage(&s_currentMsg, 0, 0, 0, PM_NOREMOVE) != 0;
}
void wxApp::Dispatch()
bool wxApp::ProcessMessage(WXMSG *wxmsg)
{
MSG *msg = (MSG *)wxmsg;
- HWND hWnd = msg->hwnd;
- wxWindow *wndThis = wxFindWinFromHandle((WXHWND)hWnd), *wnd;
+ 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
- // for some composite controls (like a combobox), wndThis might be NULL
- // because the subcontrol is not a wxWindow, but only the control itself
- // is - try to catch this case
- while ( hWnd && !wndThis )
+ // 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) )
{
- hWnd = ::GetParent(hWnd);
- wndThis = wxFindWinFromHandle((WXHWND)hWnd);
+ return FALSE;
}
- // Try translations first; find the youngest window with
- // a translation table.
+ // try translations first: the accelerators override everything
+ wxWindow *wnd;
+
for ( wnd = wndThis; wnd; wnd = wnd->GetParent() )
{
- if ( wnd->MSWTranslateMessage(wxmsg) )
+ 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;
}
- // Anyone for a non-translation message? Try youngest descendants first.
- for ( wnd = wndThis; wnd; wnd = wnd->GetParent() )
+ // 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;
+
void wxApp::OnIdle(wxIdleEvent& event)
{
- static bool s_inOnIdle = FALSE;
-
// Avoid recursion (via ProcessEvent default case)
- if ( s_inOnIdle )
+ if ( wxIsInOnIdleFlag )
return;
- s_inOnIdle = TRUE;
+ 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 *pLog = wxLog::GetActiveTarget();
- if ( pLog != NULL && pLog->HasPendingMessages() )
- pLog->Flush();
+ wxLog::FlushActive();
#endif // wxUSE_LOG
+#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
+ // get an idle event and we're not dragging anything.
+ if (!::GetKeyState(MK_LBUTTON) && !::GetKeyState(MK_MBUTTON) && !::GetKeyState(MK_RBUTTON))
+ wxDC::ClearCache();
+#endif // wxUSE_DC_CACHEING
+
+ // Now done in ProcessIdle()
+#if 0
// Send OnIdle events to all windows
if ( SendIdleEvents() )
{
// idle events
event.RequestMore(TRUE);
}
+#endif
- // If they are pending events, we must process them: pending events are
- // either events to the threads other than main or events posted with
- // wxPostEvent() functions
- ProcessPendingEvents();
-
- s_inOnIdle = FALSE;
-}
-
-// Send idle event to all top-level windows
-bool wxApp::SendIdleEvents()
-{
- bool needMore = FALSE;
-
- wxWindowList::Node* node = wxTopLevelWindows.GetFirst();
- while (node)
- {
- wxWindow* win = node->GetData();
- if (SendIdleEvents(win))
- needMore = TRUE;
- node = node->GetNext();
- }
-
- return needMore;
-}
-
-// Send idle event to window and all subwindows
-bool wxApp::SendIdleEvents(wxWindow* win)
-{
- bool needMore = FALSE;
-
- wxIdleEvent event;
- event.SetEventObject(win);
- win->GetEventHandler()->ProcessEvent(event);
-
- if (event.MoreRequested())
- needMore = TRUE;
-
- wxNode* node = win->GetChildren().First();
- while (node)
- {
- wxWindow* win = (wxWindow*) node->Data();
- if (SendIdleEvents(win))
- needMore = TRUE;
-
- node = node->Next();
- }
- return needMore;
+ wxIsInOnIdleFlag = FALSE;
}
-void wxApp::DeletePendingObjects()
+void wxApp::WakeUpIdle()
{
- wxNode *node = wxPendingDelete.First();
- while (node)
+ // Send the top window a dummy message so idle handler processing will
+ // start up again. Doing it this way ensures that the idle handler
+ // wakes up in the right thread (see also wxWakeUpMainThread() which does
+ // the same for the main app thread only)
+ wxWindow *topWindow = wxTheApp->GetTopWindow();
+ if ( topWindow )
{
- wxObject *obj = (wxObject *)node->Data();
-
- delete obj;
-
- if (wxPendingDelete.Member(obj))
- delete node;
-
- // Deleting one object may have deleted other pending
- // objects, so start from beginning of list again.
- node = wxPendingDelete.First();
+ if ( !::PostMessage(GetHwndOf(topWindow), WM_NULL, 0, 0) )
+ {
+ // should never happen
+ wxLogLastError(wxT("PostMessage(WM_NULL)"));
+ }
}
}
}
}
-int wxApp::GetComCtl32Version() const
+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 *);
+
+/* static */
+int wxApp::GetComCtl32Version()
{
- // have we loaded COMCTL32 yet?
- HMODULE theModule = ::GetModuleHandle(wxT("COMCTL32"));
- int version = 0;
+#if defined(__WXMICROWIN__) || defined(__WXWINCE__)
+ return 0;
+#else
+ // cache the result
+ static int s_verComCtl32 = -1;
- // if so, then we can check for the version
- if (theModule)
+ wxCRIT_SECT_DECLARE(csComCtl32);
+ wxCRIT_SECT_LOCKER(lock, csComCtl32);
+
+ if ( s_verComCtl32 == -1 )
{
- // InitCommonControlsEx is unique to 4.7 and later
- FARPROC theProc = ::GetProcAddress(theModule, "InitCommonControlsEx");
+ // initally assume no comctl32.dll at all
+ s_verComCtl32 = 0;
- if (! theProc)
- { // not found, must be 4.00
- version = 400;
- }
- else
+ // do we have it?
+ HMODULE hModuleComCtl32 = ::GetModuleHandle(wxT("COMCTL32"));
+ BOOL bFreeComCtl32 = FALSE ;
+ if(!hModuleComCtl32)
{
- // The following symbol are unique to 4.71
- // DllInstall
- // FlatSB_EnableScrollBar FlatSB_GetScrollInfo FlatSB_GetScrollPos
- // FlatSB_GetScrollProp FlatSB_GetScrollRange FlatSB_SetScrollInfo
- // FlatSB_SetScrollPos FlatSB_SetScrollProp FlatSB_SetScrollRange
- // FlatSB_ShowScrollBar
- // _DrawIndirectImageList _DuplicateImageList
- // InitializeFlatSB
- // UninitializeFlatSB
- // we could check for any of these - I chose DllInstall
- FARPROC theProc = ::GetProcAddress(theModule, "DllInstall");
- if (! theProc)
+ hModuleComCtl32 = ::LoadLibrary(wxT("COMCTL32.DLL")) ;
+ if(hModuleComCtl32)
{
- // not found, must be 4.70
- version = 470;
- }
- else
- { // found, must be 4.71
- version = 471;
+ bFreeComCtl32 = TRUE ;
}
}
- }
- return version;
-}
-void wxExit()
-{
- wxLogError(_("Fatal error: exiting"));
+ // if so, then we can check for the version
+ if ( hModuleComCtl32 )
+ {
+ // try to use DllGetVersion() if available in _headers_
+ WXADLLGETVERSIONPROC pfnDllGetVersion = (WXADLLGETVERSIONPROC)
+ ::GetProcAddress(hModuleComCtl32, "DllGetVersion");
+ if ( pfnDllGetVersion )
+ {
+ WXADLLVERSIONINFO dvi;
+ dvi.cbSize = sizeof(dvi);
+
+ 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;
+ }
+ }
+ // DllGetVersion() unavailable either during compile or
+ // run-time, try to guess the version otherwise
+ if ( !s_verComCtl32 )
+ {
+ // InitCommonControlsEx is unique to 4.70 and later
+ FARPROC theProc = ::GetProcAddress
+ (
+ hModuleComCtl32,
+ "InitCommonControlsEx"
+ );
+
+ if ( !theProc )
+ {
+ // not found, must be 4.00
+ s_verComCtl32 = 400;
+ }
+ 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;
+ }
+ }
+ }
+ }
+
+ if(bFreeComCtl32)
+ {
+ ::FreeLibrary(hModuleComCtl32) ;
+ }
+ }
- wxApp::CleanUp();
+ return s_verComCtl32;
+#endif
}
// Yield to incoming messages
-bool wxYield()
+
+bool wxApp::Yield(bool onlyIfNeeded)
{
+ // MT-FIXME
+ static bool s_inYield = FALSE;
+
+#if wxUSE_LOG
+ // disable log flushing from here because a call to wxYield() shouldn't
+ // normally result in message boxes popping up &c
+ wxLog::Suspend();
+#endif // wxUSE_LOG
+
+ if ( s_inYield )
+ {
+ if ( !onlyIfNeeded )
+ {
+ wxFAIL_MSG( wxT("wxYield called recursively" ) );
+ }
+
+ return FALSE;
+ }
+
+ 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
-
MSG msg;
while ( PeekMessage(&msg, (HWND)0, 0, 0, PM_NOREMOVE) &&
msg.message != WM_QUIT )
{
+#if wxUSE_THREADS
+ wxMutexGuiLeaveOrEnter();
+#endif // wxUSE_THREADS
+
if ( !wxTheApp->DoMessage() )
break;
}
- // If they are pending events, we must process them.
- wxTheApp->ProcessPendingEvents();
-
- return TRUE;
-}
-
-wxIcon
-wxApp::GetStdIcon(int which) const
-{
- switch(which)
- {
- case wxICON_INFORMATION:
- return wxIcon("wxICON_INFO");
-
- case wxICON_QUESTION:
- return wxIcon("wxICON_QUESTION");
-
- case wxICON_EXCLAMATION:
- return wxIcon("wxICON_WARNING");
-
- default:
- wxFAIL_MSG(wxT("requested non existent standard icon"));
- // still fall through
-
- case wxICON_HAND:
- return wxIcon("wxICON_ERROR");
- }
-}
+ // if there are pending events, we must process them.
+ ProcessPendingEvents();
+#if wxUSE_LOG
+ // let the logs be flashed again
+ wxLog::Resume();
+#endif // wxUSE_LOG
-HINSTANCE wxGetInstance()
-{
- return wxhInstance;
-}
+ s_inYield = FALSE;
-void wxSetInstance(HINSTANCE hInst)
-{
- wxhInstance = hInst;
+ return TRUE;
}
-// For some reason, with MSVC++ 1.5, WinMain isn't linked in properly
-// if in a separate file. So include it here to ensure it's linked.
-#if (defined(__VISUALC__) && !defined(__WIN32__)) || (defined(__GNUWIN32__) && !defined(__TWIN32__))
-#include "main.cpp"
-#endif
projects / wxWidgets.git / blobdiff