/////////////////////////////////////////////////////////////////////////////
-// Name: app.cpp
+// Name: src/msw/app.cpp
// Purpose: wxApp
// Author: Julian Smart
// 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
/////////////////////////////////////////////////////////////////////////////
// ===========================================================================
// headers
// ---------------------------------------------------------------------------
-#ifdef __GNUG__
- #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/log.h"
-#include "wx/module.h"
+#include "wx/apptrait.h"
+#include "wx/filename.h"
+#include "wx/dynlib.h"
+#include "wx/evtloop.h"
+#include "wx/thread.h"
+#include "wx/scopeguard.h"
+#include "wx/vector.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_WX_RESOURCES
- #include "wx/resource.h"
-#endif
+#include "wx/msw/dc.h"
+#include "wx/msw/ole/oleutils.h"
+#include "wx/msw/private/timer.h"
#if wxUSE_TOOLTIPS
#include "wx/tooltip.h"
// 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(__SC__) || defined(__SALFORDC__)
+#if defined(__GNUWIN32_OLD__) || defined(__SYMANTEC__)
#undef wxUSE_OLE
#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 <string.h>
#include <ctype.h>
-#if defined(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__TWIN32__) || defined(__WXMICROWIN__)) && !defined(__CYGWIN10__))
- #include <commctrl.h>
-#endif
-
-#ifndef __WXMICROWIN__
-#include "wx/msw/msvcrt.h"
-#endif
-
-// ----------------------------------------------------------------------------
-// conditional compilation
-// ----------------------------------------------------------------------------
+#include "wx/msw/missing.h"
-// 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:
+// 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
//
-// 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
- #include <shlwapi.h>
+// 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)
+
+#ifndef ATTACH_PARENT_PROCESS
+ #define ATTACH_PARENT_PROCESS ((DWORD)-1)
#endif
// ---------------------------------------------------------------------------
// global variables
// ---------------------------------------------------------------------------
-extern wxChar *wxBuffer;
-extern wxList *wxWinHandleList;
-extern wxList WXDLLEXPORT wxPendingDelete;
-#ifndef __WXMICROWIN__
+#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
extern void wxSetKeyboardHook(bool doIt);
#endif
-MSG s_currentMsg;
-wxApp *wxTheApp = NULL;
+// because of mingw32 4.3 bug this struct can't be inside the namespace below:
+// see http://article.gmane.org/gmane.comp.lib.wxwidgets.devel/110282
+struct ClassRegInfo
+{
+ // the base name of the class: this is used to construct the unique name in
+ // RegisterClassWithUniqueNames()
+ wxString basename;
-// NB: all "NoRedraw" classes must have the same names as the "normal" classes
-// with NR suffix - wxWindow::MSWCreate() supposes this
-const wxChar *wxFrameClassName = wxT("wxFrameClass");
-const wxChar *wxFrameClassNameNoRedraw = wxT("wxFrameClassNR");
-const wxChar *wxMDIFrameClassName = wxT("wxMDIFrameClass");
-const wxChar *wxMDIFrameClassNameNoRedraw = wxT("wxMDIFrameClassNR");
-const wxChar *wxMDIChildFrameClassName = wxT("wxMDIChildFrameClass");
-const wxChar *wxMDIChildFrameClassNameNoRedraw = wxT("wxMDIChildFrameClassNR");
-const wxChar *wxPanelClassName = wxT("wxPanelClass");
-const wxChar *wxPanelClassNameNR = wxT("wxPanelClassNR");
-const wxChar *wxCanvasClassName = wxT("wxCanvasClass");
-const wxChar *wxCanvasClassNameNR = wxT("wxCanvasClassNR");
+ // the name of the registered class with and without CS_[HV]REDRAW styles
+ wxString regname,
+ regnameNR;
+};
-HICON wxSTD_FRAME_ICON = (HICON) NULL;
-HICON wxSTD_MDICHILDFRAME_ICON = (HICON) NULL;
-HICON wxSTD_MDIPARENTFRAME_ICON = (HICON) NULL;
+namespace
+{
-HICON wxDEFAULT_FRAME_ICON = (HICON) NULL;
-HICON wxDEFAULT_MDICHILDFRAME_ICON = (HICON) NULL;
-HICON wxDEFAULT_MDIPARENTFRAME_ICON = (HICON) NULL;
+wxVector<ClassRegInfo> gs_regClassesInfo;
-HBRUSH wxDisableButtonBrush = (HBRUSH) 0;
+} // anonymous namespace
-LRESULT WXDLLEXPORT APIENTRY wxWndProc(HWND, UINT, WPARAM, LPARAM);
+// ----------------------------------------------------------------------------
+// private functions
+// ----------------------------------------------------------------------------
-// FIXME wxUSE_ON_FATAL_EXCEPTION is only supported for VC++ now because it
-// needs compiler support for Win32 SEH. Others (especially Borland)
-// probably have it too, but I'm not sure about how it works
-// JACS: get 'Cannot use __try in functions that require unwinding
-// in Unicode mode, so disabling.
-#if !defined(__VISUALC__) || defined(__WIN16__) || defined(UNICODE)
- #undef wxUSE_ON_FATAL_EXCEPTION
- #define wxUSE_ON_FATAL_EXCEPTION 0
-#endif // VC++
-
-#if wxUSE_ON_FATAL_EXCEPTION
- static bool gs_handleExceptions = FALSE;
-#endif
+LRESULT WXDLLEXPORT APIENTRY wxWndProc(HWND, UINT, WPARAM, LPARAM);
// ===========================================================================
-// implementation
+// wxGUIAppTraits implementation
// ===========================================================================
-// ---------------------------------------------------------------------------
-// wxApp
-// ---------------------------------------------------------------------------
-
-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()
-
-//// Initialize
-bool wxApp::Initialize()
+// private class which we use to pass parameters from BeforeChildWaitLoop() to
+// AfterChildWaitLoop()
+struct ChildWaitLoopData
{
- // the first thing to do is to check if we're trying to run an Unicode
- // program under Win9x - if so, abort right now as it has no chance to
- // work
-#if wxUSE_UNICODE
- if ( wxGetOsVersion() != wxWINDOWS_NT )
+ ChildWaitLoopData(wxWindowDisabler *wd_, wxWindow *winActive_)
{
- // 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.\nProgram aborted."),
- _T("wxWindows Fatal Error"),
- MB_ICONERROR | MB_OK
- );
-
- return FALSE;
+ wd = wd_;
+ winActive = winActive_;
}
-#endif // wxUSE_UNICODE
-
- // Some people may wish to use this, but
- // probably it shouldn't be here by default.
-#ifdef __WXDEBUG__
- // wxRedirectIOToConsole();
-#endif
-
- wxBuffer = new wxChar[1500]; // FIXME
-
- wxClassInfo::InitializeClasses();
-
-#if wxUSE_THREADS
- wxPendingEventsLocker = new wxCriticalSection;
-#endif
-
- wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING);
- wxTheColourDatabase->Initialize();
-
- wxInitializeStockLists();
- wxInitializeStockObjects();
-
-#if wxUSE_WX_RESOURCES
- wxInitializeResourceSystem();
-#endif
- wxBitmap::InitStandardHandlers();
+ wxWindowDisabler *wd;
+ wxWindow *winActive;
+};
-#if defined(__WIN95__) && !defined(__WXMICROWIN__)
- InitCommonControls();
-#endif // __WIN95__
+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);
+}
-#if wxUSE_OLE || wxUSE_DRAG_AND_DROP
+void wxGUIAppTraits::AlwaysYield()
+{
+ wxYield();
+}
-#ifdef __WIN16__
- // for OLE, enlarge message queue to be as large as possible
- int iMsg = 96;
- while (!SetMessageQueue(iMsg) && (iMsg -= 8))
- ;
-#endif // Win16
+void wxGUIAppTraits::AfterChildWaitLoop(void *dataOrig)
+{
+ wxEndBusyCursor();
- // we need to initialize OLE library
- if ( FAILED(::OleInitialize(NULL)) )
- wxLogError(_("Cannot initialize OLE"));
+ ChildWaitLoopData * const data = (ChildWaitLoopData *)dataOrig;
-#endif // wxUSE_OLE
+ delete data->wd;
-#if wxUSE_CTL3D
- if (!Ctl3dRegister(wxhInstance))
- wxLogError(wxT("Cannot register CTL3D"));
+ // 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();
- Ctl3dAutoSubclass(wxhInstance);
-#endif // wxUSE_CTL3D
+ // also delete the temporary data object itself
+ delete data;
+}
- // VZ: these icons are not in wx.rc anyhow (but should they?)!
-#if 0
- wxSTD_FRAME_ICON = LoadIcon(wxhInstance, wxT("wxSTD_FRAME"));
- wxSTD_MDIPARENTFRAME_ICON = LoadIcon(wxhInstance, wxT("wxSTD_MDIPARENTFRAME"));
- wxSTD_MDICHILDFRAME_ICON = LoadIcon(wxhInstance, wxT("wxSTD_MDICHILDFRAME"));
+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
+ wxEventLoopBase * const evtLoop = wxEventLoop::GetActive();
+ if ( !evtLoop || !evtLoop->Pending() )
+ {
+ // no events means no quit event
+ return true;
+ }
- 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 // 0
+ return evtLoop->Dispatch();
+}
- RegisterWindowClasses();
+DWORD wxGUIAppTraits::WaitForThread(WXHANDLE hThread)
+{
+ // 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
+ );
+}
-#ifndef __WXMICROWIN__
- // Create the brush for disabling bitmap buttons
+wxPortId wxGUIAppTraits::GetToolkitVersion(int *majVer, int *minVer) const
+{
+ OSVERSIONINFO info;
+ wxZeroMemory(info);
- LOGBRUSH lb;
- lb.lbStyle = BS_PATTERN;
- lb.lbHatch = (int)LoadBitmap( wxhInstance, wxT("wxDISABLE_BUTTON_BITMAP") );
- if ( lb.lbHatch )
+ // 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) )
{
- wxDisableButtonBrush = ::CreateBrushIndirect( & lb );
- ::DeleteObject( (HGDIOBJ)lb.lbHatch );
+ if ( majVer )
+ *majVer = info.dwMajorVersion;
+ if ( minVer )
+ *minVer = info.dwMinorVersion;
}
- //else: wxWindows resources are probably not linked in
-#endif
-#if wxUSE_PENWINDOWS
- wxRegisterPenWin();
+#if defined(__WXHANDHELD__) || defined(__WXWINCE__)
+ return wxPORT_WINCE;
+#else
+ return wxPORT_MSW;
#endif
+}
- wxWinHandleList = new wxList(wxKEY_INTEGER);
+#if wxUSE_TIMER
- // 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
+wxTimerImpl *wxGUIAppTraits::CreateTimerImpl(wxTimer *timer)
+{
+ return new wxMSWTimerImpl(timer);
+}
-#ifndef __WXMICROWIN__
- wxSetKeyboardHook(TRUE);
-#endif
+#endif // wxUSE_TIMER
- wxModule::RegisterModules();
- if (!wxModule::InitializeModules())
- return FALSE;
- return TRUE;
+wxEventLoopBase* wxGUIAppTraits::CreateEventLoop()
+{
+ return new wxEventLoop;
}
// ---------------------------------------------------------------------------
-// RegisterWindowClasses
+// Stuff for using console from the GUI applications
// ---------------------------------------------------------------------------
-// TODO we should only register classes really used by the app. For this it
-// would be enough to just delay the class registration until an attempt
-// to create a window of this class is made.
-bool wxApp::RegisterWindowClasses()
-{
- WNDCLASS 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
- static const long styleNormal = CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS;
- static const long styleNoRedraw = CS_DBLCLKS;
-
- // 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;
+#ifndef __WXWINCE__
- // Register the frame window class.
- wndclass.hbrBackground = (HBRUSH)(COLOR_APPWORKSPACE + 1);
- wndclass.lpszClassName = wxFrameClassName;
- wndclass.style = styleNormal;
+#include <wx/dynlib.h>
- if ( !RegisterClass(&wndclass) )
- {
- wxLogLastError(wxT("RegisterClass(frame)"));
+namespace
+{
- return FALSE;
- }
+/*
+ Helper class to manipulate console from a GUI app.
- // "no redraw" frame
- wndclass.lpszClassName = wxFrameClassNameNoRedraw;
- wndclass.style = styleNoRedraw;
+ Notice that console output is available in the GUI app only if:
+ - AttachConsole() returns TRUE (which means it never works under pre-XP)
+ - we have a valid STD_ERROR_HANDLE
+ - command history hasn't been changed since our startup
- if ( !RegisterClass(&wndclass) )
+ To check if all these conditions are verified, you need to simple call
+ IsOkToUse(). It will check the first two conditions above the first time it
+ is called (and if this fails, the subsequent calls will return immediately)
+ and also recheck the last one every time it is called.
+ */
+class wxConsoleStderr
+{
+public:
+ // default ctor does nothing, call Init() before using this class
+ wxConsoleStderr()
{
- wxLogLastError(wxT("RegisterClass(no redraw frame)"));
+ m_hStderr = INVALID_HANDLE_VALUE;
+ m_historyLen =
+ m_dataLen =
+ m_dataLine = 0;
- return FALSE;
+ m_ok = -1;
}
- // Register the MDI frame window class.
- wndclass.hbrBackground = (HBRUSH)NULL; // paint MDI frame ourselves
- wndclass.lpszClassName = wxMDIFrameClassName;
- wndclass.style = styleNormal;
-
- if ( !RegisterClass(&wndclass) )
+ ~wxConsoleStderr()
{
- wxLogLastError(wxT("RegisterClass(MDI parent)"));
-
- return FALSE;
+ if ( m_hStderr != INVALID_HANDLE_VALUE )
+ {
+ if ( !::FreeConsole() )
+ {
+ wxLogLastError(_T("FreeConsole"));
+ }
+ }
}
- // "no redraw" MDI frame
- wndclass.lpszClassName = wxMDIFrameClassNameNoRedraw;
- wndclass.style = styleNoRedraw;
-
- if ( !RegisterClass(&wndclass) )
+ // return true if we were successfully initialized and there had been no
+ // console activity which would interfere with our output since then
+ bool IsOkToUse() const
{
- wxLogLastError(wxT("RegisterClass(no redraw MDI parent frame)"));
+ if ( m_ok == -1 )
+ {
+ wxConsoleStderr * const self = const_cast<wxConsoleStderr *>(this);
+ self->m_ok = self->DoInit();
- return FALSE;
+ // no need to call IsHistoryUnchanged() as we just initialized
+ // m_history anyhow
+ return m_ok == 1;
+ }
+
+ return m_ok && IsHistoryUnchanged();
}
- // Register the MDI child frame window class.
- wndclass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1);
- wndclass.lpszClassName = wxMDIChildFrameClassName;
- wndclass.style = styleNormal;
- if ( !RegisterClass(&wndclass) )
- {
- wxLogLastError(wxT("RegisterClass(MDI child)"));
+ // output the provided text on the console, return true if ok
+ bool Write(const wxString& text);
- return FALSE;
- }
+private:
+ // called by Init() once only to do the real initialization
+ bool DoInit();
- // "no redraw" MDI child frame
- wndclass.lpszClassName = wxMDIChildFrameClassNameNoRedraw;
- wndclass.style = styleNoRedraw;
+ // retrieve the command line history into the provided buffer and return
+ // its length
+ int GetCommandHistory(wxWxCharBuffer& buf) const;
- if ( !RegisterClass(&wndclass) )
- {
- wxLogLastError(wxT("RegisterClass(no redraw MDI child)"));
+ // check if the console history has changed
+ bool IsHistoryUnchanged() const;
- return FALSE;
- }
+ int m_ok; // initially -1, set to true or false by Init()
- // Register the panel window class.
- wndclass.hbrBackground = (HBRUSH) GetStockObject( LTGRAY_BRUSH );
- wndclass.lpszClassName = wxPanelClassName;
- wndclass.style = styleNormal;
+ wxDynamicLibrary m_dllKernel32;
- if ( !RegisterClass(&wndclass) )
- {
- wxLogLastError(wxT("RegisterClass(panel)"));
+ HANDLE m_hStderr; // console handle, if it's valid we must call
+ // FreeConsole() (even if m_ok != 1)
- return FALSE;
- }
+ wxWxCharBuffer m_history; // command history on startup
+ int m_historyLen; // length command history buffer
- // Register the no redraw panel window class.
- wndclass.lpszClassName = wxPanelClassNameNR;
- wndclass.style = styleNoRedraw;
+ wxCharBuffer m_data; // data between empty line and cursor position
+ int m_dataLen; // length data buffer
+ int m_dataLine; // line offset
- if ( !RegisterClass(&wndclass) )
- {
- wxLogLastError(wxT("RegisterClass(no redraw panel)"));
+ typedef DWORD (WINAPI *GetConsoleCommandHistory_t)(LPTSTR sCommands,
+ DWORD nBufferLength,
+ LPCTSTR sExeName);
+ typedef DWORD (WINAPI *GetConsoleCommandHistoryLength_t)(LPCTSTR sExeName);
- return FALSE;
- }
+ GetConsoleCommandHistory_t m_pfnGetConsoleCommandHistory;
+ GetConsoleCommandHistoryLength_t m_pfnGetConsoleCommandHistoryLength;
- // Register the canvas and textsubwindow class name
- wndclass.hbrBackground = (HBRUSH)NULL;
- wndclass.lpszClassName = wxCanvasClassName;
+ DECLARE_NO_COPY_CLASS(wxConsoleStderr)
+};
- if ( !RegisterClass(&wndclass) )
- {
- wxLogLastError(wxT("RegisterClass(canvas)"));
+bool wxConsoleStderr::DoInit()
+{
+ HANDLE hStderr = ::GetStdHandle(STD_ERROR_HANDLE);
- return FALSE;
- }
+ if ( hStderr == INVALID_HANDLE_VALUE || !hStderr )
+ return false;
- wndclass.lpszClassName = wxCanvasClassNameNR;
- wndclass.style = styleNoRedraw;
- if ( !RegisterClass(&wndclass) )
- {
- wxLogLastError(wxT("RegisterClass(no redraw canvas)"));
+ if ( !m_dllKernel32.Load(_T("kernel32.dll")) )
+ return false;
- return FALSE;
- }
+ typedef BOOL (WINAPI *AttachConsole_t)(DWORD dwProcessId);
+ AttachConsole_t wxDL_INIT_FUNC(pfn, AttachConsole, m_dllKernel32);
- return TRUE;
-}
+ if ( !pfnAttachConsole || !pfnAttachConsole(ATTACH_PARENT_PROCESS) )
+ return false;
-// ---------------------------------------------------------------------------
-// Convert Windows to argc, argv style
-// ---------------------------------------------------------------------------
+ // console attached, set m_hStderr now to ensure that we free it in the
+ // dtor
+ m_hStderr = hStderr;
-void wxApp::ConvertToStandardCommandArgs(char* lpCmdLine)
-{
- wxStringList args;
+ wxDL_INIT_FUNC_AW(m_pfn, GetConsoleCommandHistory, m_dllKernel32);
+ if ( !m_pfnGetConsoleCommandHistory )
+ return false;
- wxString cmdLine(lpCmdLine);
- int count = 0;
+ wxDL_INIT_FUNC_AW(m_pfn, GetConsoleCommandHistoryLength, m_dllKernel32);
+ if ( !m_pfnGetConsoleCommandHistoryLength )
+ return false;
- // Get application name
- wxChar name[260]; // 260 is MAX_PATH value from windef.h
- ::GetModuleFileName(wxhInstance, name, WXSIZEOF(name));
+ // remember the current command history to be able to compare with it later
+ // in IsHistoryUnchanged()
+ m_historyLen = GetCommandHistory(m_history);
+ if ( !m_history )
+ return false;
- args.Add(name);
- count++;
- wxStrcpy(name, wxFileNameFromPath(name));
- wxStripExtension(name);
- wxTheApp->SetAppName(name);
+ // now find the first blank line above the current position
+ CONSOLE_SCREEN_BUFFER_INFO csbi;
- // Break up string
- // Treat strings enclosed in double-quotes as single arguments
- int i = 0;
- int len = cmdLine.Length();
- while (i < len)
+ if ( !::GetConsoleScreenBufferInfo(m_hStderr, &csbi) )
{
- // 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 ++;
-
- wxString arg(cmdLine.Mid(first, (i - first)));
+ wxLogLastError(_T("GetConsoleScreenBufferInfo"));
+ return false;
+ }
- args.Add(arg);
- count ++;
+ COORD pos;
+ pos.X = 0;
+ pos.Y = csbi.dwCursorPosition.Y + 1;
- if (i < len)
- i ++; // Skip past 2nd quote
- }
- else // Unquoted argument
- {
- int first = i;
- while ((i < len) && !wxIsspace(cmdLine.GetChar(i)))
- i ++;
+ // we decide that a line is empty if first 4 characters are spaces
+ DWORD ret;
+ char buf[4];
+ do
+ {
+ pos.Y--;
+ if ( !::ReadConsoleOutputCharacterA(m_hStderr, buf, WXSIZEOF(buf),
+ pos, &ret) )
+ {
+ wxLogLastError(_T("ReadConsoleOutputCharacterA"));
+ return false;
+ }
+ } while ( wxStrncmp(" ", buf, WXSIZEOF(buf)) != 0 );
- wxString arg(cmdLine.Mid(first, (i - first)));
+ // calculate line offset and length of data
+ m_dataLine = csbi.dwCursorPosition.Y - pos.Y;
+ m_dataLen = m_dataLine*csbi.dwMaximumWindowSize.X + csbi.dwCursorPosition.X;
- args.Add(arg);
- count ++;
- }
+ if ( m_dataLen > 0 )
+ {
+ m_data.extend(m_dataLen);
+ if ( !::ReadConsoleOutputCharacterA(m_hStderr, m_data.data(), m_dataLen,
+ pos, &ret) )
+ {
+ wxLogLastError(_T("ReadConsoleOutputCharacterA"));
+ return false;
}
}
- wxTheApp->argv = new wxChar*[count + 1];
- for (i = 0; i < count; i++)
- {
- wxString arg(args[i]);
- wxTheApp->argv[i] = copystring((const wxChar*)arg);
- }
- wxTheApp->argv[count] = NULL; // argv[] is a NULL-terminated list
- wxTheApp->argc = count;
+ return true;
}
-//// Cleans up any wxWindows internal structures left lying around
-
-void wxApp::CleanUp()
+int wxConsoleStderr::GetCommandHistory(wxWxCharBuffer& buf) const
{
- //// 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();
+ // these functions are internal and may only be called by cmd.exe
+ static const wxChar *CMD_EXE = _T("cmd.exe");
-#if wxUSE_WX_RESOURCES
- wxCleanUpResourceSystem();
-
- // wxDefaultResourceTable->ClearTable();
-#endif
-
- wxDeleteStockObjects();
-
- // Destroy all GDI lists, etc.
- wxDeleteStockLists();
-
- delete wxTheColourDatabase;
- wxTheColourDatabase = NULL;
-
- wxBitmap::CleanUpHandlers();
-
- delete[] wxBuffer;
- wxBuffer = NULL;
-
- //// WINDOWS-SPECIFIC CLEANUP
+ const int len = m_pfnGetConsoleCommandHistoryLength(CMD_EXE);
+ if ( len )
+ {
+ buf.extend(len);
-#ifndef __WXMICROWIN__
- wxSetKeyboardHook(FALSE);
-#endif
+ int len2 = m_pfnGetConsoleCommandHistory(buf.data(), len, CMD_EXE);
-#if wxUSE_PENWINDOWS
- wxCleanUpPenWin();
-#endif
+#if !wxUSE_UNICODE
+ // there seems to be a bug in the GetConsoleCommandHistoryA(), it
+ // returns the length of Unicode string and not ANSI one
+ len2 /= 2;
+#endif // !wxUSE_UNICODE
- 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 ( len2 != len )
+ {
+ wxFAIL_MSG( _T("failed getting history?") );
+ }
+ }
- if (wxDEFAULT_FRAME_ICON)
- DestroyIcon(wxDEFAULT_FRAME_ICON);
- if (wxDEFAULT_MDICHILDFRAME_ICON)
- DestroyIcon(wxDEFAULT_MDICHILDFRAME_ICON);
- if (wxDEFAULT_MDIPARENTFRAME_ICON)
- DestroyIcon(wxDEFAULT_MDIPARENTFRAME_ICON);
+ return len;
+}
- if ( wxDisableButtonBrush )
- ::DeleteObject( wxDisableButtonBrush );
+bool wxConsoleStderr::IsHistoryUnchanged() const
+{
+ wxASSERT_MSG( m_ok == 1, _T("shouldn't be called if not initialized") );
-#if wxUSE_OLE
- ::OleUninitialize();
-#endif
+ // get (possibly changed) command history
+ wxWxCharBuffer history;
+ const int historyLen = GetCommandHistory(history);
-#if wxUSE_CTL3D
- Ctl3dUnregister(wxhInstance);
-#endif
+ // and compare it with the original one
+ return historyLen == m_historyLen && history &&
+ memcmp(m_history, history, historyLen) == 0;
+}
- if (wxWinHandleList)
- delete wxWinHandleList;
+bool wxConsoleStderr::Write(const wxString& text)
+{
+ wxASSERT_MSG( m_hStderr != INVALID_HANDLE_VALUE,
+ _T("should only be called if Init() returned true") );
- // 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;
+ // get current position
+ CONSOLE_SCREEN_BUFFER_INFO csbi;
+ if ( !::GetConsoleScreenBufferInfo(m_hStderr, &csbi) )
+ {
+ wxLogLastError(_T("GetConsoleScreenBufferInfo"));
+ return false;
+ }
-#if wxUSE_THREADS
- delete wxPendingEventsLocker;
- // If we don't do the following, we get an apparent memory leak
-#if wxUSE_VALIDATORS
- ((wxEvtHandler&) wxDefaultValidator).ClearEventLocker();
-#endif // wxUSE_VALIDATORS
-#endif // wxUSE_THREADS
+ // and calculate new position (where is empty line)
+ csbi.dwCursorPosition.X = 0;
+ csbi.dwCursorPosition.Y -= m_dataLine;
- wxClassInfo::CleanUpClasses();
+ if ( !::SetConsoleCursorPosition(m_hStderr, csbi.dwCursorPosition) )
+ {
+ wxLogLastError(_T("SetConsoleCursorPosition"));
+ return false;
+ }
- delete wxTheApp;
- wxTheApp = NULL;
+ DWORD ret;
+ if ( !::FillConsoleOutputCharacter(m_hStderr, _T(' '), m_dataLen,
+ csbi.dwCursorPosition, &ret) )
+ {
+ wxLogLastError(_T("FillConsoleOutputCharacter"));
+ return false;
+ }
-#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)
+ if ( !::WriteConsole(m_hStderr, text.wx_str(), text.length(), &ret, NULL) )
{
- wxLogMessage(wxT("There were memory leaks."));
- wxDebugContext::Dump();
- wxDebugContext::PrintStatistics();
+ wxLogLastError(_T("WriteConsole"));
+ return false;
}
- // wxDebugContext::SetStream(NULL, NULL);
-#endif
-#if wxUSE_LOG
- // do it as the very last thing because everything else can log messages
- delete wxLog::SetActiveTarget(NULL);
-#endif // wxUSE_LOG
+ WriteConsoleA(m_hStderr, m_data, m_dataLen, &ret, 0);
+
+ return true;
}
-//----------------------------------------------------------------------
-// Entry point helpers, used by wxPython
-//----------------------------------------------------------------------
+wxConsoleStderr s_consoleStderr;
-int WXDLLEXPORT wxEntryStart( int WXUNUSED(argc), char** WXUNUSED(argv) )
-{
- return wxApp::Initialize();
-}
+} // anonymous namespace
-int WXDLLEXPORT wxEntryInitGui()
+bool wxGUIAppTraits::CanUseStderr()
{
- return wxTheApp->OnInitGui();
+ return s_consoleStderr.IsOkToUse();
}
-void WXDLLEXPORT wxEntryCleanup()
+bool wxGUIAppTraits::WriteToStderr(const wxString& text)
{
- wxApp::CleanUp();
+ return s_consoleStderr.IsOkToUse() && s_consoleStderr.Write(text);
}
+#endif // !__WXWINCE__
-#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)
-#ifndef __WXMICROWIN__
- wxCrtSetDbgFlag(_CRTDBG_LEAK_CHECK_DF);
-#endif
-
-#ifdef __MWERKS__
-#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
- // This seems to be necessary since there are 'rogue'
- // objects present at this point (perhaps global objects?)
- // Setting a checkpoint will ignore them as far as the
- // memory checking facility is concerned.
- // Of course you may argue that memory allocated in globals should be
- // checked, but this is a reasonable compromise.
- wxDebugContext::SetCheckpoint();
-#endif
-#endif
-
- // take everything into a try-except block to be able to call
- // OnFatalException() if necessary
-#if wxUSE_ON_FATAL_EXCEPTION
- __try {
-#endif
- wxhInstance = (HINSTANCE) hInstance;
-
- if (!wxEntryStart(0,0))
- 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.") );
+// ===========================================================================
+// wxApp implementation
+// ===========================================================================
- wxTheApp = (wxApp*) (*wxApp::GetInitializerFunction()) ();
- }
+int wxApp::m_nCmdShow = SW_SHOWNORMAL;
- wxCHECK_MSG( wxTheApp, 0, wxT("You have to define an instance of wxApp!") );
+// ---------------------------------------------------------------------------
+// wxWin macros
+// ---------------------------------------------------------------------------
- // save the WinMain() parameters
- wxTheApp->ConvertToStandardCommandArgs(lpCmdLine);
- wxTheApp->m_nCmdShow = nCmdShow;
+IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
- // We really don't want timestamps by default, because it means
- // we can't simply double-click on the error message and get to that
- // line in the source. So VC++ at least, let's have a sensible default.
-#ifdef __VISUALC__
- wxLog::SetTimestamp(NULL);
-#endif
+BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
+ EVT_IDLE(wxApp::OnIdle)
+ EVT_END_SESSION(wxApp::OnEndSession)
+ EVT_QUERY_END_SESSION(wxApp::OnQueryEndSession)
+END_EVENT_TABLE()
- int retValue = 0;
+// 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(); }
- // it is common to create a modal dialog in OnInit() (to ask/notify the
- // user about something) but it wouldn't work if we don't change the
- // "exit on delete last frame" flag here as when this dialog is
- // deleted, the app would terminate (it was the last top level window
- // as the main frame wasn't created yet!), so disable this behaviour
- // temproarily
- bool exitOnLastFrameDelete = wxTheApp->GetExitOnFrameDelete();
- wxTheApp->SetExitOnFrameDelete(FALSE);
+ void Dismiss() { m_app = NULL; }
- // init the app
- retValue = wxEntryInitGui() && wxTheApp->OnInit() ? 0 : -1;
+private:
+ wxApp *m_app;
+};
- // restore the old flag value
- wxTheApp->SetExitOnFrameDelete(exitOnLastFrameDelete);
+//// Initialize
+bool wxApp::Initialize(int& argc, wxChar **argv)
+{
+ if ( !wxAppBase::Initialize(argc, argv) )
+ return false;
- if ( retValue == 0 )
- {
- if ( enterLoop )
- {
- // run the main loop
- retValue = wxTheApp->OnRun();
- }
- else
- {
- // we want to initialize, but not run or exit immediately.
- return 1;
- }
- }
- //else: app initialization failed, so we skipped OnRun()
+ // ensure that base cleanup is done if we return too early
+ wxCallBaseCleanup callBaseCleanup(this);
- 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);
- }
- }
+#if !defined(__WXMICROWIN__)
+ InitCommonControls();
+#endif // !defined(__WXMICROWIN__)
- wxTheApp->OnExit();
+#if defined(__SMARTPHONE__) || defined(__POCKETPC__)
+ SHInitExtraControls();
+#endif
- wxEntryCleanup();
+#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
- return retValue;
+ wxOleInitialize();
-#if wxUSE_ON_FATAL_EXCEPTION
- }
- __except ( gs_handleExceptions ? EXCEPTION_EXECUTE_HANDLER
- : EXCEPTION_CONTINUE_SEARCH ) {
- if ( wxTheApp )
- {
- // give the user a chance to do something special about this
- wxTheApp->OnFatalException();
- }
+#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
+ wxSetKeyboardHook(true);
+#endif
- ::ExitProcess(3); // the same exit code as abort()
+ callBaseCleanup.Dismiss();
- // NOTREACHED
- }
-#endif // wxUSE_ON_FATAL_EXCEPTION
+ return true;
}
-// restore warning state
-#ifdef __VISUALC__
- #pragma warning(default: 4715) // not all control paths return a value
-#endif // Visual C++
-
-#else /* _WINDLL */
-
-//----------------------------------------------------------------------
-// Entry point for wxWindows + the App in a DLL
-//----------------------------------------------------------------------
+// ---------------------------------------------------------------------------
+// Win32 window class registration
+// ---------------------------------------------------------------------------
-int wxEntry(WXHINSTANCE hInstance)
+/* static */
+const wxChar *wxApp::GetRegisteredClassName(const wxChar *name,
+ int bgBrushCol,
+ int extraStyles)
{
- wxhInstance = (HINSTANCE) hInstance;
- wxEntryStart(0, 0);
-
- // 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)
+ const size_t count = gs_regClassesInfo.size();
+ for ( size_t n = 0; n < count; n++ )
{
- wxCHECK_MSG( wxApp::GetInitializerFunction(), 0,
- "No initializer - use IMPLEMENT_APP macro." );
-
- wxTheApp = (* wxApp::GetInitializerFunction()) ();
+ if ( gs_regClassesInfo[n].basename == name )
+ return gs_regClassesInfo[n].regname.c_str();
}
- wxCHECK_MSG( wxTheApp, 0, "You have to define an instance of wxApp!" );
-
- wxTheApp->argc = 0;
- wxTheApp->argv = NULL;
-
- wxEntryInitGui();
-
- wxTheApp->OnInit();
+ // we need to register this class
+ WNDCLASS wndclass;
+ wxZeroMemory(wndclass);
- wxWindow *topWindow = wxTheApp->GetTopWindow();
- if ( topWindow && topWindow->GetHWND())
+ wndclass.lpfnWndProc = (WNDPROC)wxWndProc;
+ wndclass.hInstance = wxhInstance;
+ wndclass.hCursor = ::LoadCursor(NULL, IDC_ARROW);
+ wndclass.hbrBackground = (HBRUSH)wxUIntToPtr(bgBrushCol + 1);
+ wndclass.style = CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS | extraStyles;
+
+
+ ClassRegInfo regClass;
+ regClass.basename = name;
+
+ // constuct a unique suffix to allow registering the class with the same
+ // base name in a main application using wxWidgets and a DLL using
+ // wxWidgets loaded into its address space: as gs_regClassesInfo variable
+ // is different in them, we're going to obtain a unique prefix by using its
+ // address here
+ regClass.regname = regClass.basename +
+ wxString::Format(wxT("@%p"), &gs_regClassesInfo);
+ wndclass.lpszClassName = regClass.regname.wx_str();
+ if ( !::RegisterClass(&wndclass) )
{
- topWindow->Show(TRUE);
+ wxLogLastError(wxString::Format(wxT("RegisterClass(%s)"),
+ regClass.regname));
+ return NULL;
}
- return 1;
-}
-#endif // _WINDLL
-
-//// Static member initialization
+ // NB: remember that code elsewhere supposes that no redraw class names
+ // use the same names as normal classes with "NR" suffix so we must put
+ // "NR" at the end instead of using more natural basename+"NR"+suffix
+ regClass.regnameNR = regClass.regname + GetNoRedrawClassSuffix();
+ wndclass.style &= ~(CS_HREDRAW | CS_VREDRAW);
+ wndclass.lpszClassName = regClass.regnameNR.wx_str();
+ if ( !::RegisterClass(&wndclass) )
+ {
+ wxLogLastError(wxString::Format(wxT("RegisterClass(%s)"),
+ regClass.regname));
+ ::UnregisterClass(regClass.regname.c_str(), wxhInstance);
+ return NULL;
+ }
-wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL;
+ gs_regClassesInfo.push_back(regClass);
-wxApp::wxApp()
-{
- argc = 0;
- argv = NULL;
- m_printMode = wxPRINT_WINDOWS;
- m_auto3D = TRUE;
+ // take care to return the pointer which will remain valid after the
+ // function returns (it could be invalidated later if new elements are
+ // added to the vector and it's reallocated but this shouldn't matter as
+ // this pointer should be used right now, not stored)
+ return gs_regClassesInfo.back().regname.wx_str();
}
-wxApp::~wxApp()
+bool wxApp::IsRegisteredClassName(const wxString& name)
{
- // Delete command-line args
- int i;
- for (i = 0; i < argc; i++)
+ const size_t count = gs_regClassesInfo.size();
+ for ( size_t n = 0; n < count; n++ )
{
- delete[] argv[i];
+ if ( gs_regClassesInfo[n].regname == name ||
+ gs_regClassesInfo[n].regnameNR == name )
+ return true;
}
- 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
+ return false;
}
-/*
- * 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()
+void wxApp::UnregisterWindowClasses()
{
- BOOL rc = ::GetMessage(&s_currentMsg, (HWND) NULL, 0, 0);
- if ( rc == 0 )
+ const size_t count = gs_regClassesInfo.size();
+ for ( size_t n = 0; n < count; n++ )
{
- // 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() )
+ const ClassRegInfo& regClass = gs_regClassesInfo[n];
+ if ( !::UnregisterClass(regClass.regname.c_str(), wxhInstance) )
{
- 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;
+ wxLogLastError(wxString::Format(wxT("UnregisterClass(%s)"),
+ regClass.regname));
}
- 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.Count();
- for ( size_t n = 0; n < count; n++ )
- {
- MSG& msg = s_aSavedMessages[n];
-
- if ( !ProcessMessage((WXMSG *)&msg) )
- {
- ::TranslateMessage(&msg);
- ::DispatchMessage(&msg);
- }
- }
-
- s_aSavedMessages.Empty();
- }
+ if ( !::UnregisterClass(regClass.regnameNR.c_str(), wxhInstance) )
+ {
+ wxLogLastError(wxString::Format(wxT("UnregisterClass(%s)"),
+ regClass.regnameNR));
}
-#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);
- }
+ gs_regClassesInfo.clear();
}
-/*
- * 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()
+void wxApp::CleanUp()
{
- m_keepGoing = TRUE;
-
- while ( m_keepGoing )
- {
-#if wxUSE_THREADS
- wxMutexGuiLeaveOrEnter();
-#endif // wxUSE_THREADS
+ // all objects pending for deletion must be deleted first, otherwise
+ // UnregisterWindowClasses() call wouldn't succeed (because windows
+ // using the classes being unregistered 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);
+#endif
- while ( !Pending() && ProcessIdle() )
- ;
+ wxOleUninitialize();
- // a message came or no more idle processing to do
- DoMessage();
- }
-
- return s_currentMsg.wParam;
+ // 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();
}
-// Returns TRUE if more time is needed.
-bool wxApp::ProcessIdle()
-{
- wxIdleEvent event;
- event.SetEventObject(this);
- ProcessEvent(event);
-
- return event.MoreRequested();
-}
+// ----------------------------------------------------------------------------
+// wxApp ctor/dtor
+// ----------------------------------------------------------------------------
-void wxApp::ExitMainLoop()
+wxApp::wxApp()
{
- // VZ: why not ::PostQuitMessage()?
- m_keepGoing = FALSE;
+ m_printMode = wxPRINT_WINDOWS;
}
-bool wxApp::Pending()
+wxApp::~wxApp()
{
- return ::PeekMessage(&s_currentMsg, 0, 0, 0, PM_NOREMOVE) != 0;
}
-void wxApp::Dispatch()
+// ----------------------------------------------------------------------------
+// wxApp idle handling
+// ----------------------------------------------------------------------------
+
+void wxApp::OnIdle(wxIdleEvent& WXUNUSED(event))
{
- DoMessage();
+#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))
+ wxMSWDCImpl::ClearCache();
+#endif // wxUSE_DC_CACHEING
}
-/*
- * Give all windows a chance to preprocess
- * the message. Some may have accelerator tables, or have
- * MDI complications.
- */
-
-bool wxApp::ProcessMessage(WXMSG *wxmsg)
+void wxApp::WakeUpIdle()
{
- MSG *msg = (MSG *)wxmsg;
- HWND hWnd = msg->hwnd;
- wxWindow *wndThis = wxGetWindowFromHWND((WXHWND)hWnd);
-
-#if wxUSE_TOOLTIPS
- // we must relay WM_MOUSEMOVE events to the tooltip ctrl if we want it to
- // popup the tooltip bubbles
- if ( wndThis && (msg->message == WM_MOUSEMOVE) )
+ // 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 * const topWindow = wxTheApp->GetTopWindow();
+ if ( topWindow )
{
- wxToolTip *tt = wndThis->GetToolTip();
- if ( tt )
+ HWND hwndTop = GetHwndOf(topWindow);
+
+ // Do not post WM_NULL if there's already a pending WM_NULL to avoid
+ // overflowing the message queue.
+ //
+ // Notice that due to a limitation of PeekMessage() API (which handles
+ // 0,0 range specially), we have to check the range from 0-1 instead.
+ // This still makes it possible to overflow the queue with WM_NULLs by
+ // interspersing the calles to WakeUpIdle() with windows creation but
+ // it should be rather hard to do it accidentally.
+ MSG msg;
+ if ( !::PeekMessage(&msg, hwndTop, 0, 1, PM_NOREMOVE) ||
+ ::PeekMessage(&msg, hwndTop, 1, 1, PM_NOREMOVE) )
{
- tt->RelayEvent(wxmsg);
+ if ( !::PostMessage(hwndTop, WM_NULL, 0, 0) )
+ {
+ // should never happen
+ wxLogLastError(wxT("PostMessage(WM_NULL)"));
+ }
}
}
-#endif // wxUSE_TOOLTIPS
-
- // Try translations first; find the youngest window with
- // a translation table.
- wxWindow *wnd;
-
- bool pastTopLevelWindow = FALSE;
- for ( wnd = wndThis; wnd; wnd = wnd->GetParent() )
- {
- if ( !pastTopLevelWindow && wnd->MSWTranslateMessage(wxmsg))
- return TRUE;
- if ( wnd->MSWProcessMessage(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() )
- pastTopLevelWindow = TRUE;
- }
-
- return FALSE;
}
-void wxApp::OnIdle(wxIdleEvent& event)
-{
- static bool s_inOnIdle = FALSE;
+// ----------------------------------------------------------------------------
+// other wxApp event hanlders
+// ----------------------------------------------------------------------------
- // Avoid recursion (via ProcessEvent default case)
- if ( s_inOnIdle )
- return;
+void wxApp::OnEndSession(wxCloseEvent& WXUNUSED(event))
+{
+ // Windows will terminate the process soon after we return from
+ // WM_ENDSESSION handler or when we delete our last window, so make sure we
+ // at least execute our cleanup code before
- s_inOnIdle = TRUE;
+ // prevent the window from being destroyed when the corresponding wxTLW is
+ // destroyed: this will result in a leak of a HWND, of course, but who
+ // cares when the process is being killed anyhow
+ if ( !wxTopLevelWindows.empty() )
+ wxTopLevelWindows[0]->SetHWND(0);
- // 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();
+ const int rc = OnExit();
- // 'Garbage' collection of windows deleted with Close().
- DeletePendingObjects();
+ wxEntryCleanup();
-#if wxUSE_LOG
- // flush the logged messages if any
- wxLog::FlushActive();
-#endif // wxUSE_LOG
-
- // Send OnIdle events to all windows
- if ( SendIdleEvents() )
- {
- // SendIdleEvents() returns TRUE if at least one window requested more
- // idle events
- event.RequestMore(TRUE);
- }
-
- s_inOnIdle = FALSE;
+ // calling exit() instead of ExitProcess() or not doing anything at all and
+ // being killed by Windows has the advantage of executing the dtors of
+ // global objects
+ exit(rc);
}
-// Send idle event to all top-level windows
-bool wxApp::SendIdleEvents()
+// Default behaviour: close the application with prompts. The
+// user can veto the close, and therefore the end session.
+void wxApp::OnQueryEndSession(wxCloseEvent& event)
{
- bool needMore = FALSE;
-
- wxWindowList::Node* node = wxTopLevelWindows.GetFirst();
- while (node)
+ if (GetTopWindow())
{
- wxWindow* win = node->GetData();
- if (SendIdleEvents(win))
- needMore = TRUE;
- node = node->GetNext();
+ if (!GetTopWindow()->Close(!event.CanVeto()))
+ event.Veto(true);
}
-
- 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);
+// ----------------------------------------------------------------------------
+// system DLL versions
+// ----------------------------------------------------------------------------
- if (event.MoreRequested())
- needMore = TRUE;
+// these functions have trivial inline implementations for CE
+#ifndef __WXWINCE__
- wxNode* node = win->GetChildren().First();
- while (node)
- {
- wxWindow* win = (wxWindow*) node->Data();
- if (SendIdleEvents(win))
- needMore = TRUE;
+#if wxUSE_DYNLIB_CLASS
- node = node->Next();
- }
- return needMore;
-}
+namespace
+{
-void wxApp::DeletePendingObjects()
+// helper function: retrieve the DLL version by using DllGetVersion(), returns
+// 0 if the DLL doesn't export such function
+int CallDllGetVersion(wxDynamicLibrary& dll)
{
- wxNode *node = wxPendingDelete.First();
- while (node)
- {
- wxObject *obj = (wxObject *)node->Data();
+ // now check if the function is available during run-time
+ wxDYNLIB_FUNCTION( DLLGETVERSIONPROC, DllGetVersion, dll );
+ if ( !pfnDllGetVersion )
+ return 0;
- delete obj;
+ DLLVERSIONINFO dvi;
+ dvi.cbSize = sizeof(dvi);
- if (wxPendingDelete.Member(obj))
- delete node;
+ HRESULT hr = (*pfnDllGetVersion)(&dvi);
+ if ( FAILED(hr) )
+ {
+ wxLogApiError(_T("DllGetVersion"), hr);
- // Deleting one object may have deleted other pending
- // objects, so start from beginning of list again.
- node = wxPendingDelete.First();
+ return 0;
}
-}
-void wxApp::OnEndSession(wxCloseEvent& WXUNUSED(event))
-{
- if (GetTopWindow())
- GetTopWindow()->Close(TRUE);
+ return 100*dvi.dwMajorVersion + dvi.dwMinorVersion;
}
-// Default behaviour: close the application with prompts. The
-// user can veto the close, and therefore the end session.
-void wxApp::OnQueryEndSession(wxCloseEvent& event)
-{
- if (GetTopWindow())
- {
- if (!GetTopWindow()->Close(!event.CanVeto()))
- event.Veto(TRUE);
- }
-}
+} // anonymous namespace
/* static */
int wxApp::GetComCtl32Version()
{
-#ifdef __WXMICROWIN__
- 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;
+
+ // we don't want to load comctl32.dll, it should be already loaded but,
+ // depending on the OS version and the presence of the manifest, it can
+ // be either v5 or v6 and instead of trying to guess it just get the
+ // handle of the already loaded version
+ wxLoadedDLL dllComCtl32(_T("comctl32.dll"));
+ if ( !dllComCtl32.IsLoaded() )
+ {
+ s_verComCtl32 = 0;
+ return 0;
+ }
- // do we have it?
- HMODULE hModuleComCtl32 = ::GetModuleHandle(wxT("COMCTL32"));
+ // try DllGetVersion() for recent DLLs
+ s_verComCtl32 = CallDllGetVersion(dllComCtl32);
- // if so, then we can check for the version
- if ( hModuleComCtl32 )
+ // if DllGetVersion() is unavailable either during compile or
+ // run-time, try to guess the version otherwise
+ if ( !s_verComCtl32 )
{
- // try to use DllGetVersion() if available in _headers_
- #ifdef DLLVER_PLATFORM_WINDOWS // defined in shlwapi.h
- DLLGETVERSIONPROC pfnDllGetVersion = (DLLGETVERSIONPROC)
- ::GetProcAddress(hModuleComCtl32, "DllGetVersion");
- if ( pfnDllGetVersion )
+ // 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;
+ }
+ else // 4.70+
+ {
+ // many symbols appeared in comctl32 4.71, could use any of
+ // them except may be DllInstall()
+ pfn = dllComCtl32.GetSymbol(_T("InitializeFlatSB"));
+ if ( !pfn )
{
- DLLVERSIONINFO 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;
- }
+ // not found, must be 4.70
+ s_verComCtl32 = 470;
}
- #endif
- // DllGetVersion() unavailable either during compile or
- // run-time, try to guess the version otherwise
- if ( !s_verComCtl32 )
+ else
{
- // 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;
- }
- }
+ // found, must be 4.71 or later
+ s_verComCtl32 = 471;
}
+ }
}
}
return s_verComCtl32;
-#endif
}
-void wxExit()
+/* static */
+int wxApp::GetShell32Version()
{
- wxLogError(_("Fatal error: exiting"));
+ static int s_verShell32 = -1;
+ if ( s_verShell32 == -1 )
+ {
+ // we're prepared to handle the errors
+ wxLogNull noLog;
- wxApp::CleanUp();
- exit(0);
+ wxDynamicLibrary dllShell32(_T("shell32.dll"), wxDL_VERBATIM);
+ if ( dllShell32.IsLoaded() )
+ {
+ s_verShell32 = CallDllGetVersion(dllShell32);
+
+ if ( !s_verShell32 )
+ {
+ // there doesn't seem to be any way to distinguish between 4.00
+ // and 4.70 (starting from 4.71 we have DllGetVersion()) so
+ // just assume it is 4.0
+ s_verShell32 = 400;
+ }
+ }
+ else // failed load the DLL?
+ {
+ s_verShell32 = 0;
+ }
+ }
+
+ return s_verShell32;
}
-// Yield to incoming messages
+#else // !wxUSE_DYNLIB_CLASS
-static bool gs_inYield = FALSE;
+/* static */
+int wxApp::GetComCtl32Version()
+{
+ return 0;
+}
+
+/* static */
+int wxApp::GetShell32Version()
+{
+ return 0;
+}
+
+#endif // wxUSE_DYNLIB_CLASS/!wxUSE_DYNLIB_CLASS
-bool wxYield()
+#endif // !__WXWINCE__
+
+// ----------------------------------------------------------------------------
+// Yield to incoming messages
+// ----------------------------------------------------------------------------
+
+bool wxApp::Yield(bool onlyIfNeeded)
{
+ if ( m_isInsideYield )
+ {
+ if ( !onlyIfNeeded )
+ {
+ wxFAIL_MSG( wxT("wxYield called recursively" ) );
+ }
+
+ return false;
+ }
+
+ // set the flag and don't forget to reset it before returning
+ m_isInsideYield = true;
+ wxON_BLOCK_EXIT_SET(m_isInsideYield, 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();
-#ifdef __WXDEBUG__
- if (gs_inYield)
- wxFAIL_MSG( wxT("wxYield called recursively" ) );
-#endif
+ // ensure the logs will be flashed again when we exit
+ wxON_BLOCK_EXIT0(wxLog::Resume);
+#endif // wxUSE_LOG
- gs_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
+ wxEventLoopGuarantor dummyLoopIfNeeded;
MSG msg;
while ( PeekMessage(&msg, (HWND)0, 0, 0, PM_NOREMOVE) &&
msg.message != WM_QUIT )
wxMutexGuiLeaveOrEnter();
#endif // wxUSE_THREADS
- if ( !wxTheApp->DoMessage() )
+ if ( !wxTheApp->Dispatch() )
break;
}
- // If they are pending events, we must process them.
- if (wxTheApp)
- wxTheApp->ProcessPendingEvents();
-
- // let the logs be flashed again
- wxLog::Resume();
-
- gs_inYield = FALSE;
-
- return TRUE;
-}
-
-// Yield to incoming messages; but fail silently if recursion is detected.
-bool wxYieldIfNeeded()
-{
- if (gs_inYield)
- return FALSE;
-
- return wxYield();
-}
-
-bool wxHandleFatalExceptions(bool doit)
-{
-#if wxUSE_ON_FATAL_EXCEPTION
- // assume this can only be called from the main thread
- gs_handleExceptions = doit;
+ // if there are pending events, we must process them.
+ ProcessPendingEvents();
- return TRUE;
-#else
- wxFAIL_MSG(_T("set wxUSE_ON_FATAL_EXCEPTION to 1 to sue this function"));
-
- (void)doit;
- return FALSE;
-#endif
+ return true;
}
-//-----------------------------------------------------------------------------
-// wxWakeUpIdle
-//-----------------------------------------------------------------------------
+#if wxUSE_EXCEPTIONS
-void wxWakeUpIdle()
-{
- // 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 )
- {
- if ( !::PostMessage(GetHwndOf(topWindow), WM_NULL, 0, 0) )
- {
- // should never happen
- wxLogLastError(wxT("PostMessage(WM_NULL)"));
- }
- }
-}
-
-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+// exception handling
+// ----------------------------------------------------------------------------
-wxIcon
-wxApp::GetStdIcon(int which) const
+bool wxApp::OnExceptionInMainLoop()
{
- switch(which)
+ // 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 wxICON_INFORMATION:
- return wxIcon("wxICON_INFO");
-
- case wxICON_QUESTION:
- return wxIcon("wxICON_QUESTION");
-
- case wxICON_EXCLAMATION:
- return wxIcon("wxICON_WARNING");
+ case IDABORT:
+ throw;
default:
- wxFAIL_MSG(wxT("requested non existent standard icon"));
- // still fall through
+ wxFAIL_MSG( _T("unexpected MessageBox() return code") );
+ // fall through
+
+ case IDRETRY:
+ return false;
- case wxICON_HAND:
- return wxIcon("wxICON_ERROR");
+ case IDIGNORE:
+ 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__) && !defined(WXMAKINGDLL))
-#include "main.cpp"
-#endif
+#endif // wxUSE_EXCEPTIONS
projects / wxWidgets.git / blobdiff