// Created: 04/01/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
-// Licence: wxWindows license
+// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
+// ===========================================================================
+// declarations
+// ===========================================================================
+
+// ---------------------------------------------------------------------------
+// headers
+// ---------------------------------------------------------------------------
+
#ifdef __GNUG__
-#pragma implementation "app.h"
+ #pragma implementation "app.h"
#endif
// For compilers that support precompilation, includes "wx.h".
-#define IN_WX_MAIN_CPP
#include "wx/wxprec.h"
#if defined(__BORLANDC__)
-#pragma hdrstop
+ #pragma hdrstop
#endif
#ifndef WX_PRECOMP
-#include "wx/frame.h"
-#include "wx/app.h"
-#include "wx/utils.h"
-#include "wx/gdicmn.h"
-#include "wx/pen.h"
-#include "wx/brush.h"
-#include "wx/cursor.h"
-#include "wx/icon.h"
-#include "wx/palette.h"
-#include "wx/dc.h"
-#include "wx/dialog.h"
-#include "wx/msgdlg.h"
+ #include "wx/frame.h"
+ #include "wx/app.h"
+ #include "wx/utils.h"
+ #include "wx/gdicmn.h"
+ #include "wx/pen.h"
+ #include "wx/brush.h"
+ #include "wx/cursor.h"
+ #include "wx/icon.h"
+ #include "wx/palette.h"
+ #include "wx/dc.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"
#endif
-#include "wx/msw/private.h"
-#include "wx/postscrp.h"
#include "wx/log.h"
#include "wx/module.h"
-#if USE_WX_RESOURCES
-#include "wx/resource.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
+#if wxUSE_TOOLTIPS
+ #include "wx/tooltip.h"
+#endif // wxUSE_TOOLTIPS
+
+// 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__)
+ #undef wxUSE_OLE
+
+ #define wxUSE_OLE 0
+#endif // broken compilers
+
+#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
-#if defined(__WIN95__) && !defined(__GNUWIN32__)
-#include <commctrl.h>
+#ifndef __WXMICROWIN__
+#include "wx/msw/msvcrt.h"
#endif
-extern char *wxBuffer;
-extern char *wxOsVersion;
+// ----------------------------------------------------------------------------
+// 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( 1, 0 ) )
+ #include <shlwapi.h>
+#endif
+
+// ---------------------------------------------------------------------------
+// global variables
+// ---------------------------------------------------------------------------
+
+extern wxChar *wxBuffer;
extern wxList *wxWinHandleList;
-extern wxList wxPendingDelete;
+extern wxList WXDLLEXPORT wxPendingDelete;
+#ifndef __WXMICROWIN__
extern void wxSetKeyboardHook(bool doIt);
-extern wxCursor *g_globalCursor;
+#endif
-HINSTANCE wxhInstance = 0;
-static MSG s_currentMsg;
+MSG s_currentMsg;
wxApp *wxTheApp = NULL;
-char wxFrameClassName[] = "wxFrameClass";
-char wxMDIFrameClassName[] = "wxMDIFrameClass";
-char wxMDIChildFrameClassName[] = "wxMDIChildFrameClass";
-char wxPanelClassName[] = "wxPanelClass";
-char wxCanvasClassName[] = "wxCanvasClass";
-
-HICON wxSTD_FRAME_ICON = NULL;
-HICON wxSTD_MDICHILDFRAME_ICON = NULL;
-HICON wxSTD_MDIPARENTFRAME_ICON = NULL;
-
-HICON wxDEFAULT_FRAME_ICON = NULL;
-HICON wxDEFAULT_MDICHILDFRAME_ICON = NULL;
-HICON wxDEFAULT_MDIPARENTFRAME_ICON = NULL;
+// 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");
+
+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;
+
+HBRUSH wxDisableButtonBrush = (HBRUSH) 0;
+
+LRESULT WXDLLEXPORT APIENTRY wxWndProc(HWND, UINT, WPARAM, LPARAM);
+
+// 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
-HBRUSH wxDisableButtonBrush = 0;
+// ===========================================================================
+// implementation
+// ===========================================================================
-LRESULT APIENTRY wxWndProc(HWND, UINT, WPARAM, LPARAM);
+// ---------------------------------------------------------------------------
+// wxApp
+// ---------------------------------------------------------------------------
-#if !USE_SHARED_LIBRARY
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()
-#endif
-long wxApp::sm_lastMessageTime = 0;
+//// Initialize
+bool wxApp::Initialize()
+{
+ // 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 )
+ {
+ // 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;
+ }
+#endif // wxUSE_UNICODE
-#ifdef __WIN95__
-static HINSTANCE gs_hRichEdit = NULL;
+ // Some people may wish to use this, but
+ // probably it shouldn't be here by default.
+#ifdef __WXDEBUG__
+ // wxRedirectIOToConsole();
#endif
-bool wxApp::Initialize(WXHINSTANCE instance)
-{
- HINSTANCE hInstance = (HINSTANCE) instance;
-
- CommonInit();
+ wxBuffer = new wxChar[1500]; // FIXME
-#if defined(__WIN95__)
- InitCommonControls();
- gs_hRichEdit = LoadLibrary("RICHED32.DLL");
+ wxClassInfo::InitializeClasses();
- if (gs_hRichEdit == NULL)
- {
- wxMessageBox("Could not initialise Rich Edit DLL");
- }
+#if wxUSE_THREADS
+ wxPendingEventsLocker = new wxCriticalSection;
#endif
-#if defined(WX_DRAG_DROP)
- // we need to initialize OLE library
- if ( FAILED(::OleInitialize(NULL)) )
- wxFatalError(_("Cannot initialize OLE"));
-#endif
+ wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING);
+ wxTheColourDatabase->Initialize();
-#if CTL3D
- if (!Ctl3dRegister(hInstance))
- wxFatalError("Cannot register CTL3D");
+ wxInitializeStockLists();
+ wxInitializeStockObjects();
- Ctl3dAutoSubclass(hInstance);
+#if wxUSE_WX_RESOURCES
+ wxInitializeResourceSystem();
#endif
- wxSTD_FRAME_ICON = LoadIcon(hInstance, "wxSTD_FRAME");
- wxSTD_MDIPARENTFRAME_ICON = LoadIcon(hInstance, "wxSTD_MDIPARENTFRAME");
- wxSTD_MDICHILDFRAME_ICON = LoadIcon(hInstance, "wxSTD_MDICHILDFRAME");
+ wxBitmap::InitStandardHandlers();
+
+#if defined(__WIN95__) && !defined(__WXMICROWIN__)
+ InitCommonControls();
+#endif // __WIN95__
+
+#if wxUSE_OLE || wxUSE_DRAG_AND_DROP
+
+#ifdef __WIN16__
+ // for OLE, enlarge message queue to be as large as possible
+ int iMsg = 96;
+ while (!SetMessageQueue(iMsg) && (iMsg -= 8))
+ ;
+#endif // Win16
+
+ // we need to initialize OLE library
+ if ( FAILED(::OleInitialize(NULL)) )
+ wxLogError(_("Cannot initialize OLE"));
+
+#endif // wxUSE_OLE
+
+#if wxUSE_CTL3D
+ if (!Ctl3dRegister(wxhInstance))
+ wxLogError(wxT("Cannot register CTL3D"));
+
+ Ctl3dAutoSubclass(wxhInstance);
+#endif // wxUSE_CTL3D
+
+ // 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"));
- wxDEFAULT_FRAME_ICON = LoadIcon(hInstance, "wxDEFAULT_FRAME");
- wxDEFAULT_MDIPARENTFRAME_ICON = LoadIcon(hInstance, "wxDEFAULT_MDIPARENTFRAME");
- wxDEFAULT_MDICHILDFRAME_ICON = LoadIcon(hInstance, "wxDEFAULT_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 // 0
- RegisterWindowClasses();
+ RegisterWindowClasses();
- // Create the brush for disabling bitmap buttons
+#ifndef __WXMICROWIN__
+ // Create the brush for disabling bitmap buttons
- LOGBRUSH lb ;
- lb.lbStyle = BS_PATTERN;
- lb.lbHatch = (int)LoadBitmap( hInstance, "wxDISABLE_BUTTON_BITMAP" ) ;
- wxDisableButtonBrush = ::CreateBrushIndirect( & lb ) ;
- ::DeleteObject( (HGDIOBJ)lb.lbHatch ) ;
+ LOGBRUSH lb;
+ lb.lbStyle = BS_PATTERN;
+ lb.lbHatch = (int)LoadBitmap( wxhInstance, wxT("wxDISABLE_BUTTON_BITMAP") );
+ if ( lb.lbHatch )
+ {
+ wxDisableButtonBrush = ::CreateBrushIndirect( & lb );
+ ::DeleteObject( (HGDIOBJ)lb.lbHatch );
+ }
+ //else: wxWindows resources are probably not linked in
+#endif
-#if USE_PENWINDOWS
- wxRegisterPenWin();
+#if wxUSE_PENWINDOWS
+ wxRegisterPenWin();
#endif
- wxWinHandleList = new wxList(wxKEY_INTEGER);
+ wxWinHandleList = new wxList(wxKEY_INTEGER);
- // This is to foil optimizations in Visual C++ that
- // throw out dummy.obj.
-#if (_MSC_VER >= 800) && !defined(WXMAKINGDLL)
- extern char wxDummyChar;
- if (wxDummyChar) wxDummyChar++;
+ // 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
- wxSetKeyboardHook(TRUE);
- wxModule::RegisterModules();
- if (!wxModule::InitializeModules())
- return FALSE;
- return TRUE;
+#ifndef __WXMICROWIN__
+ wxSetKeyboardHook(TRUE);
+#endif
+
+ wxModule::RegisterModules();
+ if (!wxModule::InitializeModules())
+ return FALSE;
+ return TRUE;
}
+// ---------------------------------------------------------------------------
+// RegisterWindowClasses
+// ---------------------------------------------------------------------------
+
+// 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()
{
-///////////////////////////////////////////////////////////////////////
-// Register the frame window class.
- WNDCLASS wndclass; // Structure used to register Windows class.
-
- wndclass.style = CS_HREDRAW | CS_VREDRAW;
- wndclass.lpfnWndProc = (WNDPROC)wxWndProc;
- wndclass.cbClsExtra = 0;
- wndclass.cbWndExtra = sizeof( DWORD ); // was 4
- wndclass.hInstance = wxhInstance;
- wndclass.hIcon = NULL; // wxSTD_FRAME_ICON;
- wndclass.hCursor = LoadCursor( NULL, IDC_ARROW );
- wndclass.hbrBackground = (HBRUSH)(COLOR_APPWORKSPACE+1) ;
-// wndclass.hbrBackground = GetStockObject( WHITE_BRUSH );
- wndclass.lpszMenuName = NULL;
-#ifdef _MULTIPLE_INSTANCES
- sprintf( wxFrameClassName,"wxFrameClass%d", hInstance );
-#endif
- wndclass.lpszClassName = wxFrameClassName;
-
- if (!RegisterClass( &wndclass ))
- {
- // wxFatalError("Can't register Frame Window class");
- }
-
-///////////////////////////////////////////////////////////////////////
-// Register the MDI frame window class.
- WNDCLASS wndclass1; // Structure used to register Windows class.
-
- wndclass1.style = CS_HREDRAW | CS_VREDRAW;
- wndclass1.lpfnWndProc = (WNDPROC)wxWndProc;
- wndclass1.cbClsExtra = 0;
- wndclass1.cbWndExtra = sizeof( DWORD ); // was 4
- wndclass1.hInstance = wxhInstance;
- wndclass1.hIcon = NULL; // wxSTD_MDIPARENTFRAME_ICON;
- wndclass1.hCursor = LoadCursor( NULL, IDC_ARROW );
-// wndclass1.hbrBackground = (HBRUSH)(COLOR_APPWORKSPACE+1) ;
- wndclass1.hbrBackground = NULL;
- wndclass1.lpszMenuName = NULL;
-
- wndclass1.lpszClassName = wxMDIFrameClassName;
- if (!RegisterClass( &wndclass1 ))
- {
-// wxFatalError("Can't register MDI Frame window class");
-// return FALSE;
- }
-
-///////////////////////////////////////////////////////////////////////
-// Register the MDI child frame window class.
- WNDCLASS wndclass4; // Structure used to register Windows class.
-
- wndclass4.style = CS_HREDRAW | CS_VREDRAW;
- wndclass4.lpfnWndProc = (WNDPROC)wxWndProc;
- wndclass4.cbClsExtra = 0;
- wndclass4.cbWndExtra = sizeof( DWORD ); // was 4
- wndclass4.hInstance = wxhInstance;
- wndclass4.hIcon = NULL; // wxSTD_MDICHILDFRAME_ICON;
- wndclass4.hCursor = LoadCursor( NULL, IDC_ARROW );
- // TODO: perhaps this should be NULL so that Windows doesn't
- // paint the background itself (would OnEraseBackground duplicate
- // this?)
- wndclass4.hbrBackground = (HBRUSH)(COLOR_WINDOW+1) ;
-// wndclass4.hbrBackground = NULL;
- wndclass4.lpszMenuName = NULL;
- wndclass4.lpszClassName = wxMDIChildFrameClassName;
-
- if (!RegisterClass( &wndclass4 ))
- {
-// wxFatalError("Can't register MDI child frame window class");
-// return FALSE;
- }
-
-///////////////////////////////////////////////////////////////////////
-// Register the panel window class.
- WNDCLASS wndclass2; // Structure used to register Windows class.
- memset(&wndclass2, 0, sizeof(WNDCLASS)); // start with NULL defaults
- // Use CS_OWNDC to avoid messing about restoring the context
- // for every graphic operation.
- wndclass2.style = CS_HREDRAW | CS_VREDRAW;
- wndclass2.lpfnWndProc = (WNDPROC)wxWndProc;
- wndclass2.cbClsExtra = 0;
- wndclass2.cbWndExtra = sizeof( DWORD ); // was 4
- wndclass2.hInstance = wxhInstance;
- wndclass2.hIcon = NULL;
- wndclass2.hCursor = NULL;
-// wndclass2.hbrBackground = (HBRUSH)(COLOR_BTNFACE+1) ;
- wndclass2.hbrBackground = (HBRUSH) GetStockObject( LTGRAY_BRUSH );
- wndclass2.lpszMenuName = NULL;
- wndclass2.lpszClassName = wxPanelClassName;
- if (!RegisterClass( &wndclass2 ))
- {
-// wxFatalError("Can't register Panel Window class");
-// return FALSE;
- }
-
-///////////////////////////////////////////////////////////////////////
-// Register the canvas and textsubwindow class name
- WNDCLASS wndclass3; // Structure used to register Windows class.
- memset(&wndclass3, 0, sizeof(WNDCLASS)); // start with NULL defaults
- // Use CS_OWNDC to avoid messing about restoring the context
- // for every graphic operation.
-// wndclass3.style = CS_HREDRAW | CS_VREDRAW | CS_OWNDC | CS_DBLCLKS ;
- // wxWin 2.0
- wndclass3.style = CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS ;
- wndclass3.lpfnWndProc = (WNDPROC)wxWndProc;
- wndclass3.cbClsExtra = 0;
- wndclass3.cbWndExtra = sizeof( DWORD ); // was 4
- wndclass3.hInstance = wxhInstance;
- wndclass3.hIcon = NULL;
- wndclass3.hCursor = NULL;
-// wndclass3.hbrBackground = (HBRUSH)(COLOR_WINDOW+1) ;
- wndclass3.hbrBackground = NULL;
- wndclass3.lpszMenuName = NULL;
- wndclass3.lpszClassName = wxCanvasClassName;
- if (!RegisterClass( &wndclass3))
- {
-// wxFatalError("Can't register Canvas class");
-// return FALSE;
- }
-
- return TRUE;
-}
-
-// Cleans up any wxWindows internal structures left lying around
-void wxApp::CleanUp()
-{
- wxModule::CleanUpModules();
+ 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;
+
+ // Register the frame window class.
+ wndclass.hbrBackground = (HBRUSH)(COLOR_APPWORKSPACE + 1);
+ wndclass.lpszClassName = wxFrameClassName;
+ wndclass.style = styleNormal;
+
+ if ( !RegisterClass(&wndclass) )
+ {
+ wxLogLastError(wxT("RegisterClass(frame)"));
- CommonCleanUp();
+ return FALSE;
+ }
- wxSetKeyboardHook(FALSE);
+ // "no redraw" frame
+ wndclass.lpszClassName = wxFrameClassNameNoRedraw;
+ wndclass.style = styleNoRedraw;
-#ifdef __WIN95__
- if (gs_hRichEdit != NULL)
- FreeLibrary(gs_hRichEdit);
-#endif
+ if ( !RegisterClass(&wndclass) )
+ {
+ wxLogLastError(wxT("RegisterClass(no redraw frame)"));
-#if USE_PENWINDOWS
- wxCleanUpPenWin();
-#endif
+ return FALSE;
+ }
- if (wxSTD_FRAME_ICON)
- DestroyIcon(wxSTD_FRAME_ICON);
- if (wxSTD_MDICHILDFRAME_ICON)
- DestroyIcon(wxSTD_MDICHILDFRAME_ICON);
- if (wxSTD_MDIPARENTFRAME_ICON)
- DestroyIcon(wxSTD_MDIPARENTFRAME_ICON);
+ // Register the MDI frame window class.
+ wndclass.hbrBackground = (HBRUSH)NULL; // paint MDI frame ourselves
+ wndclass.lpszClassName = wxMDIFrameClassName;
+ wndclass.style = styleNormal;
- 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 ( !RegisterClass(&wndclass) )
+ {
+ wxLogLastError(wxT("RegisterClass(MDI parent)"));
- if ( wxDisableButtonBrush )
- ::DeleteObject( wxDisableButtonBrush ) ;
+ return FALSE;
+ }
-#if defined(WX_DRAG_DROP)
- ::OleUninitialize();
-#endif
+ // "no redraw" MDI frame
+ wndclass.lpszClassName = wxMDIFrameClassNameNoRedraw;
+ wndclass.style = styleNoRedraw;
-#if CTL3D
- Ctl3dUnregister(wxhInstance);
-#endif
+ if ( !RegisterClass(&wndclass) )
+ {
+ wxLogLastError(wxT("RegisterClass(no redraw MDI parent frame)"));
+
+ return FALSE;
+ }
+
+ // 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)"));
+
+ return FALSE;
+ }
+
+ // "no redraw" MDI child frame
+ wndclass.lpszClassName = wxMDIChildFrameClassNameNoRedraw;
+ wndclass.style = styleNoRedraw;
+
+ if ( !RegisterClass(&wndclass) )
+ {
+ wxLogLastError(wxT("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(wxT("RegisterClass(panel)"));
+
+ return FALSE;
+ }
+
+ // Register the no redraw panel window class.
+ wndclass.lpszClassName = wxPanelClassNameNR;
+ wndclass.style = styleNoRedraw;
+
+ if ( !RegisterClass(&wndclass) )
+ {
+ wxLogLastError(wxT("RegisterClass(no redraw panel)"));
+
+ return FALSE;
+ }
+
+ // Register the canvas and textsubwindow class name
+ wndclass.hbrBackground = (HBRUSH)NULL;
+ wndclass.lpszClassName = wxCanvasClassName;
+
+ if ( !RegisterClass(&wndclass) )
+ {
+ wxLogLastError(wxT("RegisterClass(canvas)"));
+
+ return FALSE;
+ }
+
+ wndclass.lpszClassName = wxCanvasClassNameNR;
+ wndclass.style = styleNoRedraw;
+ if ( !RegisterClass(&wndclass) )
+ {
+ wxLogLastError(wxT("RegisterClass(no redraw canvas)"));
- if (wxWinHandleList)
- delete wxWinHandleList ;
+ return FALSE;
+ }
- // do it as the very last thing because everything else can log messages
- delete wxLog::SetActiveTarget(NULL);
+ return TRUE;
}
-void wxApp::CommonInit()
-{
-#ifdef __WXMSW__
- wxBuffer = new char[1500];
-#else
- wxBuffer = new char[BUFSIZ + 512];
-#endif
+// ---------------------------------------------------------------------------
+// Convert Windows to argc, argv style
+// ---------------------------------------------------------------------------
- wxClassInfo::InitializeClasses();
+void wxApp::ConvertToStandardCommandArgs(char* lpCmdLine)
+{
+ wxStringList args;
-#if USE_RESOURCES
- wxGetResource("wxWindows", "OsVersion", &wxOsVersion);
-#endif
+ wxString cmdLine(lpCmdLine);
+ int count = 0;
- wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING);
- wxTheColourDatabase->Initialize();
+ // Get application name
+ wxChar name[260]; // 260 is MAX_PATH value from windef.h
+ ::GetModuleFileName(wxhInstance, name, WXSIZEOF(name));
- wxInitializeStockLists();
- wxInitializeStockObjects();
+ args.Add(name);
+ count++;
-#if USE_WX_RESOURCES
- wxInitializeResourceSystem();
-#endif
+ wxStrcpy(name, wxFileNameFromPath(name));
+ wxStripExtension(name);
+ wxTheApp->SetAppName(name);
- // For PostScript printing
-#if USE_POSTSCRIPT
- wxInitializePrintSetupData();
- wxThePrintPaperDatabase = new wxPrintPaperDatabase;
- wxThePrintPaperDatabase->CreateDatabase();
-#endif
+ // Break up string
+ // Treat strings enclosed in double-quotes as single arguments
+ int i = 0;
+ int len = cmdLine.Length();
+ while (i < len)
+ {
+ // Skip whitespace
+ while ((i < len) && wxIsspace(cmdLine.GetChar(i)))
+ i ++;
- wxBitmap::InitStandardHandlers();
+ 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)));
+
+ args.Add(arg);
+ count ++;
+
+ if (i < len)
+ i ++; // Skip past 2nd quote
+ }
+ else // Unquoted argument
+ {
+ int first = i;
+ while ((i < len) && !wxIsspace(cmdLine.GetChar(i)))
+ i ++;
+
+ wxString arg(cmdLine.Mid(first, (i - first)));
+
+ args.Add(arg);
+ count ++;
+ }
+ }
+ }
- g_globalCursor = new wxCursor;
+ 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;
}
-void wxApp::CommonCleanUp()
+//// Cleans up any wxWindows internal structures left lying around
+
+void wxApp::CleanUp()
{
-#if USE_WX_RESOURCES
- wxCleanUpResourceSystem();
+ //// 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
+
+ wxDeleteStockObjects();
+
+ // Destroy all GDI lists, etc.
+ wxDeleteStockLists();
+
+ delete wxTheColourDatabase;
+ wxTheColourDatabase = NULL;
+
+ wxBitmap::CleanUpHandlers();
+
+ delete[] wxBuffer;
+ wxBuffer = NULL;
+
+ //// WINDOWS-SPECIFIC CLEANUP
-// wxDefaultResourceTable->ClearTable();
+#ifndef __WXMICROWIN__
+ wxSetKeyboardHook(FALSE);
#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;
- wxDeleteStockObjects() ;
+#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
+ ::OleUninitialize();
+#endif
+
+#if wxUSE_CTL3D
+ Ctl3dUnregister(wxhInstance);
+#endif
- // Destroy all GDI lists, etc.
- delete wxTheBrushList;
- wxTheBrushList = NULL;
+ if (wxWinHandleList)
+ delete wxWinHandleList;
- delete wxThePenList;
- wxThePenList = NULL;
+ // 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;
- delete wxTheFontList;
- wxTheFontList = NULL;
+#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
- delete wxTheBitmapList;
- wxTheBitmapList = NULL;
+ wxClassInfo::CleanUpClasses();
- delete wxTheColourDatabase;
- wxTheColourDatabase = NULL;
+ delete wxTheApp;
+ wxTheApp = NULL;
-#if USE_POSTSCRIPT
- wxInitializePrintSetupData(FALSE);
- delete wxThePrintPaperDatabase;
- wxThePrintPaperDatabase = 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)
+ {
+ wxLogMessage(wxT("There were memory leaks."));
+ wxDebugContext::Dump();
+ wxDebugContext::PrintStatistics();
+ }
+ // wxDebugContext::SetStream(NULL, NULL);
#endif
- wxBitmap::CleanUpHandlers();
+#if wxUSE_LOG
+ // do it as the very last thing because everything else can log messages
+ delete wxLog::SetActiveTarget(NULL);
+#endif // wxUSE_LOG
+}
+
+//----------------------------------------------------------------------
+// Entry point helpers, used by wxPython
+//----------------------------------------------------------------------
+
+int WXDLLEXPORT wxEntryStart( int WXUNUSED(argc), char** WXUNUSED(argv) )
+{
+ return wxApp::Initialize();
+}
+
+int WXDLLEXPORT wxEntryInitGui()
+{
+ return wxTheApp->OnInitGui();
+}
- delete[] wxBuffer;
- wxBuffer = NULL;
+void WXDLLEXPORT wxEntryCleanup()
+{
+ wxApp::CleanUp();
}
+
#if !defined(_WINDLL) || (defined(_WINDLL) && defined(WXMAKINGDLL))
-// Main wxWindows entry point
+// 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++
-int wxEntry(WXHINSTANCE hInstance, WXHINSTANCE WXUNUSED(hPrevInstance), char *m_lpCmdLine,
- int nCmdShow, bool enterLoop)
+//----------------------------------------------------------------------
+// Main wxWindows entry point
+//----------------------------------------------------------------------
+int wxEntry(WXHINSTANCE hInstance,
+ WXHINSTANCE WXUNUSED(hPrevInstance),
+ char *lpCmdLine,
+ int nCmdShow,
+ bool enterLoop)
{
- wxhInstance = (HINSTANCE) hInstance;
+ // 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
-#if (WXDEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT
+#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
-#if !defined(_WINDLL)
- streambuf* sBuf = new wxDebugStreamBuf;
-#else
- streambuf* sBuf = NULL;
+ // take everything into a try-except block to be able to call
+ // OnFatalException() if necessary
+#if wxUSE_ON_FATAL_EXCEPTION
+ __try {
#endif
- ostream* oStr = new ostream(sBuf) ;
- wxDebugContext::SetStream(oStr, sBuf);
+ 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.") );
+
+ wxTheApp = (wxApp*) (*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;
+ // 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
- if (!wxApp::Initialize((WXHINSTANCE) wxhInstance))
- return 0;
+ int retValue = 0;
+
+ // 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);
+
+ // init the app
+ retValue = wxEntryInitGui() && wxTheApp->OnInit() ? 0 : -1;
+
+ // restore the old flag value
+ wxTheApp->SetExitOnFrameDelete(exitOnLastFrameDelete);
+
+ 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()
+
+ 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);
+ }
+ }
- // 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)
- {
- if (!wxApp::GetInitializerFunction())
- {
- MessageBox(NULL, "No initializer - use IMPLEMENT_APP macro.", "wxWindows Error", MB_APPLMODAL | MB_ICONSTOP | MB_OK);
- return 0;
- }
-
- wxTheApp = (* wxApp::GetInitializerFunction()) ();
- }
-
- if (!wxTheApp) {
- MessageBox(NULL, "You have to define an instance of wxApp!", "wxWindows Error", MB_APPLMODAL | MB_ICONSTOP | MB_OK);
- return 0;
- }
-
- // Split command line into tokens, as in usual main(argc, argv)
- char **command = new char*[50];
-
- int count = 0;
- char *buf = new char[strlen(m_lpCmdLine) + 1];
-
- // Hangs around until end of app. in case
- // user carries pointers to the tokens
-
- /* Model independent strcpy */
- int i;
- for (i = 0; (buf[i] = m_lpCmdLine[i]) != 0; i++)
- {
- /* loop */;
- }
-
- // Get application name
- char name[200];
- ::GetModuleFileName(wxhInstance, name, 199);
-
- // Is it only 16-bit Borland that already copies the program name
- // to the first argv index?
-#if !defined(__GNUWIN32__)
-// #if ! (defined(__BORLANDC__) && !defined(__WIN32__))
- command[count++] = copystring(name);
-// #endif
-#endif
-
- strcpy(name, wxFileNameFromPath(name));
- wxStripExtension(name);
- wxTheApp->SetAppName(name);
-
- /* Break up string */
- // Treat strings enclosed in double-quotes as single arguments
- char* str = buf;
- while (*str)
- {
- while (*str && *str <= ' ') str++; // skip whitespace
- if (*str == '"')
- {
- str++;
- command[count++] = str;
- while (*str && *str != '"') str++;
- }
- else if (*str)
- {
- command[count++] = str;
- while (*str && *str > ' ') str++;
- }
- if (*str) *str++ = '\0';
- }
- command[count] = NULL; /* argv[] is NULL terminated list! */
-
- wxTheApp->argc = count;
- wxTheApp->argv = command;
- 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() ;
-
- if (!wxTheApp->OnInit())
- {
- wxTheApp->DeletePendingObjects();
wxTheApp->OnExit();
- wxApp::CleanUp();
-
- delete wxTheApp;
- wxTheApp = NULL;
-
- delete [] buf ;
-
- // TODO: This should really be cleaned up in ~wxApp
- delete [] command[0] ;
- delete [] command ;
- return 0;
- }
-
- if (!enterLoop)
- return 0;
-
- int retValue = 1;
-
-/* New behaviour - leave it to the app to show the top window
- if (wxTheApp->GetTopWindow()) {
- // show the toplevel frame, only if we are not iconized (from MS-Windows)
- if(wxTheApp->GetShowFrameOnInit() && (nCmdShow!=SW_HIDE)) wxTheApp->GetTopWindow()->Show(TRUE);
- }
-*/
-
- retValue = wxTheApp->OnRun();
-
- if (wxTheApp->GetTopWindow())
- {
- // Forcibly delete the window.
- if (wxTheApp->GetTopWindow()->IsKindOf(CLASSINFO(wxFrame)) ||
- wxTheApp->GetTopWindow()->IsKindOf(CLASSINFO(wxDialog)))
- {
- wxTheApp->GetTopWindow()->Close(TRUE);
- wxTheApp->DeletePendingObjects();
- }
- else
- {
- delete wxTheApp->GetTopWindow();
- wxTheApp->SetTopWindow(NULL);
- }
- }
-
- wxTheApp->OnExit();
- wxApp::CleanUp();
-
- delete wxTheApp;
- wxTheApp = NULL;
-
- delete [] buf ;
- delete [] command[0] ;
- delete [] command ;
-
-#if (WXDEBUG && USE_MEMORY_TRACING) || USE_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() > 0)
- {
- wxTrace("There were memory leaks.\n");
- wxDebugContext::Dump();
- wxDebugContext::PrintStatistics();
- }
- wxDebugContext::SetStream(NULL, NULL);
-#endif
-
- return retValue;
+
+ wxEntryCleanup();
+
+ return retValue;
+
+#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();
+ }
+
+ ::ExitProcess(3); // the same exit code as abort()
+
+ // NOTREACHED
+ }
+#endif // wxUSE_ON_FATAL_EXCEPTION
}
+// 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
+//----------------------------------------------------------------------
+
int wxEntry(WXHINSTANCE hInstance)
{
- wxhInstance = (HINSTANCE) hInstance;
- wxApp::Initialize((WXHINSTANCE) wxhInstance);
-
- // 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.
+ wxhInstance = (HINSTANCE) hInstance;
+ wxEntryStart(0, 0);
- if (!wxTheApp)
- {
- if (!wxApp::GetInitializerFunction())
- {
- MessageBox(NULL, "No initializer - use IMPLEMENT_APP macro.", "wxWindows Error", MB_APPLMODAL | MB_ICONSTOP | MB_OK);
- return 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)
+ {
+ wxCHECK_MSG( wxApp::GetInitializerFunction(), 0,
+ "No initializer - use IMPLEMENT_APP macro." );
- wxTheApp = (* wxApp::GetInitializerFunction()) ();
- }
+ wxTheApp = (* wxApp::GetInitializerFunction()) ();
+ }
- if (!wxTheApp) {
- MessageBox(NULL, "You have to define an instance of wxApp!", "wxWindows Error", MB_APPLMODAL | MB_ICONSTOP | MB_OK);
- return 0;
- }
+ wxCHECK_MSG( wxTheApp, 0, "You have to define an instance of wxApp!" );
- wxTheApp->argc = 0;
- wxTheApp->argv = NULL;
+ wxTheApp->argc = 0;
+ wxTheApp->argv = NULL;
- wxTheApp->OnInitGui();
+ wxEntryInitGui();
- wxTheApp->OnInit();
+ wxTheApp->OnInit();
- if (wxTheApp->GetTopWindow() && wxTheApp->GetTopWindow()->GetHWND()) {
- wxTheApp->GetTopWindow()->Show(TRUE);
- }
+ wxWindow *topWindow = wxTheApp->GetTopWindow();
+ if ( topWindow && topWindow->GetHWND())
+ {
+ topWindow->Show(TRUE);
+ }
- return 1;
+ return 1;
}
#endif // _WINDLL
-// Static member initialization
-wxAppInitializerFunction wxApp::m_appInitFn = (wxAppInitializerFunction) NULL;
+//// Static member initialization
+
+wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL;
wxApp::wxApp()
{
- m_topWindow = NULL;
- wxTheApp = this;
-// work_proc = NULL ;
- m_className = "";
-// m_resourceCollection = TRUE;
-// m_pendingCleanup = FALSE;
- m_wantDebugOutput = TRUE ;
- m_appName = "";
- argc = 0;
- argv = NULL;
-#ifdef __WXMSW__
- m_printMode = wxPRINT_WINDOWS;
-#else
- m_printMode = wxPRINT_POSTSCRIPT;
-#endif
- m_exitOnFrameDelete = TRUE;
- m_auto3D = TRUE;
+ argc = 0;
+ argv = NULL;
+ m_printMode = wxPRINT_WINDOWS;
+ m_auto3D = TRUE;
+}
+
+wxApp::~wxApp()
+{
+ // Delete command-line args
+ int i;
+ for (i = 0; i < argc; i++)
+ {
+ delete[] argv[i];
+ }
+ delete[] argv;
}
bool wxApp::Initialized()
{
#ifndef _WINDLL
- if (GetTopWindow())
+ if (GetTopWindow())
+ return TRUE;
+ else
+ return FALSE;
+#else // Assume initialized if DLL (no way of telling)
return TRUE;
- else
- return FALSE;
-#endif
-#ifdef _WINDLL // Assume initialized if DLL (no way of telling)
- return TRUE;
#endif
}
/*
* Get and process a message, returning FALSE if WM_QUIT
- * received.
+ * received (and also set the flag telling the app to exit the main loop)
*
*/
bool wxApp::DoMessage()
{
- if (!::GetMessage(&s_currentMsg, (HWND) NULL, 0, 0))
- {
- return FALSE;
- }
+ BOOL rc = ::GetMessage(&s_currentMsg, (HWND) NULL, 0, 0);
+ if ( rc == 0 )
+ {
+ // got WM_QUIT
+ m_keepGoing = FALSE;
+
+ return FALSE;
+ }
+ else if ( rc == -1 )
+ {
+ // should never happen, but let's test for it nevertheless
+ wxLogLastError(wxT("GetMessage"));
+ }
+ else
+ {
+#if wxUSE_THREADS
+ wxASSERT_MSG( wxThread::IsMain(),
+ wxT("only the main thread can process Windows messages") );
+
+ static bool s_hadGuiLock = TRUE;
+ static wxMsgArray s_aSavedMessages;
+
+ // if a secondary thread owns is doing GUI calls, save all messages for
+ // later processing - we can't process them right now because it will
+ // lead to recursive library calls (and we're not reentrant)
+ if ( !wxGuiOwnedByMainThread() )
+ {
+ s_hadGuiLock = FALSE;
+
+ // leave out WM_COMMAND messages: too dangerous, sometimes
+ // the message will be processed twice
+ if ( !wxIsWaitingForThread() ||
+ s_currentMsg.message != WM_COMMAND )
+ {
+ s_aSavedMessages.Add(s_currentMsg);
+ }
+
+ return TRUE;
+ }
+ else
+ {
+ // have we just regained the GUI lock? if so, post all of the saved
+ // messages
+ //
+ // FIXME of course, it's not _exactly_ the same as processing the
+ // messages normally - expect some things to break...
+ if ( !s_hadGuiLock )
+ {
+ s_hadGuiLock = TRUE;
+
+ size_t count = s_aSavedMessages.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();
+ }
+ }
+#endif // wxUSE_THREADS
+
+ // Process the message
+ DoMessage((WXMSG *)&s_currentMsg);
+ }
+
+ return TRUE;
+}
- // Process the message
- if (!ProcessMessage((WXMSG *)&s_currentMsg))
- {
- ::TranslateMessage(&s_currentMsg);
- wxApp::sm_lastMessageTime = s_currentMsg.time; /* MATTHEW: timeStamp impl. */
- ::DispatchMessage(&s_currentMsg);
- }
- return TRUE;
+void wxApp::DoMessage(WXMSG *pMsg)
+{
+ if ( !ProcessMessage(pMsg) )
+ {
+ ::TranslateMessage((MSG *)pMsg);
+ ::DispatchMessage((MSG *)pMsg);
+ }
}
/*
int wxApp::MainLoop()
{
- m_keepGoing = TRUE;
- while (m_keepGoing)
- {
- while (!::PeekMessage(&s_currentMsg, 0, 0, 0, PM_NOREMOVE) &&
- ProcessIdle()) {}
- if (!DoMessage())
- m_keepGoing = FALSE;
- }
+ m_keepGoing = TRUE;
+
+ while ( m_keepGoing )
+ {
+#if wxUSE_THREADS
+ wxMutexGuiLeaveOrEnter();
+#endif // wxUSE_THREADS
+
+ while ( !Pending() && ProcessIdle() )
+ ;
+
+ // a message came or no more idle processing to do
+ DoMessage();
+ }
- return s_currentMsg.wParam;
+ return s_currentMsg.wParam;
}
// Returns TRUE if more time is needed.
void wxApp::ExitMainLoop()
{
- m_keepGoing = FALSE;
+ // VZ: why not ::PostQuitMessage()?
+ m_keepGoing = FALSE;
}
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()
{
- if (!DoMessage())
- m_keepGoing = FALSE;
+ DoMessage();
}
/*
* the message. Some may have accelerator tables, or have
* MDI complications.
*/
-bool wxApp::ProcessMessage(WXMSG *Msg)
+
+bool wxApp::ProcessMessage(WXMSG *wxmsg)
{
- MSG *msg = (MSG *)Msg;
+ MSG *msg = (MSG *)wxmsg;
+ HWND hwnd = msg->hwnd;
+ wxWindow *wndThis = wxGetWindowFromHWND((WXHWND)hwnd);
+
+ // this may happen if the event occured in a standard modeless dialog (the
+ // only example of which I know of is the find/replace dialog) - then call
+ // IsDialogMessage() to make TAB navigation in it work
+ if ( !wndThis )
+ {
+ // we need to find the dialog containing this control as
+ // IsDialogMessage() just eats all the messages (i.e. returns TRUE for
+ // them) if we call it for the control itself
+ while ( ::GetWindowLong(hwnd, GWL_STYLE) & WS_CHILD )
+ {
+ hwnd = ::GetParent(hwnd);
+ }
- HWND hWnd;
+ return ::IsDialogMessage(hwnd, msg) != 0;
+ }
- // Try translations first; find the youngest window with
- // a translation table.
- for (hWnd = msg->hwnd; hWnd != NULL; hWnd = ::GetParent(hWnd))
- {
- wxWindow *wnd = wxFindWinFromHandle((WXHWND) hWnd);
- if (wnd)
+#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) )
{
- if (wnd->MSWTranslateMessage(Msg))
- return TRUE;
+ wxToolTip *tt = wndThis->GetToolTip();
+ if ( tt )
+ {
+ tt->RelayEvent(wxmsg);
+ }
}
- }
+#endif // wxUSE_TOOLTIPS
- // Anyone for a non-translation message? Try youngest descendants first.
- for (hWnd = msg->hwnd; hWnd != NULL; hWnd = ::GetParent(hWnd))
- {
- wxWindow *wnd = wxFindWinFromHandle((WXHWND) hWnd);
- if (wnd)
+ // 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) )
{
- if (wnd->MSWProcessMessage(Msg))
- return TRUE;
+ return FALSE;
}
- }
- return FALSE;
-}
-
-void wxApp::OnIdle(wxIdleEvent& event)
-{
- static bool inOnIdle = FALSE;
-
- // Avoid recursion (via ProcessEvent default case)
- if (inOnIdle)
- return;
- inOnIdle = TRUE;
+ // try translations first: the accelerators override everything
+ wxWindow *wnd;
- // 'Garbage' collection of windows deleted with Close().
- DeletePendingObjects();
+ for ( wnd = wndThis; wnd; wnd = wnd->GetParent() )
+ {
+ if ( wnd->MSWTranslateMessage(wxmsg))
+ return TRUE;
+
+ // stop at first top level window, i.e. don't try to process the key
+ // strokes originating in a dialog using the accelerators of the parent
+ // frame - this doesn't make much sense
+ if ( wnd->IsTopLevel() )
+ break;
+ }
- // flush the logged messages if any
- wxLog *pLog = wxLog::GetActiveTarget();
- if ( pLog != NULL && pLog->HasPendingMessages() )
- pLog->Flush();
+ // 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;
+ }
- // Send OnIdle events to all windows
- bool needMore = SendIdleEvents();
-// bool needMore = FALSE;
+ // no special preprocessing for this message, dispatch it normally
+ return FALSE;
+}
- if (needMore)
- event.RequestMore(TRUE);
+void wxApp::OnIdle(wxIdleEvent& event)
+{
+ static bool s_inOnIdle = FALSE;
+
+ // Avoid recursion (via ProcessEvent default case)
+ if ( s_inOnIdle )
+ return;
+
+ s_inOnIdle = TRUE;
+
+ // If there are pending events, we must process them: pending events
+ // are either events to the threads other than main or events posted
+ // with wxPostEvent() functions
+ // GRG: I have moved this here so that all pending events are processed
+ // before starting to delete any objects. This behaves better (in
+ // particular, wrt wxPostEvent) and is coherent with wxGTK's current
+ // behaviour. Changed Feb/2000 before 2.1.14
+ ProcessPendingEvents();
+
+ // 'Garbage' collection of windows deleted with Close().
+ DeletePendingObjects();
+
+#if wxUSE_LOG
+ // flush the logged messages if any
+ wxLog::FlushActive();
+#endif // wxUSE_LOG
+
+#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
+
+ // Send OnIdle events to all windows
+ if ( SendIdleEvents() )
+ {
+ // SendIdleEvents() returns TRUE if at least one window requested more
+ // idle events
+ event.RequestMore(TRUE);
+ }
- inOnIdle = FALSE;
+ s_inOnIdle = FALSE;
}
// Send idle event to all top-level windows
bool wxApp::SendIdleEvents()
{
bool needMore = FALSE;
- wxNode* node = wxTopLevelWindows.First();
- while (node)
- {
- wxWindow* win = (wxWindow*) node->Data();
- if (SendIdleEvents(win))
+
+ wxWindowList::Node* node = wxTopLevelWindows.GetFirst();
+ while (node)
+ {
+ wxWindow* win = node->GetData();
+ if (SendIdleEvents(win))
needMore = TRUE;
+ node = node->GetNext();
+ }
- node = node->Next();
- }
return needMore;
}
{
bool needMore = FALSE;
- wxIdleEvent event;
- event.SetEventObject(win);
- win->ProcessEvent(event);
+ 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))
+ wxNode* node = win->GetChildren().First();
+ while (node)
+ {
+ wxWindow* win = (wxWindow*) node->Data();
+ if (SendIdleEvents(win))
needMore = TRUE;
- node = node->Next();
- }
- return needMore ;
+ node = node->Next();
+ }
+ return needMore;
}
void wxApp::DeletePendingObjects()
{
- wxNode *node = wxPendingDelete.First();
- while (node)
- {
- wxObject *obj = (wxObject *)node->Data();
-
- delete obj;
-
- if (wxPendingDelete.Member(obj))
- delete node;
+ wxNode *node = wxPendingDelete.First();
+ while (node)
+ {
+ wxObject *obj = (wxObject *)node->Data();
- // Deleting one object may have deleted other pending
- // objects, so start from beginning of list again.
- node = wxPendingDelete.First();
- }
-}
+ delete obj;
-/*
-// Free up font objects that are not being used at present.
-bool wxApp::DoResourceCleanup()
-{
-// wxDebugMsg("ResourceCleanup\n");
+ if (wxPendingDelete.Member(obj))
+ delete node;
- if (wxTheFontList)
- {
- wxNode *node = wxTheFontList->First();
- while (node)
- {
- wxGDIObject *obj = (wxGDIObject *)node->Data();
- if ((obj->GetResourceHandle() != 0) && (obj->GetResourceUsage() == 0))
- {
-// wxDebugMsg("Freeing font %ld (GDI object %d)\n", (long)obj, (int)obj->GetResourceHandle());
- obj->FreeResource();
- }
- node = node->Next();
- }
- }
- if (wxThePenList)
- {
- wxNode *node = wxThePenList->First();
- while (node)
- {
- wxGDIObject *obj = (wxGDIObject *)node->Data();
- if ((obj->GetResourceHandle() != 0) && (obj->GetResourceUsage() == 0))
- {
-// wxDebugMsg("Freeing pen %ld (GDI object %d)\n", (long)obj, (int)obj->GetResourceHandle());
- obj->FreeResource();
- }
- node = node->Next();
- }
- }
- if (wxTheBrushList)
- {
- wxNode *node = wxTheBrushList->First();
- while (node)
- {
- wxGDIObject *obj = (wxGDIObject *)node->Data();
- if ((obj->GetResourceHandle() != 0) && (obj->GetResourceUsage() == 0))
- {
-// wxDebugMsg("Freeing brush %ld (GDI object %d)\n", (long)obj, (int)obj->GetResourceHandle());
- obj->FreeResource();
- }
- node = node->Next();
+ // Deleting one object may have deleted other pending
+ // objects, so start from beginning of list again.
+ node = wxPendingDelete.First();
}
- }
-
- SetPendingCleanup(FALSE);
- return FALSE;
}
-*/
-wxLog* wxApp::CreateLogTarget()
+void wxApp::OnEndSession(wxCloseEvent& WXUNUSED(event))
{
- return new wxLogGui;
+ if (GetTopWindow())
+ GetTopWindow()->Close(TRUE);
}
-wxWindow* wxApp::GetTopWindow() const
+// Default behaviour: close the application with prompts. The
+// user can veto the close, and therefore the end session.
+void wxApp::OnQueryEndSession(wxCloseEvent& event)
{
- if (m_topWindow)
- return m_topWindow;
- else if (wxTopLevelWindows.Number() > 0)
- return (wxWindow*) wxTopLevelWindows.First()->Data();
- else
- return NULL;
+ if (GetTopWindow())
+ {
+ if (!GetTopWindow()->Close(!event.CanVeto()))
+ event.Veto(TRUE);
+ }
}
-int wxApp::GetComCtl32Version() const
+/* static */
+int wxApp::GetComCtl32Version()
{
- // have we loaded COMCTL32 yet?
- HMODULE theModule = ::GetModuleHandle("COMCTL32");
- int version = 0;
+#ifdef __WXMICROWIN__
+ 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"));
+
+ // if so, then we can check for the version
+ 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)
- {
- // not found, must be 4.70
- version = 470;
- }
- else
- { // found, must be 4.71
- version = 471;
- }
+ // try to use DllGetVersion() if available in _headers_
+ #ifdef DLLVER_PLATFORM_WINDOWS // defined in shlwapi.h
+ DLLGETVERSIONPROC pfnDllGetVersion = (DLLGETVERSIONPROC)
+ ::GetProcAddress(hModuleComCtl32, "DllGetVersion");
+ if ( pfnDllGetVersion )
+ {
+ 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;
+ }
+ }
+ #endif
+ // 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;
+ }
+ }
+ }
}
}
- return version;
+
+ return s_verComCtl32;
+#endif
}
void wxExit()
{
- wxApp::CleanUp();
- FatalAppExit(0, "Fatal error: exiting");
+ wxLogError(_("Fatal error: exiting"));
+
+ wxApp::CleanUp();
+ exit(0);
}
// Yield to incoming messages
+
+static bool gs_inYield = FALSE;
+
bool wxYield()
{
- MSG msg;
- // We want to go back to the main message loop
- // if we see a WM_QUIT. (?)
- while (PeekMessage(&msg, NULL, 0, 0, PM_NOREMOVE) && msg.message != WM_QUIT)
- {
- if (!wxTheApp->DoMessage())
- break;
- }
+ // disable log flushing from here because a call to wxYield() shouldn't
+ // normally result in message boxes popping up &c
+ wxLog::Suspend();
- return TRUE;
+#ifdef __WXDEBUG__
+ if (gs_inYield)
+ wxFAIL_MSG( wxT("wxYield called recursively" ) );
+#endif
+
+ 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
+ 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.
+ if (wxTheApp)
+ wxTheApp->ProcessPendingEvents();
+
+ // let the logs be flashed again
+ wxLog::Resume();
+
+ gs_inYield = FALSE;
+
+ return TRUE;
}
-HINSTANCE wxGetInstance()
+// Yield to incoming messages; but fail silently if recursion is detected.
+bool wxYieldIfNeeded()
{
- return wxhInstance;
+ 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;
+
+ return TRUE;
+#else
+ wxFAIL_MSG(_T("set wxUSE_ON_FATAL_EXCEPTION to 1 to sue this function"));
+
+ (void)doit;
+ return FALSE;
+#endif
+}
+
+//-----------------------------------------------------------------------------
+// wxWakeUpIdle
+//-----------------------------------------------------------------------------
+
+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)"));
+ }
+ }
+}
+
+//-----------------------------------------------------------------------------
+
+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");
+ }
}
// 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(_MSC_VER) && !defined(__WIN32__)) || defined(__GNUWIN32__)
+#if (defined(__VISUALC__) && !defined(__WIN32__)) || (defined(__GNUWIN32__) && !defined(__TWIN32__) && !defined(WXMAKINGDLL))
#include "main.cpp"
#endif
-
-#undef IN_WX_MAIN_CPP
-
projects / wxWidgets.git / blobdiff