wxHashTable *wxWidgetHashTable = NULL;
wxHashTable *wxClientWidgetHashTable = NULL;
-wxApp *wxTheApp = NULL;
-
-// This is set within wxEntryStart -- too early on
-// to put these in wxTheApp
static bool g_showIconic = FALSE;
static wxSize g_initialSize = wxDefaultSize;
EVT_IDLE(wxApp::OnIdle)
END_EVENT_TABLE()
-bool wxApp::Initialize()
-{
- wxClassInfo::InitializeClasses();
-
-#if wxUSE_INTL
- wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding());
-#endif
-
- // 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.
-#if wxUSE_THREADS
- wxPendingEventsLocker = new wxCriticalSection();
-#endif
-
- wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING);
- wxTheColourDatabase->Initialize();
-
- wxInitializeStockLists();
- wxInitializeStockObjects();
-
- wxWidgetHashTable = new wxHashTable(wxKEY_INTEGER);
- wxClientWidgetHashTable = new wxHashTable(wxKEY_INTEGER);
-
- wxModule::RegisterModules();
- if (!wxModule::InitializeModules()) return FALSE;
-
- return TRUE;
-}
-
-void wxApp::CleanUp()
-{
- delete wxWidgetHashTable;
- wxWidgetHashTable = NULL;
- delete wxClientWidgetHashTable;
- wxClientWidgetHashTable = NULL;
-
- wxModule::CleanUpModules();
-
- delete wxTheColourDatabase;
- wxTheColourDatabase = NULL;
-
- wxDeleteStockObjects();
-
- wxDeleteStockLists();
-
- delete wxTheApp;
- wxTheApp = NULL;
-
- wxClassInfo::CleanUpClasses();
-
-#if wxUSE_THREADS
- delete wxPendingEvents;
- delete wxPendingEventsLocker;
-#endif
-
-#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
- // At this point we want to check if there are any memory
- // blocks that aren't part of the wxDebugContext itself,
- // as a special case. Then when dumping we need to ignore
- // wxDebugContext, too.
- if (wxDebugContext::CountObjectsLeft(TRUE) > 0)
- {
- wxLogDebug("There were memory leaks.");
- wxDebugContext::Dump();
- wxDebugContext::PrintStatistics();
- }
-#endif
-
- // do it as the very last thing because everything else can log messages
- wxLog::DontCreateOnDemand();
- // do it as the very last thing because everything else can log messages
- delete wxLog::SetActiveTarget(NULL);
-}
-
-// NB: argc and argv may be changed here, pass by reference!
-int wxEntryStart( int& argc, char *argv[] )
+bool wxApp::Initialize(int& argc, wxChar **argv)
{
-#ifdef __WXDEBUG__
-#if !wxUSE_NANOX
+#if defined(__WXDEBUG__) && !wxUSE_NANOX
// install the X error handler
gs_pfnXErrorHandler = XSetErrorHandler( wxXErrorHandler );
-#endif
#endif // __WXDEBUG__
char *displayName = NULL;
bool syncDisplay = FALSE;
- int i;
- for (i = 0; i < argc; i++)
+ int argcOrig = argc;
+ for ( int i = 0; i < argcOrig; i++ )
{
- if (strcmp( argv[i], "-display") == 0)
+ if (wxStrcmp( argv[i], _T("-display") ) == 0)
{
if (i < (argc - 1))
{
- i ++;
+ argv[i++] = NULL;
+
displayName = argv[i];
- continue;
+
+ argv[i] = NULL;
+ argc -= 2;
}
}
- else if (strcmp( argv[i], "-geometry") == 0)
+ else if (wxStrcmp( argv[i], _T("-geometry") ) == 0)
{
if (i < (argc - 1))
{
- i ++;
+ argv[i++] = NULL;
+
int w, h;
- if (sscanf(argv[i], "%dx%d", &w, &h) != 2)
+ if (wxSscanf(argv[i], _T("%dx%d"), &w, &h) != 2)
{
- wxLogError( _("Invalid geometry specification '%s'"), wxString::FromAscii(argv[i]).c_str() );
+ wxLogError( _("Invalid geometry specification '%s'"),
+ wxString::FromAscii(argv[i]).c_str() );
}
else
{
g_initialSize = wxSize(w, h);
}
- continue;
+
+ argv[i] = NULL;
+ argc -= 2;
}
}
- else if (strcmp( argv[i], "-sync") == 0)
+ else if (wxStrcmp( argv[i], _T("-sync") ) == 0)
{
syncDisplay = TRUE;
- continue;
+
+ argv[i] = NULL;
+ argc--;
}
- else if (strcmp( argv[i], "-iconic") == 0)
+ else if (wxStrcmp( argv[i], _T("-iconic") ) == 0)
{
g_showIconic = TRUE;
- continue;
+ argv[i] = NULL;
+ argc--;
}
+ }
+ if ( argc != argcOrig )
+ {
+ // remove the argumens we consumed
+ for ( int i = 0; i < argc; i++ )
+ {
+ while ( !argv[i] )
+ {
+ memmove(argv + i, argv + i + 1, argcOrig - i);
+ }
+ }
}
// X11 display stuff
- Display* xdisplay = XOpenDisplay( displayName );
+ Display *xdisplay = XOpenDisplay( displayName );
if (!xdisplay)
{
wxLogError( _("wxWindows could not open display. Exiting.") );
- return -1;
+ return false;
+ }
+
+ if ( !wxAppBase::Initialize(argc, argv) )
+ {
+ XCloseDisplay(xdisplay);
+
+ return false;
}
if (syncDisplay)
XSynchronize(xdisplay, True);
- wxApp::ms_display = (WXDisplay*) xdisplay;
+ ms_display = (WXDisplay*) xdisplay;
XSelectInput( xdisplay, XDefaultRootWindow(xdisplay), PropertyChangeMask);
g_type_init();
#endif
- if (!wxApp::Initialize())
- return -1;
-
- return 0;
-}
-
-int wxEntryInitGui()
-{
- int retValue = 0;
+#if wxUSE_INTL
+ wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding());
+#endif
- if ( !wxTheApp->OnInitGui() )
- retValue = -1;
+ wxWidgetHashTable = new wxHashTable(wxKEY_INTEGER);
+ wxClientWidgetHashTable = new wxHashTable(wxKEY_INTEGER);
- return retValue;
+ return true;
}
-
-int wxEntry( int argc, char *argv[] )
+void wxApp::CleanUp()
{
-#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
- int err = wxEntryStart(argc, argv);
- if (err)
- return err;
-
- if (!wxTheApp)
- {
- if (!wxApp::GetInitializerFunction())
- {
- printf( "wxWindows error: No initializer - use IMPLEMENT_APP macro.\n" );
- return 0;
- }
-
- wxTheApp = (wxApp*) (* wxApp::GetInitializerFunction()) ();
- }
-
- if (!wxTheApp)
- {
- printf( "wxWindows error: wxTheApp == NULL\n" );
- return 0;
- }
-
- // Command line argument stuff
- wxTheApp->argc = argc;
-#if wxUSE_UNICODE
- wxTheApp->argv = new wxChar*[argc+1];
- int mb_argc = 0;
- while (mb_argc < argc)
- {
- wxString tmp = wxString::FromAscii( argv[mb_argc] );
- wxTheApp->argv[mb_argc] = wxStrdup( tmp.c_str() );
- mb_argc++;
- }
- wxTheApp->argv[mb_argc] = (wxChar *)NULL;
-#else
- wxTheApp->argv = argv;
-#endif
-
- if (wxTheApp->argc > 0)
- {
- wxFileName fname( wxTheApp->argv[0] );
- wxTheApp->SetAppName( fname.GetName() );
- }
-
- wxTheApp->m_showIconic = g_showIconic;
- wxTheApp->m_initialSize = g_initialSize;
-
- int retValue;
- retValue = wxEntryInitGui();
-
- // Here frames insert themselves automatically into wxTopLevelWindows by
- // getting created in OnInit().
- if ( retValue == 0 )
- {
- if ( !wxTheApp->OnInit() )
- retValue = -1;
- }
-
- if ( retValue == 0 )
- {
- if (wxTheApp->Initialized()) retValue = wxTheApp->OnRun();
- }
-
- // flush the logged messages if any
- wxLog *pLog = wxLog::GetActiveTarget();
- if ( pLog != NULL && pLog->HasPendingMessages() )
- pLog->Flush();
-
- delete wxLog::SetActiveTarget(new wxLogStderr); // So dialog boxes aren't used
- // for further messages
-
- if (wxTheApp->GetTopWindow())
- {
- delete wxTheApp->GetTopWindow();
- wxTheApp->SetTopWindow(NULL);
- }
-
- wxTheApp->DeletePendingObjects();
-
- wxTheApp->OnExit();
-
- wxApp::CleanUp();
-
- return retValue;
-};
+ delete wxWidgetHashTable;
+ wxWidgetHashTable = NULL;
+ delete wxClientWidgetHashTable;
+ wxClientWidgetHashTable = NULL;
-// Static member initialization
-wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL;
+ wxAppBase::CleanUp();
+}
wxApp::wxApp()
{
s_inOnIdle = FALSE;
}
-void wxWakeUpIdle()
+void wxApp::WakeUpIdle()
{
- // **** please implement me! ****
+ // TODO: use wxMotif implementation?
+
// Wake up the idle handler processor, even if it is in another thread...
}
return needMore;
}
-void wxApp::DeletePendingObjects()
-{
- wxNode *node = wxPendingDelete.GetFirst();
- while (node)
- {
- wxObject *obj = (wxObject *)node->GetData();
-
- delete obj;
-
- if (wxPendingDelete.Member(obj))
- delete node;
-
- // Deleting one object may have deleted other pending
- // objects, so start from beginning of list again.
- node = wxPendingDelete.GetFirst();
- }
-}
-
// Create display, and other initialization
bool wxApp::OnInitGui()
{
return (Window) 0;
}
-void wxExit()
+void wxApp::Exit()
{
- int retValue = 0;
- if (wxTheApp)
- retValue = wxTheApp->OnExit();
-
wxApp::CleanUp();
- /*
- * Exit in some platform-specific way. Not recommended that the app calls this:
- * only for emergencies.
- */
- exit(retValue);
+
+ wxAppConsole::Exit();
}
// Yield to other processes
projects / wxWidgets.git / blobdiff