/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
-#pragma implementation "app.h"
+ #pragma implementation "app.h"
+#endif
+
+#ifdef __VMS
+#include <vms_jackets.h>
#endif
#include "wx/app.h"
#include "wx/font.h"
#include "wx/settings.h"
#include "wx/dialog.h"
+
#if wxUSE_WX_RESOURCES
-#include "wx/resource.h"
+ #include "wx/resource.h"
#endif
+
#include "wx/module.h"
#include "wx/image.h"
+
+#ifdef __WXUNIVERSAL__
+ #include "wx/univ/theme.h"
+ #include "wx/univ/renderer.h"
+#endif
+
#if wxUSE_THREADS
-#include "wx/thread.h"
+ #include "wx/thread.h"
#endif
-#include "unistd.h"
-#include "glib.h"
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include <unistd.h>
+#ifdef __VMS
+# include <poll.h>
+#else
+# include <sys/poll.h>
+#endif
#include "wx/gtk/win_gtk.h"
+#include <gtk/gtk.h>
+
+
//-----------------------------------------------------------------------------
// global data
//-----------------------------------------------------------------------------
wxApp *wxTheApp = (wxApp *) NULL;
-wxAppInitializerFunction wxApp::m_appInitFn = (wxAppInitializerFunction) NULL;
+wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL;
-extern wxList wxPendingDelete;
-extern wxResourceCache *wxTheResourceCache;
+bool g_mainThreadLocked = FALSE;
+gint g_pendingTag = 0;
-unsigned char g_palette[64*3] =
-{
- 0x0, 0x0, 0x0,
- 0xff, 0xff, 0xff,
- 0xff, 0x0, 0x0,
- 0xff, 0xff, 0x0,
- 0x0, 0xff, 0x0,
- 0x0, 0x0, 0xff,
- 0x0, 0xff, 0xff,
- 0x99, 0x99, 0x99,
- 0xff, 0x88, 0x0,
- 0x88, 0x0, 0x0,
- 0x0, 0x88, 0x88,
- 0x88, 0x88, 0x0,
- 0xff, 0xcc, 0x97,
- 0xbb, 0xbb, 0xbb,
- 0x9f, 0x6b, 0x42,
- 0x55, 0x55, 0x55,
- 0xdd, 0xdd, 0xdd,
- 0x77, 0x77, 0x77,
- 0x33, 0x33, 0x33,
- 0xcc, 0x0, 0x0,
- 0xff, 0x44, 0x0,
- 0xff, 0xcc, 0x0,
- 0xcc, 0xcc, 0x0,
- 0x60, 0x60, 0x0,
- 0x0, 0x43, 0x0,
- 0x0, 0x7f, 0x0,
- 0x0, 0xcc, 0x0,
- 0x0, 0x44, 0x44,
- 0x0, 0x0, 0x44,
- 0x0, 0x0, 0x88,
- 0xef, 0xb1, 0x7b,
- 0xdf, 0x98, 0x5f,
- 0xbf, 0x87, 0x56,
- 0x7f, 0x57, 0x26,
- 0x5f, 0x39, 0xc,
- 0x3f, 0x1c, 0x0,
- 0x21, 0x0, 0x0,
- 0x0, 0x43, 0x87,
- 0x2d, 0x70, 0xaf,
- 0x5a, 0x9e, 0xd7,
- 0x87, 0xcc, 0xff,
- 0xff, 0xe0, 0xba,
- 0x21, 0x43, 0xf,
- 0x3d, 0x5d, 0x25,
- 0x59, 0x78, 0x3a,
- 0x75, 0x93, 0x4f,
- 0x91, 0xae, 0x64,
- 0xad, 0xc8, 0x7a,
- 0xf0, 0xa8, 0xef,
- 0xd0, 0x88, 0xd0,
- 0xaf, 0x66, 0xaf,
- 0x8e, 0x44, 0x8e,
- 0x6d, 0x22, 0x6d,
- 0x4b, 0x0, 0x4b,
- 0xff, 0xc0, 0xbc,
- 0xff, 0x93, 0x91,
- 0xff, 0x66, 0x67,
- 0xd8, 0xf2, 0xbf,
- 0xff, 0xc9, 0x68,
- 0xff, 0x96, 0x67,
- 0xa5, 0x60, 0xff,
- 0x51, 0xff, 0x99,
- 0x3f, 0xa5, 0x63,
- 0x98, 0x90, 0x67
-};
+static GtkWidget *gs_RootWindow = (GtkWidget*) NULL;
//-----------------------------------------------------------------------------
-// local functions
+// idle system
//-----------------------------------------------------------------------------
-extern void wxFlushResources(void);
+extern bool g_isIdle;
+
+void wxapp_install_idle_handler();
//-----------------------------------------------------------------------------
-// global functions
+// wxExit
//-----------------------------------------------------------------------------
-void wxExit(void)
+void wxExit()
{
gtk_main_quit();
}
-bool wxYield(void)
+//-----------------------------------------------------------------------------
+// wxYield
+//-----------------------------------------------------------------------------
+
+bool wxApp::Yield(bool onlyIfNeeded)
{
- while (gtk_events_pending() > 0) gtk_main_iteration();
+ // MT-FIXME
+ static bool s_inYield = FALSE;
+
+ if ( s_inYield )
+ {
+ if ( !onlyIfNeeded )
+ {
+ wxFAIL_MSG( wxT("wxYield called recursively" ) );
+ }
+
+ return FALSE;
+ }
+
+#if wxUSE_THREADS
+ if ( !wxThread::IsMain() )
+ {
+ // can't call gtk_main_iteration() from other threads like this
+ return TRUE;
+ }
+#endif // wxUSE_THREADS
+
+ s_inYield = TRUE;
+
+ if (!g_isIdle)
+ {
+ // We need to remove idle callbacks or the loop will
+ // never finish.
+ gtk_idle_remove( m_idleTag );
+ m_idleTag = 0;
+ g_isIdle = TRUE;
+ }
+
+ // disable log flushing from here because a call to wxYield() shouldn't
+ // normally result in message boxes popping up &c
+ wxLog::Suspend();
+
+ while (gtk_events_pending())
+ gtk_main_iteration();
+
+ // It's necessary to call ProcessIdle() to update the frames sizes which
+ // might have been changed (it also will update other things set from
+ // OnUpdateUI() which is a nice (and desired) side effect). But we
+ // call ProcessIdle() only once since this is not meant for longish
+ // background jobs (controlled by wxIdleEvent::RequestMore() and the
+ // return value of Processidle().
+ ProcessIdle();
+
+ // let the logs be flashed again
+ wxLog::Resume();
+
+ s_inYield = FALSE;
+
return TRUE;
}
+//-----------------------------------------------------------------------------
+// wxWakeUpIdle
+//-----------------------------------------------------------------------------
+
+void wxWakeUpIdle()
+{
+#if wxUSE_THREADS
+ if (!wxThread::IsMain())
+ wxMutexGuiEnter();
+#endif
+
+ if (g_isIdle)
+ wxapp_install_idle_handler();
+
+#if wxUSE_THREADS
+ if (!wxThread::IsMain())
+ wxMutexGuiLeave();
+#endif
+}
+
+//-----------------------------------------------------------------------------
+// local functions
+//-----------------------------------------------------------------------------
+
+// the callback functions must be extern "C" to comply with GTK+ declarations
+extern "C"
+{
+
+static gint wxapp_pending_callback( gpointer WXUNUSED(data) )
+{
+ if (!wxTheApp) return TRUE;
+
+ // When getting called from GDK's time-out handler
+ // we are no longer within GDK's grab on the GUI
+ // thread so we must lock it here ourselves.
+ gdk_threads_enter();
+
+ // Sent idle event to all who request them.
+ wxTheApp->ProcessPendingEvents();
+
+ g_pendingTag = 0;
+
+ // Flush the logged messages if any.
+#if wxUSE_LOG
+ wxLog::FlushActive();
+#endif // wxUSE_LOG
+
+ // Release lock again
+ gdk_threads_leave();
+
+ // Return FALSE to indicate that no more idle events are
+ // to be sent (single shot instead of continuous stream)
+ return FALSE;
+}
+
+static gint wxapp_idle_callback( gpointer WXUNUSED(data) )
+{
+ if (!wxTheApp)
+ return TRUE;
+
+#ifdef __WXDEBUG__
+ // don't generate the idle events while the assert modal dialog is shown,
+ // this completely confuses the apps which don't expect to be reentered
+ // from some safely-looking functions
+ if ( wxTheApp->IsInAssert() )
+ {
+ return TRUE;
+ }
+#endif // __WXDEBUG__
+
+ // When getting called from GDK's time-out handler
+ // we are no longer within GDK's grab on the GUI
+ // thread so we must lock it here ourselves.
+ gdk_threads_enter();
+
+ // Indicate that we are now in idle mode and event handlers
+ // will have to reinstall the idle handler again.
+ g_isIdle = TRUE;
+ wxTheApp->m_idleTag = 0;
+
+ // Send idle event to all who request them as long as
+ // no events have popped up in the event queue.
+ while (wxTheApp->ProcessIdle() && (gtk_events_pending() == 0))
+ ;
+
+ // Release lock again
+ gdk_threads_leave();
+
+ // Return FALSE to indicate that no more idle events are
+ // to be sent (single shot instead of continuous stream).
+ return FALSE;
+}
+
+#if wxUSE_THREADS
+
+static gint wxapp_poll_func( GPollFD *ufds, guint nfds, gint timeout )
+{
+ gint res;
+ gdk_threads_enter();
+
+ wxMutexGuiLeave();
+ g_mainThreadLocked = TRUE;
+
+ res = poll( (struct pollfd*) ufds, nfds, timeout );
+
+ wxMutexGuiEnter();
+ g_mainThreadLocked = FALSE;
+
+ gdk_threads_leave();
+
+ return res;
+}
+
+#endif // wxUSE_THREADS
+
+} // extern "C"
+
+void wxapp_install_idle_handler()
+{
+ wxASSERT_MSG( wxTheApp->m_idleTag == 0, wxT("attempt to install idle handler twice") );
+
+ g_isIdle = FALSE;
+
+ if (g_pendingTag == 0)
+ g_pendingTag = gtk_idle_add_priority( 900, wxapp_pending_callback, (gpointer) NULL );
+
+ // This routine gets called by all event handlers
+ // indicating that the idle is over. It may also
+ // get called from other thread for sending events
+ // to the main thread (and processing these in
+ // idle time). Very low priority.
+ wxTheApp->m_idleTag = gtk_idle_add_priority( 1000, wxapp_idle_callback, (gpointer) NULL );
+}
+
+//-----------------------------------------------------------------------------
+// Access to the root window global
+//-----------------------------------------------------------------------------
+
+GtkWidget* wxGetRootWindow()
+{
+ if (gs_RootWindow == NULL)
+ {
+ gs_RootWindow = gtk_window_new( GTK_WINDOW_TOPLEVEL );
+ gtk_widget_realize( gs_RootWindow );
+ }
+ return gs_RootWindow;
+}
+
//-----------------------------------------------------------------------------
// wxApp
//-----------------------------------------------------------------------------
EVT_IDLE(wxApp::OnIdle)
END_EVENT_TABLE()
-gint wxapp_idle_callback( gpointer WXUNUSED(data) )
+wxApp::wxApp()
{
- if (wxTheApp) while (wxTheApp->ProcessIdle()) {}
+ m_initialized = FALSE;
+#ifdef __WXDEBUG__
+ m_isInAssert = FALSE;
+#endif // __WXDEBUG__
+
+ m_idleTag = 0;
+ wxapp_install_idle_handler();
+
#if wxUSE_THREADS
- wxMutexGuiLeave();
+ g_main_set_poll_func( wxapp_poll_func );
#endif
- usleep(10000);
-#if wxUSE_THREADS
- wxMutexGuiEnter();
-#endif
- return TRUE;
-}
-wxApp::wxApp()
-{
- wxTheApp = this;
-
- m_topWindow = (wxWindow *) NULL;
- m_exitOnFrameDelete = TRUE;
-
- m_idleTag = gtk_idle_add( wxapp_idle_callback, (gpointer) NULL );
-
m_colorCube = (unsigned char*) NULL;
+
+ // this is NULL for a "regular" wxApp, but is set (and freed) by a wxGLApp
+ m_glVisualInfo = (void *) NULL;
}
-wxApp::~wxApp(void)
+wxApp::~wxApp()
{
- gtk_idle_remove( m_idleTag );
-
+ if (m_idleTag) gtk_idle_remove( m_idleTag );
+
if (m_colorCube) free(m_colorCube);
}
bool wxApp::OnInitGui()
{
- /* Nothing to do for 15, 16, 24, 32 bit displays */
+ if ( !wxAppBase::OnInitGui() )
+ return FALSE;
GdkVisual *visual = gdk_visual_get_system();
- if (visual->depth > 8) return TRUE;
-
- /* this initiates the standard palette as defined by GdkImlib
- in the GNOME libraries. it ensures that all GNOME applications
- use the same 64 colormap entries on 8-bit displays so you
- can use several rather graphics-heavy applications at the
- same time.
- NOTE: this doesn't really seem to work this way... */
- /*
- GdkColormap *cmap = gdk_colormap_new( gdk_visual_get_system(), TRUE );
+ // if this is a wxGLApp (derived from wxApp), and we've already
+ // chosen a specific visual, then derive the GdkVisual from that
+ if (m_glVisualInfo != NULL)
+ {
+#ifdef __WXGTK20__
+ // seems gtk_widget_set_default_visual no longer exists?
+ GdkVisual* vis = gtk_widget_get_default_visual();
+#else
+ GdkVisual* vis = gdkx_visual_get(
+ ((XVisualInfo *) m_glVisualInfo) ->visualid );
+ gtk_widget_set_default_visual( vis );
+#endif
- for (int i = 0; i < 64; i++)
- {
- GdkColor col;
- col.red = g_palette[i*3 + 0] << 8;
- col.green = g_palette[i*3 + 1] << 8;
- col.blue = g_palette[i*3 + 2] << 8;
- col.pixel = 0;
+ GdkColormap *colormap = gdk_colormap_new( vis, FALSE );
+ gtk_widget_set_default_colormap( colormap );
- gdk_color_alloc( cmap, &col );
- }
-
- gtk_widget_set_default_colormap( cmap );
- */
-
- /* initialize color cube for 8-bit color reduction dithering */
+ visual = vis;
+ }
+ // On some machines, the default visual is just 256 colours, so
+ // we make sure we get the best. This can sometimes be wasteful.
+
+ else
+ if ((gdk_visual_get_best() != gdk_visual_get_system()) && (m_useBestVisual))
+ {
+#ifdef __WXGTK20__
+ /* seems gtk_widget_set_default_visual no longer exists? */
+ GdkVisual* vis = gtk_widget_get_default_visual();
+#else
+ GdkVisual* vis = gdk_visual_get_best();
+ gtk_widget_set_default_visual( vis );
+#endif
+
+ GdkColormap *colormap = gdk_colormap_new( vis, FALSE );
+ gtk_widget_set_default_colormap( colormap );
+
+ visual = vis;
+ }
+
+ // Nothing to do for 15, 16, 24, 32 bit displays
+ if (visual->depth > 8) return TRUE;
+
+ // initialize color cube for 8-bit color reduction dithering
+
GdkColormap *cmap = gtk_widget_get_default_colormap();
-
+
m_colorCube = (unsigned char*)malloc(32 * 32 * 32);
- for (int r = 0; r < 32; r++)
- {
- for (int g = 0; g < 32; g++)
- {
- for (int b = 0; b < 32; b++)
- {
- int rr = (r << 3) | (r >> 2);
- int gg = (g << 3) | (g >> 2);
- int bb = (b << 3) | (b >> 2);
-
- GdkColor *colors = cmap->colors;
- int max = 3 * (65536);
+ for (int r = 0; r < 32; r++)
+ {
+ for (int g = 0; g < 32; g++)
+ {
+ for (int b = 0; b < 32; b++)
+ {
+ int rr = (r << 3) | (r >> 2);
+ int gg = (g << 3) | (g >> 2);
+ int bb = (b << 3) | (b >> 2);
+
int index = -1;
- for (int i = 0; i < cmap->size; i++)
+ GdkColor *colors = cmap->colors;
+ if (colors)
+ {
+ int max = 3 * 65536;
+
+ for (int i = 0; i < cmap->size; i++)
+ {
+ int rdiff = ((rr << 8) - colors[i].red);
+ int gdiff = ((gg << 8) - colors[i].green);
+ int bdiff = ((bb << 8) - colors[i].blue);
+ int sum = ABS (rdiff) + ABS (gdiff) + ABS (bdiff);
+ if (sum < max)
+ {
+ index = i; max = sum;
+ }
+ }
+ }
+ else
{
- int rdiff = ((rr << 8) - colors[i].red);
- int gdiff = ((gg << 8)- colors[i].green);
- int bdiff = ((bb << 8)- colors[i].blue);
- int sum = ABS (rdiff) + ABS (gdiff) + ABS (bdiff);
- if (sum < max) { index = i; max = sum; }
+ // assume 8-bit true or static colors. this really exists
+ GdkVisual* vis = gdk_colormap_get_visual( cmap );
+ index = (r >> (5 - vis->red_prec)) << vis->red_shift;
+ index |= (g >> (5 - vis->green_prec)) << vis->green_shift;
+ index |= (b >> (5 - vis->blue_prec)) << vis->blue_shift;
}
-
- m_colorCube[ (r*1024) + (g*32) + b ] = index;
- }
- }
+ m_colorCube[ (r*1024) + (g*32) + b ] = index;
+ }
+ }
}
-
return TRUE;
}
-bool wxApp::ProcessIdle(void)
+GdkVisual *wxApp::GetGdkVisual()
+{
+ GdkVisual *visual = NULL;
+
+ if (m_glVisualInfo)
+ visual = gdkx_visual_get( ((XVisualInfo *) m_glVisualInfo)->visualid );
+ else
+ visual = gdk_window_get_visual( wxGetRootWindow()->window );
+
+ wxASSERT( visual );
+
+ return visual;
+}
+
+bool wxApp::ProcessIdle()
{
wxIdleEvent event;
event.SetEventObject( this );
void wxApp::OnIdle( wxIdleEvent &event )
{
- static bool inOnIdle = FALSE;
+ static bool s_inOnIdle = FALSE;
- /* Avoid recursion (via ProcessEvent default case) */
- if (inOnIdle)
+ // Avoid recursion (via ProcessEvent default case)
+ if (s_inOnIdle)
return;
- inOnIdle = TRUE;
+ s_inOnIdle = TRUE;
- /* 'Garbage' collection of windows deleted with Close(). */
- DeletePendingObjects();
+ // Resend in the main thread events which have been prepared in other
+ // threads
+ ProcessPendingEvents();
- /* flush the logged messages if any */
- wxLog *log = wxLog::GetActiveTarget();
- if (log != NULL && log->HasPendingMessages())
- log->Flush();
+ // 'Garbage' collection of windows deleted with Close()
+ DeletePendingObjects();
- /* Send OnIdle events to all windows */
+ // Send OnIdle events to all windows
bool needMore = SendIdleEvents();
if (needMore)
event.RequestMore(TRUE);
- inOnIdle = FALSE;
+ s_inOnIdle = FALSE;
}
-bool wxApp::SendIdleEvents(void)
+bool wxApp::SendIdleEvents()
{
bool needMore = FALSE;
- wxNode* node = wxTopLevelWindows.First();
+ wxWindowList::Node* node = wxTopLevelWindows.GetFirst();
while (node)
{
- wxWindow* win = (wxWindow*) node->Data();
+ wxWindow* win = node->GetData();
if (SendIdleEvents(win))
needMore = TRUE;
- node = node->Next();
+ node = node->GetNext();
}
+
return needMore;
}
wxIdleEvent event;
event.SetEventObject(win);
- win->ProcessEvent(event);
+
+ win->GetEventHandler()->ProcessEvent(event);
+
+ win->OnInternalIdle();
if (event.MoreRequested())
needMore = TRUE;
node = node->Next();
}
- return needMore ;
+
+ return needMore;
}
-int wxApp::MainLoop(void)
+int wxApp::MainLoop()
{
gtk_main();
return 0;
}
-void wxApp::ExitMainLoop(void)
+void wxApp::ExitMainLoop()
{
- gtk_main_quit();
+ if (gtk_main_level() > 0)
+ gtk_main_quit();
}
-bool wxApp::Initialized(void)
+bool wxApp::Initialized()
{
return m_initialized;
}
-bool wxApp::Pending(void)
+bool wxApp::Pending()
{
- return FALSE;
+ return (gtk_events_pending() > 0);
}
-void wxApp::Dispatch(void)
+void wxApp::Dispatch()
{
+ gtk_main_iteration();
}
-void wxApp::DeletePendingObjects(void)
+void wxApp::DeletePendingObjects()
{
wxNode *node = wxPendingDelete.First();
while (node)
delete obj;
- if (wxPendingDelete.Member(obj))
- delete node;
+ if (wxPendingDelete.Find(obj))
+ delete node;
node = wxPendingDelete.First();
}
}
-wxWindow *wxApp::GetTopWindow(void)
-{
- if (m_topWindow) return m_topWindow;
- wxNode *node = wxTopLevelWindows.First();
- if (!node) return (wxWindow *) NULL;
- return (wxWindow*)node->Data();
-}
-
-void wxApp::SetTopWindow( wxWindow *win )
+bool wxApp::Initialize()
{
- m_topWindow = win;
-}
+ wxClassInfo::InitializeClasses();
-bool wxApp::Initialize(void)
-{
- wxBuffer = new char[BUFSIZ + 512];
+#if wxUSE_INTL
+ wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding());
+#endif
- wxClassInfo::InitializeClasses();
-
- wxSystemSettings::Init();
-
- wxTheFontNameDirectory = new wxFontNameDirectory;
- wxTheFontNameDirectory->Initialize();
+ // 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
+ wxPendingEvents = new wxList();
+ wxPendingEventsLocker = new wxCriticalSection();
+#endif
wxTheColourDatabase = new wxColourDatabase( wxKEY_STRING );
wxTheColourDatabase->Initialize();
wxInitializeStockObjects();
#if wxUSE_WX_RESOURCES
- wxTheResourceCache = new wxResourceCache( wxKEY_STRING );
-
wxInitializeResourceSystem();
#endif
- wxImage::InitStandardHandlers();
-
- /* no global cursor under X
- g_globalCursor = new wxCursor; */
-
wxModule::RegisterModules();
if (!wxModule::InitializeModules()) return FALSE;
-
+
return TRUE;
}
-void wxApp::CleanUp(void)
+void wxApp::CleanUp()
{
wxModule::CleanUpModules();
#if wxUSE_WX_RESOURCES
- wxFlushResources();
-
- if (wxTheResourceCache) delete wxTheResourceCache;
- wxTheResourceCache = (wxResourceCache*) NULL;
-
wxCleanUpResourceSystem();
#endif
- if (wxTheColourDatabase) delete wxTheColourDatabase;
+ delete wxTheColourDatabase;
wxTheColourDatabase = (wxColourDatabase*) NULL;
-
- if (wxTheFontNameDirectory) delete wxTheFontNameDirectory;
- wxTheFontNameDirectory = (wxFontNameDirectory*) NULL;
-
+
wxDeleteStockObjects();
wxDeleteStockLists();
- wxImage::CleanUpHandlers();
-
delete wxTheApp;
wxTheApp = (wxApp*) NULL;
- /* check for memory leaks */
+ wxClassInfo::CleanUpClasses();
+
+#if wxUSE_THREADS
+ delete wxPendingEvents;
+ delete wxPendingEventsLocker;
+#endif
+
+ // check for memory leaks
#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
- if (wxDebugContext::CountObjectsLeft() > 0)
+ if (wxDebugContext::CountObjectsLeft(TRUE) > 0)
{
- wxLogDebug("There were memory leaks.\n");
+ wxLogDebug(wxT("There were memory leaks.\n"));
wxDebugContext::Dump();
wxDebugContext::PrintStatistics();
}
-#endif
+#endif // Debug
- /* do this as the very last thing because everything else can log messages */
+#if wxUSE_LOG
+ // do this as the very last thing because everything else can log messages
wxLog::DontCreateOnDemand();
-
- wxLog *oldLog = wxLog::SetActiveTarget( (wxLog*) NULL );
- if (oldLog) delete oldLog;
- wxSystemSettings::Done();
-
- wxClassInfo::CleanUpClasses();
-
- delete[] wxBuffer;
-}
-
-wxLog *wxApp::CreateLogTarget()
-{
- return new wxLogGui;
+ wxLog *oldLog = wxLog::SetActiveTarget( (wxLog*) NULL );
+ if (oldLog)
+ delete oldLog;
+#endif // wxUSE_LOG
}
//-----------------------------------------------------------------------------
// wxEntry
//-----------------------------------------------------------------------------
-int wxEntry( int argc, char *argv[] )
+// NB: argc and argv may be changed here, pass by reference!
+int wxEntryStart( int& argc, char *argv[] )
{
+#if wxUSE_THREADS
+ // GTK 1.2 up to version 1.2.3 has broken threads
+ if ((gtk_major_version == 1) &&
+ (gtk_minor_version == 2) &&
+ (gtk_micro_version < 4))
+ {
+ printf( "wxWindows warning: GUI threading disabled due to outdated GTK version\n" );
+ }
+ else
+ {
+ g_thread_init(NULL);
+ }
+#endif
+
gtk_set_locale();
+ // We should have the wxUSE_WCHAR_T test on the _outside_
+#if wxUSE_WCHAR_T
+#if defined(__WXGTK20__)
+ // gtk+ 2.0 supports Unicode through UTF-8 strings
+ wxConvCurrent = &wxConvUTF8;
+#else
+ if (!wxOKlibc()) wxConvCurrent = &wxConvLocal;
+#endif
+#else
+ if (!wxOKlibc()) wxConvCurrent = (wxMBConv*) NULL;
+#endif
+
+ gdk_threads_enter();
+
gtk_init( &argc, &argv );
- if (!wxApp::Initialize()) return 0;
+ wxSetDetectableAutoRepeat( TRUE );
+
+ if (!wxApp::Initialize())
+ {
+ gdk_threads_leave();
+ return -1;
+ }
+
+ return 0;
+}
+
+
+int wxEntryInitGui()
+{
+ int retValue = 0;
+
+ if ( !wxTheApp->OnInitGui() )
+ retValue = -1;
+
+ wxGetRootWindow();
+
+ return retValue;
+}
+
+
+void wxEntryCleanup()
+{
+#if wxUSE_LOG
+ // flush the logged messages if any
+ wxLog *log = wxLog::GetActiveTarget();
+ if (log != NULL && log->HasPendingMessages())
+ log->Flush();
+
+ // continuing to use user defined log target is unsafe from now on because
+ // some resources may be already unavailable, so replace it by something
+ // more safe
+ wxLog *oldlog = wxLog::SetActiveTarget(new wxLogStderr);
+ if ( oldlog )
+ delete oldlog;
+#endif // wxUSE_LOG
+
+ wxApp::CleanUp();
+
+ gdk_threads_leave();
+}
+
+
+int wxEntry( int argc, char *argv[] )
+{
+#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;
- }
+ wxCHECK_MSG( wxApp::GetInitializerFunction(), -1,
+ wxT("wxWindows error: No initializer - use IMPLEMENT_APP macro.\n") );
wxAppInitializerFunction app_ini = wxApp::GetInitializerFunction();
wxTheApp = (wxApp*) test_app;
}
- if (!wxTheApp)
- {
- printf( "wxWindows error: wxTheApp == NULL\n" );
- return 0;
- }
+ wxCHECK_MSG( wxTheApp, -1, wxT("wxWindows error: no application object") );
wxTheApp->argc = argc;
+#if wxUSE_UNICODE
+ wxTheApp->argv = new wxChar*[argc+1];
+ int mb_argc = 0;
+ while (mb_argc < argc)
+ {
+ wxTheApp->argv[mb_argc] = wxStrdup(wxConvLibc.cMB2WX(argv[mb_argc]));
+ mb_argc++;
+ }
+ wxTheApp->argv[mb_argc] = (wxChar *)NULL;
+#else
wxTheApp->argv = argv;
+#endif
- char name[200];
- strcpy( name, argv[0] );
- strcpy( name, wxFileNameFromPath(name) );
+ wxString name(wxFileNameFromPath(argv[0]));
wxStripExtension( name );
wxTheApp->SetAppName( name );
- if (!wxTheApp->OnInitGui()) return 0;
-
- /* Here frames insert themselves automatically
- * into wxTopLevelWindows by getting created
- * in OnInit(). */
-
- if (!wxTheApp->OnInit()) return 0;
+ int retValue;
+ retValue = wxEntryInitGui();
- wxTheApp->m_initialized = (wxTopLevelWindows.Number() > 0);
+ // Here frames insert themselves automatically into wxTopLevelWindows by
+ // getting created in OnInit().
+ if ( retValue == 0 )
+ {
+ if ( !wxTheApp->OnInit() )
+ retValue = -1;
+ }
- int retValue = 0;
+ if ( retValue == 0 )
+ {
+ /* delete pending toplevel windows (typically a single
+ dialog) so that, if there isn't any left, we don't
+ call OnRun() */
+ wxTheApp->DeletePendingObjects();
- if (wxTheApp->Initialized()) retValue = wxTheApp->OnRun();
+ wxTheApp->m_initialized = wxTopLevelWindows.GetCount() != 0;
- wxWindow *topWindow = wxTheApp->GetTopWindow();
- if (topWindow)
- {
- /* Forcibly delete the window. */
- if (topWindow->IsKindOf(CLASSINFO(wxFrame)) ||
- topWindow->IsKindOf(CLASSINFO(wxDialog)) )
+ if (wxTheApp->Initialized())
{
- topWindow->Close( TRUE );
- wxTheApp->DeletePendingObjects();
- }
- else
- {
- delete topWindow;
- wxTheApp->SetTopWindow( (wxWindow*) NULL );
+ wxTheApp->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( (wxWindow*) NULL );
+ }
+ }
+
+ retValue = wxTheApp->OnExit();
}
}
- wxTheApp->OnExit();
+ wxEntryCleanup();
- /* flush the logged messages if any */
- wxLog *log = wxLog::GetActiveTarget();
- if (log != NULL && log->HasPendingMessages())
- log->Flush();
+ return retValue;
+}
- wxApp::CleanUp();
+#ifdef __WXDEBUG__
- return retValue;
+void wxApp::OnAssert(const wxChar *file, int line, const wxChar *msg)
+{
+ m_isInAssert = TRUE;
+
+ wxAppBase::OnAssert(file, line, msg);
+
+ m_isInAssert = FALSE;
}
+#endif // __WXDEBUG__
+
projects / wxWidgets.git / blobdiff