/////////////////////////////////////////////////////////////////////////////
-// Name: app.cpp
+// Name: src/gtk1/app.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
- #pragma implementation "app.h"
-#endif
-
#ifdef __VMS
-#include <vms_jackets.h>
+// vms_jackets.h should for proper working be included before anything else
+# include <vms_jackets.h>
+#undef ConnectionNumber
#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
#include "wx/app.h"
-#include "wx/gdicmn.h"
-#include "wx/utils.h"
-#include "wx/intl.h"
-#include "wx/log.h"
-#include "wx/memory.h"
-#include "wx/font.h"
-#include "wx/settings.h"
-#include "wx/dialog.h"
-
-#if wxUSE_WX_RESOURCES
- #include "wx/resource.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/intl.h"
+ #include "wx/log.h"
+ #include "wx/utils.h"
+ #include "wx/dialog.h"
+ #include "wx/settings.h"
+ #include "wx/msgdlg.h"
+ #include "wx/memory.h"
+ #include "wx/font.h"
+ #include "wx/gdicmn.h"
+ #include "wx/image.h"
+ #include "wx/module.h"
#endif
-#include "wx/module.h"
-#include "wx/image.h"
+#include "wx/file.h"
+#include "wx/filename.h"
+#include "wx/thread.h"
+
+#ifdef __WXGPE__
+#include <gpe/init.h>
+#endif
#ifdef __WXUNIVERSAL__
#include "wx/univ/theme.h"
#endif
#include <unistd.h>
-#ifdef __VMS
-# include <poll.h>
-#else
-# include <sys/poll.h>
-#endif
-#include "wx/gtk/win_gtk.h"
-#include <gtk/gtk.h>
+#ifdef HAVE_POLL
+ #if defined(__VMS)
+ #include <poll.h>
+ #else
+ // bug in the OpenBSD headers: at least in 3.1 there is no extern "C"
+ // in neither poll.h nor sys/poll.h which results in link errors later
+ #ifdef __OPENBSD__
+ extern "C"
+ {
+ #endif
+
+ #include <sys/poll.h>
+
+ #ifdef __OPENBSD__
+ };
+ #endif
+ #endif // platform
+#else // !HAVE_POLL
+ // we implement poll() ourselves using select() which is supposed exist in
+ // all modern Unices
+ #include <sys/types.h>
+ #include <sys/time.h>
+ #include <unistd.h>
+ #ifdef HAVE_SYS_SELECT_H
+ #include <sys/select.h>
+ #endif
+#endif // HAVE_POLL/!HAVE_POLL
+
+#include "wx/unix/private.h"
+#include "wx/gtk1/win_gtk.h"
+#include <gtk/gtk.h>
//-----------------------------------------------------------------------------
// global data
//-----------------------------------------------------------------------------
-wxApp *wxTheApp = (wxApp *) NULL;
-wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL;
-
-bool g_mainThreadLocked = FALSE;
+bool g_mainThreadLocked = false;
gint g_pendingTag = 0;
static GtkWidget *gs_RootWindow = (GtkWidget*) NULL;
void wxapp_install_idle_handler();
-//-----------------------------------------------------------------------------
-// wxExit
-//-----------------------------------------------------------------------------
-
-void wxExit()
-{
- gtk_main_quit();
-}
+#if wxUSE_THREADS
+static wxMutex gs_idleTagsMutex;
+#endif
//-----------------------------------------------------------------------------
// wxYield
//-----------------------------------------------------------------------------
+// not static because used by textctrl.cpp
+//
+// MT-FIXME
+bool wxIsInsideYield = false;
+
bool wxApp::Yield(bool onlyIfNeeded)
{
- // MT-FIXME
- static bool s_inYield = FALSE;
-
- if ( s_inYield )
+ if ( wxIsInsideYield )
{
if ( !onlyIfNeeded )
{
wxFAIL_MSG( wxT("wxYield called recursively" ) );
}
- return FALSE;
+ return false;
}
#if wxUSE_THREADS
if ( !wxThread::IsMain() )
{
// can't call gtk_main_iteration() from other threads like this
- return TRUE;
+ return true;
}
#endif // wxUSE_THREADS
- s_inYield = TRUE;
+ wxIsInsideYield = 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;
- }
+ // We need to remove idle callbacks or the loop will
+ // never finish.
+ wxTheApp->RemoveIdleTag();
+#if wxUSE_LOG
// disable log flushing from here because a call to wxYield() shouldn't
// normally result in message boxes popping up &c
wxLog::Suspend();
+#endif
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
+ // 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();
+#if wxUSE_LOG
// let the logs be flashed again
wxLog::Resume();
+#endif
- s_inYield = FALSE;
+ wxIsInsideYield = false;
- return TRUE;
+ return true;
}
//-----------------------------------------------------------------------------
// wxWakeUpIdle
//-----------------------------------------------------------------------------
-void wxWakeUpIdle()
+// RR/KH: The wxMutexGui calls are not needed on GTK2 according to
+// the GTK faq, http://www.gtk.org/faq/#AEN500
+// The calls to gdk_threads_enter() and leave() are specifically noted
+// as not being necessary. The MutexGui calls are still left in for GTK1.
+// Eliminating the MutexGui calls fixes the long-standing "random" lockup
+// when using wxPostEvent (which calls WakeUpIdle) from a thread.
+
+void wxApp::WakeUpIdle()
{
#if wxUSE_THREADS
if (!wxThread::IsMain())
wxMutexGuiEnter();
-#endif
+#endif // wxUSE_THREADS_
- if (g_isIdle)
- wxapp_install_idle_handler();
+ wxapp_install_idle_handler();
#if wxUSE_THREADS
if (!wxThread::IsMain())
wxMutexGuiLeave();
-#endif
+#endif // wxUSE_THREADS_
}
//-----------------------------------------------------------------------------
// Sent idle event to all who request them.
wxTheApp->ProcessPendingEvents();
- g_pendingTag = 0;
+ {
+#if wxUSE_THREADS
+ wxMutexLocker lock(gs_idleTagsMutex);
+#endif
+ g_pendingTag = 0;
+ }
// Flush the logged messages if any.
#if wxUSE_LOG
// from some safely-looking functions
if ( wxTheApp->IsInAssert() )
{
+ // But repaint the assertion message if necessary
+ if (wxTopLevelWindows.GetCount() > 0)
+ {
+ wxWindow* win = (wxWindow*) wxTopLevelWindows.GetLast()->GetData();
+ if (win->IsKindOf(CLASSINFO(wxGenericMessageDialog)))
+ win->OnInternalIdle();
+ }
return TRUE;
}
#endif // __WXDEBUG__
// 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;
+ {
+#if wxUSE_THREADS
+ wxMutexLocker lock(gs_idleTagsMutex);
+#endif
+ 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.
#if wxUSE_THREADS
+#ifdef HAVE_POLL
+ #define wxPoll poll
+ #define wxPollFd pollfd
+#else // !HAVE_POLL
+
+typedef GPollFD wxPollFd;
+
+int wxPoll(wxPollFd *ufds, unsigned int nfds, int timeout)
+{
+ // convert timeout from ms to struct timeval (s/us)
+ timeval tv_timeout;
+ tv_timeout.tv_sec = timeout/1000;
+ tv_timeout.tv_usec = (timeout%1000)*1000;
+
+ // remember the highest fd used here
+ int fdMax = -1;
+
+ // and fill the sets for select()
+ fd_set readfds;
+ fd_set writefds;
+ fd_set exceptfds;
+ wxFD_ZERO(&readfds);
+ wxFD_ZERO(&writefds);
+ wxFD_ZERO(&exceptfds);
+
+ unsigned int i;
+ for ( i = 0; i < nfds; i++ )
+ {
+ wxASSERT_MSG( ufds[i].fd < wxFD_SETSIZE, _T("fd out of range") );
+
+ if ( ufds[i].events & G_IO_IN )
+ wxFD_SET(ufds[i].fd, &readfds);
+
+ if ( ufds[i].events & G_IO_PRI )
+ wxFD_SET(ufds[i].fd, &exceptfds);
+
+ if ( ufds[i].events & G_IO_OUT )
+ wxFD_SET(ufds[i].fd, &writefds);
+
+ if ( ufds[i].fd > fdMax )
+ fdMax = ufds[i].fd;
+ }
+
+ fdMax++;
+ int res = select(fdMax, &readfds, &writefds, &exceptfds, &tv_timeout);
+
+ // translate the results back
+ for ( i = 0; i < nfds; i++ )
+ {
+ ufds[i].revents = 0;
+
+ if ( wxFD_ISSET(ufds[i].fd, &readfds ) )
+ ufds[i].revents |= G_IO_IN;
+
+ if ( wxFD_ISSET(ufds[i].fd, &exceptfds ) )
+ ufds[i].revents |= G_IO_PRI;
+
+ if ( wxFD_ISSET(ufds[i].fd, &writefds ) )
+ ufds[i].revents |= G_IO_OUT;
+ }
+
+ return res;
+}
+
+#endif // HAVE_POLL/!HAVE_POLL
+
static gint wxapp_poll_func( GPollFD *ufds, guint nfds, gint timeout )
{
- gint res;
gdk_threads_enter();
wxMutexGuiLeave();
- g_mainThreadLocked = TRUE;
+ g_mainThreadLocked = true;
- res = poll( (struct pollfd*) ufds, nfds, timeout );
+ // we rely on the fact that glib GPollFD struct is really just pollfd but
+ // I wonder how wise is this in the long term (VZ)
+ gint res = wxPoll( (wxPollFd *) ufds, nfds, timeout );
wxMutexGuiEnter();
- g_mainThreadLocked = FALSE;
+ g_mainThreadLocked = false;
gdk_threads_leave();
void wxapp_install_idle_handler()
{
+#if wxUSE_THREADS
+ wxMutexLocker lock(gs_idleTagsMutex);
+#endif
+
+ // Don't install the handler if it's already installed. This test *MUST*
+ // be done when gs_idleTagsMutex is locked!
+ if (!g_isIdle)
+ return;
+
+ // GD: this assert is raised when using the thread sample (which works)
+ // so the test is probably not so easy. Can widget callbacks be
+ // triggered from child threads and, if so, for which widgets?
+ // wxASSERT_MSG( wxThread::IsMain() || gs_WakeUpIdle, wxT("attempt to install idle handler from widget callback in child thread (should be exclusively from wxWakeUpIdle)") );
+
wxASSERT_MSG( wxTheApp->m_idleTag == 0, wxT("attempt to install idle handler twice") );
- g_isIdle = FALSE;
+ g_isIdle = false;
if (g_pendingTag == 0)
g_pendingTag = gtk_idle_add_priority( 900, wxapp_pending_callback, (gpointer) NULL );
IMPLEMENT_DYNAMIC_CLASS(wxApp,wxEvtHandler)
BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
- EVT_IDLE(wxApp::OnIdle)
+ EVT_IDLE(wxAppBase::OnIdle)
END_EVENT_TABLE()
wxApp::wxApp()
{
- m_initialized = FALSE;
#ifdef __WXDEBUG__
- m_isInAssert = FALSE;
+ m_isInAssert = false;
#endif // __WXDEBUG__
m_idleTag = 0;
+ g_isIdle = TRUE;
wxapp_install_idle_handler();
#if wxUSE_THREADS
#endif
m_colorCube = (unsigned char*) NULL;
-
+
// this is NULL for a "regular" wxApp, but is set (and freed) by a wxGLApp
m_glVisualInfo = (void *) NULL;
+ m_glFBCInfo = (void *) NULL;
}
wxApp::~wxApp()
bool wxApp::OnInitGui()
{
if ( !wxAppBase::OnInitGui() )
- return FALSE;
+ return false;
GdkVisual *visual = gdk_visual_get_system();
// 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(
+ GdkVisual* vis = gdkx_visual_get(
((XVisualInfo *) m_glVisualInfo) ->visualid );
gtk_widget_set_default_visual( vis );
-#endif
GdkColormap *colormap = gdk_colormap_new( vis, FALSE );
gtk_widget_set_default_colormap( colormap );
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 );
}
}
- return TRUE;
+ return true;
}
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 );
- ProcessEvent( event );
-
- return event.MoreRequested();
-}
-
-void wxApp::OnIdle( wxIdleEvent &event )
-{
- static bool s_inOnIdle = FALSE;
-
- // Avoid recursion (via ProcessEvent default case)
- if (s_inOnIdle)
- return;
-
- s_inOnIdle = TRUE;
-
- // Resend in the main thread events which have been prepared in other
- // threads
- ProcessPendingEvents();
-
- // 'Garbage' collection of windows deleted with Close()
- DeletePendingObjects();
-
- // Send OnIdle events to all windows
- bool needMore = SendIdleEvents();
-
- if (needMore)
- event.RequestMore(TRUE);
-
- s_inOnIdle = FALSE;
-}
-
-bool wxApp::SendIdleEvents()
-{
- bool needMore = FALSE;
-
- wxWindowList::Node* node = wxTopLevelWindows.GetFirst();
- while (node)
- {
- wxWindow* win = node->GetData();
- if (SendIdleEvents(win))
- needMore = TRUE;
- node = node->GetNext();
- }
-
- return needMore;
-}
-
-bool wxApp::SendIdleEvents( wxWindow* win )
-{
- bool needMore = FALSE;
-
- wxIdleEvent event;
- event.SetEventObject(win);
-
- win->GetEventHandler()->ProcessEvent(event);
-
- win->OnInternalIdle();
-
- if (event.MoreRequested())
- needMore = TRUE;
-
- wxNode* node = win->GetChildren().First();
- while (node)
- {
- wxWindow* win = (wxWindow*) node->Data();
- if (SendIdleEvents(win))
- needMore = TRUE;
-
- node = node->Next();
- }
-
- return needMore;
-}
-
-int wxApp::MainLoop()
-{
- gtk_main();
- return 0;
-}
-
-void wxApp::ExitMainLoop()
-{
- if (gtk_main_level() > 0)
- gtk_main_quit();
-}
-
-bool wxApp::Initialized()
-{
- return m_initialized;
-}
-
-bool wxApp::Pending()
-{
- return (gtk_events_pending() > 0);
-}
-
-void wxApp::Dispatch()
-{
- gtk_main_iteration();
-}
-
-void wxApp::DeletePendingObjects()
-{
- wxNode *node = wxPendingDelete.First();
- while (node)
- {
- wxObject *obj = (wxObject *)node->Data();
-
- delete obj;
-
- if (wxPendingDelete.Find(obj))
- delete node;
-
- node = wxPendingDelete.First();
- }
-}
-
-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
- wxPendingEvents = new wxList();
- wxPendingEventsLocker = new wxCriticalSection();
-#endif
- wxTheColourDatabase = new wxColourDatabase( wxKEY_STRING );
- wxTheColourDatabase->Initialize();
-
- wxInitializeStockLists();
- wxInitializeStockObjects();
-
-#if wxUSE_WX_RESOURCES
- wxInitializeResourceSystem();
-#endif
-
- wxModule::RegisterModules();
- if (!wxModule::InitializeModules()) return FALSE;
+ wxASSERT( visual );
- return TRUE;
+ return visual;
}
-void wxApp::CleanUp()
+bool wxApp::Initialize(int& argc, wxChar **argv)
{
- wxModule::CleanUpModules();
-
-#if wxUSE_WX_RESOURCES
- wxCleanUpResourceSystem();
-#endif
-
- delete wxTheColourDatabase;
- wxTheColourDatabase = (wxColourDatabase*) NULL;
-
- wxDeleteStockObjects();
-
- wxDeleteStockLists();
-
- delete wxTheApp;
- wxTheApp = (wxApp*) NULL;
-
- 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(TRUE) > 0)
- {
- wxLogDebug(wxT("There were memory leaks.\n"));
- wxDebugContext::Dump();
- wxDebugContext::PrintStatistics();
- }
-#endif // Debug
-
-#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;
-#endif // wxUSE_LOG
-}
-
-//-----------------------------------------------------------------------------
-// wxEntry
-//-----------------------------------------------------------------------------
+ bool init_result;
-// 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" );
+ printf( "wxWidgets warning: GUI threading disabled due to outdated GTK version\n" );
}
else
{
- g_thread_init(NULL);
+ if (!g_thread_supported())
+ g_thread_init(NULL);
}
-#endif
+#endif // wxUSE_THREADS
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 );
-
- wxSetDetectableAutoRepeat( TRUE );
+ if (!wxOKlibc())
+ wxConvCurrent = &wxConvLocal;
+#else // !wxUSE_WCHAR_T
+ if (!wxOKlibc())
+ wxConvCurrent = (wxMBConv*) NULL;
+#endif // wxUSE_WCHAR_T/!wxUSE_WCHAR_T
- if (!wxApp::Initialize())
+#if wxUSE_UNICODE
+ // gtk_init() wants UTF-8, not wchar_t, so convert
+ int i;
+ char **argvGTK = new char *[argc + 1];
+ for ( i = 0; i < argc; i++ )
{
- gdk_threads_leave();
- return -1;
+ argvGTK[i] = wxStrdupA(wxConvUTF8.cWX2MB(argv[i]));
}
- 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();
+ argvGTK[argc] = NULL;
- gdk_threads_leave();
-}
+ int argcGTK = argc;
-
-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();
+#ifdef __WXGPE__
+ init_result = true; // is there a _check() version of this?
+ gpe_application_init( &argcGTK, &argvGTK );
+#else
+ init_result = gtk_init_check( &argcGTK, &argvGTK );
#endif
- int err = wxEntryStart(argc, argv);
- if (err)
- return err;
- if (!wxTheApp)
+ if ( argcGTK != argc )
{
- wxCHECK_MSG( wxApp::GetInitializerFunction(), -1,
- wxT("wxWindows error: No initializer - use IMPLEMENT_APP macro.\n") );
-
- wxAppInitializerFunction app_ini = wxApp::GetInitializerFunction();
-
- wxObject *test_app = app_ini();
+ // we have to drop the parameters which were consumed by GTK+
+ for ( i = 0; i < argcGTK; i++ )
+ {
+ while ( strcmp(wxConvUTF8.cWX2MB(argv[i]), argvGTK[i]) != 0 )
+ {
+ memmove(argv + i, argv + i + 1, argc - i);
+ }
+ }
- wxTheApp = (wxApp*) test_app;
+ argc = argcGTK;
}
+ //else: gtk_init() didn't modify our parameters
- 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)
+ // free our copy
+ for ( i = 0; i < argcGTK; i++ )
{
- wxTheApp->argv[mb_argc] = wxStrdup(wxConvLibc.cMB2WX(argv[mb_argc]));
- mb_argc++;
+ free(argvGTK[i]);
}
- wxTheApp->argv[mb_argc] = (wxChar *)NULL;
-#else
- wxTheApp->argv = argv;
-#endif
- wxString name(wxFileNameFromPath(argv[0]));
- wxStripExtension( name );
- wxTheApp->SetAppName( name );
+ delete [] argvGTK;
+#else // !wxUSE_UNICODE
+ // gtk_init() shouldn't actually change argv itself (just its contents) so
+ // it's ok to pass pointer to it
+ init_result = gtk_init_check( &argc, &argv );
+#endif // wxUSE_UNICODE/!wxUSE_UNICODE
- 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 (!init_result) {
+ wxLogError(wxT("Unable to initialize gtk, is DISPLAY set properly?"));
+ return false;
}
- if ( retValue == 0 )
+ // we can not enter threads before gtk_init is done
+ gdk_threads_enter();
+
+ if ( !wxAppBase::Initialize(argc, argv) )
{
- /* delete pending toplevel windows (typically a single
- dialog) so that, if there isn't any left, we don't
- call OnRun() */
- wxTheApp->DeletePendingObjects();
+ gdk_threads_leave();
- wxTheApp->m_initialized = wxTopLevelWindows.GetCount() != 0;
+ return false;
+ }
- if (wxTheApp->Initialized())
- {
- wxTheApp->OnRun();
+ wxSetDetectableAutoRepeat( TRUE );
- 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 );
- }
- }
+#if wxUSE_INTL
+ wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding());
+#endif
- retValue = wxTheApp->OnExit();
- }
- }
+ return true;
+}
- wxEntryCleanup();
+void wxApp::CleanUp()
+{
+ gdk_threads_leave();
- return retValue;
+ wxAppBase::CleanUp();
}
#ifdef __WXDEBUG__
-void wxApp::OnAssert(const wxChar *file, int line, const wxChar *msg)
+void wxApp::OnAssert(const wxChar *file, int line, const wxChar* cond, const wxChar *msg)
{
- m_isInAssert = TRUE;
+ m_isInAssert = true;
- wxAppBase::OnAssert(file, line, msg);
+ wxAppBase::OnAssert(file, line, cond, msg);
- m_isInAssert = FALSE;
+ m_isInAssert = false;
}
#endif // __WXDEBUG__
+void wxApp::RemoveIdleTag()
+{
+#if wxUSE_THREADS
+ wxMutexLocker lock(gs_idleTagsMutex);
+#endif
+ if (!g_isIdle)
+ {
+ gtk_idle_remove( wxTheApp->m_idleTag );
+ wxTheApp->m_idleTag = 0;
+ g_isIdle = true;
+ }
+}
projects / wxWidgets.git / blobdiff