X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ae53c98c9f71acb0876846b9c5b1e56adfdb6186..bb996f289574defb0ae4339ae8e46ff3cf6fa54c:/src/gtk/app.cpp diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp index 2b96d69033..823da625a2 100644 --- a/src/gtk/app.cpp +++ b/src/gtk/app.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: app.cpp +// Name: src/gtk/app.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -7,258 +7,182 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ - #pragma implementation "app.h" -#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" -#endif -#include "wx/module.h" -#include "wx/image.h" +#ifndef WX_PRECOMP + #include "wx/intl.h" + #include "wx/log.h" + #include "wx/utils.h" + #include "wx/memory.h" + #include "wx/font.h" +#endif -#if wxUSE_THREADS #include "wx/thread.h" + +#ifdef __WXGPE__ + #include #endif -#include "unistd.h" +#include "wx/apptrait.h" +#include "wx/fontmap.h" + +#if wxUSE_LIBHILDON + #include +#endif // wxUSE_LIBHILDON -#include "glib.h" -#include "gdk/gdk.h" -#include "gtk/gtk.h" +#if wxUSE_LIBHILDON2 + #include +#endif // wxUSE_LIBHILDON2 -#include "wx/gtk/win_gtk.h" +#include +#include "wx/gtk/private.h" //----------------------------------------------------------------------------- -// global data +// link GnomeVFS //----------------------------------------------------------------------------- -extern wxCursor g_globalCursor; - -wxApp *wxTheApp = (wxApp *) NULL; -wxAppInitializerFunction wxApp::m_appInitFn = (wxAppInitializerFunction) NULL; - -#if wxUSE_THREADS -extern wxList *wxPendingEvents; -extern wxCriticalSection *wxPendingEventsLocker; +#if wxUSE_MIMETYPE && wxUSE_LIBGNOMEVFS + #include "wx/link.h" + wxFORCE_LINK_MODULE(gnome_vfs) #endif -extern wxResourceCache *wxTheResourceCache; -extern bool g_isIdle; - -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 -}; //----------------------------------------------------------------------------- // local functions //----------------------------------------------------------------------------- -extern void wxFlushResources(void); - -//----------------------------------------------------------------------------- -// global functions -//----------------------------------------------------------------------------- - -void wxExit() +// One-shot signal emission hook, to install idle handler. +extern "C" { +static gboolean +wx_emission_hook(GSignalInvocationHint*, guint, const GValue*, gpointer data) { - gtk_main_quit(); + wxApp* app = wxTheApp; + if (app != NULL) + app->WakeUpIdle(); + bool* hook_installed = (bool*)data; + // record that hook is not installed + *hook_installed = false; + // remove hook + return false; +} } -/* forward declaration */ -gint wxapp_idle_callback( gpointer WXUNUSED(data) ); - -bool wxYield() +// Add signal emission hooks, to re-install idle handler when needed. +static void wx_add_idle_hooks() { - /* 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) */ - while (wxTheApp->ProcessIdle()) { } - -#if 0 - for ( wxWindowList::Node *node = wxTopLevelWindows.GetFirst(); - node; - node = node->GetNext() ) - { - wxWindow *win = node->GetData(); - win->OnInternalIdle(); - } -#endif - - if (wxTheApp->m_idleTag) + // "event" hook { - /* We need to temporarily remove idle callbacks or the loop will - never finish. */ - gtk_idle_remove( wxTheApp->m_idleTag ); - wxTheApp->m_idleTag = 0; - - while (gtk_events_pending()) - gtk_main_iteration(); - - /* re-add idle handler */ - wxTheApp->m_idleTag = gtk_idle_add( wxapp_idle_callback, (gpointer) NULL ); + static bool hook_installed; + if (!hook_installed) + { + static guint sig_id; + if (sig_id == 0) + sig_id = g_signal_lookup("event", GTK_TYPE_WIDGET); + hook_installed = true; + g_signal_add_emission_hook( + sig_id, 0, wx_emission_hook, &hook_installed, NULL); + } } - else + // "size_allocate" hook + // Needed to match the behaviour of the old idle system, + // but probably not necessary. { - while (gtk_events_pending()) - gtk_main_iteration(); + static bool hook_installed; + if (!hook_installed) + { + static guint sig_id; + if (sig_id == 0) + sig_id = g_signal_lookup("size_allocate", GTK_TYPE_WIDGET); + hook_installed = true; + g_signal_add_emission_hook( + sig_id, 0, wx_emission_hook, &hook_installed, NULL); + } } - - return TRUE; } -gint wxapp_idle_callback( gpointer WXUNUSED(data) ) +extern "C" { +static gboolean wxapp_idle_callback(gpointer) { - if (!wxTheApp) return TRUE; - -#if (GTK_MINOR_VERSION > 0) - /* when getting called from GDK's idle handler we - are no longer within GDK's grab on the GUI - thread so we must lock it here ourselves */ - GDK_THREADS_ENTER (); + return wxTheApp->DoIdle(); +} +} + +bool wxApp::DoIdle() +{ + guint id_save; + { + // Allow another idle source to be added while this one is busy. + // Needed if an idle event handler runs a new event loop, + // for example by showing a dialog. +#if wxUSE_THREADS + wxMutexLocker lock(m_idleMutex); #endif - - /* sent idle event to all who request them */ - while (wxTheApp->ProcessIdle()) { } - - /* we don't want any more idle events until the next event is - sent to wxGTK */ - gtk_idle_remove( wxTheApp->m_idleTag ); - wxTheApp->m_idleTag = 0; - - /* indicate that we are now in idle mode - even so deeply - in idle mode that we don't get any idle events anymore. - this is like wxMSW where an idle event is sent only - once each time after the event queue has been completely - emptied */ - g_isIdle = TRUE; - -#if (GTK_MINOR_VERSION > 0) - /* release lock again */ - GDK_THREADS_LEAVE (); + id_save = m_idleSourceId; + m_idleSourceId = 0; + wx_add_idle_hooks(); + +#if wxDEBUG_LEVEL + // don't generate the idle events while the assert modal dialog is shown, + // this matches the behaviour of wxMSW + if (m_isInAssert) + return false; #endif + } - return TRUE; -} + gdk_threads_enter(); + bool needMore; + do { + ProcessPendingEvents(); -void wxapp_install_idle_handler() -{ - wxASSERT_MSG( wxTheApp->m_idleTag == 0, _T("attempt to install idle handler twice") ); + needMore = ProcessIdle(); + } while (needMore && gtk_events_pending() == 0); + gdk_threads_leave(); + +#if wxUSE_THREADS + wxMutexLocker lock(m_idleMutex); +#endif + // if a new idle source was added during ProcessIdle + if (m_idleSourceId != 0) + { + // remove it + g_source_remove(m_idleSourceId); + m_idleSourceId = 0; + } - /* this routine gets called by all event handlers - indicating that the idle is over. */ + // Pending events can be added asynchronously, + // need to keep idle source if any have appeared + if (HasPendingEvents()) + needMore = true; - wxTheApp->m_idleTag = gtk_idle_add( wxapp_idle_callback, (gpointer) NULL ); - - g_isIdle = FALSE; + // if more idle processing requested + if (needMore) + { + // keep this source installed + m_idleSourceId = id_save; + return true; + } + // add hooks and remove this source + wx_add_idle_hooks(); + return false; } -#if wxUSE_THREADS -static gint wxapp_wakeup_timerout_callback( gpointer WXUNUSED(data) ) +//----------------------------------------------------------------------------- +// Access to the root window global +//----------------------------------------------------------------------------- + +GtkWidget* wxGetRootWindow() { - gtk_timeout_remove( wxTheApp->m_wakeUpTimerTag ); - wxTheApp->m_wakeUpTimerTag = 0; - -#if (GTK_MINOR_VERSION > 0) - /* 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 (); -#endif - - /* unblock other threads wishing to do some GUI things */ - wxMutexGuiLeave(); - - /* wake up other threads */ - wxUsleep( 1 ); - - /* block other thread again */ - wxMutexGuiEnter(); - -#if (GTK_MINOR_VERSION > 0) - /* release lock again */ - GDK_THREADS_LEAVE (); -#endif - - wxTheApp->m_wakeUpTimerTag = gtk_timeout_add( 20, wxapp_wakeup_timerout_callback, (gpointer) NULL ); - - return TRUE; + static GtkWidget *s_RootWindow = NULL; + + if (s_RootWindow == NULL) + { + s_RootWindow = gtk_window_new( GTK_WINDOW_TOPLEVEL ); + gtk_widget_realize( s_RootWindow ); + } + return s_RootWindow; } -#endif //----------------------------------------------------------------------------- // wxApp @@ -266,495 +190,352 @@ static gint wxapp_wakeup_timerout_callback( gpointer WXUNUSED(data) ) IMPLEMENT_DYNAMIC_CLASS(wxApp,wxEvtHandler) -BEGIN_EVENT_TABLE(wxApp, wxEvtHandler) - EVT_IDLE(wxApp::OnIdle) -END_EVENT_TABLE() - wxApp::wxApp() { - wxTheApp = this; - - m_topWindow = (wxWindow *) NULL; - m_exitOnFrameDelete = TRUE; - - m_idleTag = gtk_idle_add( wxapp_idle_callback, (gpointer) NULL ); - -#if wxUSE_THREADS - m_wakeUpTimerTag = gtk_timeout_add( 20, wxapp_wakeup_timerout_callback, (gpointer) NULL ); -#endif - - m_colorCube = (unsigned char*) NULL; + m_isInAssert = false; + m_idleSourceId = 0; } wxApp::~wxApp() { - if (m_idleTag) gtk_idle_remove( m_idleTag ); - -#if wxUSE_THREADS - if (m_wakeUpTimerTag) gtk_timeout_remove( m_wakeUpTimerTag ); -#endif - - if (m_colorCube) free(m_colorCube); } -bool wxApp::OnInitGui() +bool wxApp::SetNativeTheme(const wxString& theme) { - /* Nothing to do for 15, 16, 24, 32 bit displays */ - - 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 ); - - 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; + wxString path; + path = gtk_rc_get_theme_dir(); + path += "/"; + path += theme.utf8_str(); + path += "/gtk-2.0/gtkrc"; + + if ( wxFileExists(path.utf8_str()) ) + gtk_rc_add_default_file(path.utf8_str()); + else if ( wxFileExists(theme.utf8_str()) ) + gtk_rc_add_default_file(theme.utf8_str()); + else + { + wxLogWarning("Theme \"%s\" not available.", theme); - gdk_color_alloc( cmap, &col ); - } + return false; + } - gtk_widget_set_default_colormap( cmap ); - */ + gtk_rc_reparse_all_for_settings(gtk_settings_get_default(), TRUE); - /* initialize color cube for 8-bit color reduction dithering */ + return true; +} - GdkColormap *cmap = gtk_widget_get_default_colormap(); +bool wxApp::OnInitGui() +{ + if ( !wxAppBase::OnInitGui() ) + return false; - m_colorCube = (unsigned char*)malloc(32 * 32 * 32); +#ifndef __WXGTK3__ + // if this is a wxGLApp (derived from wxApp), and we've already + // chosen a specific visual, then derive the GdkVisual from that + if ( GetXVisualInfo() ) + { + GdkVisual* vis = gtk_widget_get_default_visual(); - for (int r = 0; r < 32; r++) + GdkColormap *colormap = gdk_colormap_new( vis, FALSE ); + gtk_widget_set_default_colormap( colormap ); + } + else { - for (int g = 0; g < 32; g++) + // On some machines, the default visual is just 256 colours, so + // we make sure we get the best. This can sometimes be wasteful. + if (m_useBestVisual) { - for (int b = 0; b < 32; b++) + if (m_forceTrueColour) { - int rr = (r << 3) | (r >> 2); - int gg = (g << 3) | (g >> 2); - int bb = (b << 3) | (b >> 2); - - int index = -1; - - GdkColor *colors = cmap->colors; - if (colors) + GdkVisual* visual = gdk_visual_get_best_with_both( 24, GDK_VISUAL_TRUE_COLOR ); + if (!visual) + { + wxLogError(wxT("Unable to initialize TrueColor visual.")); + return false; + } + GdkColormap *colormap = gdk_colormap_new( visual, FALSE ); + gtk_widget_set_default_colormap( colormap ); + } + else + { + if (gdk_visual_get_best() != gdk_visual_get_system()) { - 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; - } - } + GdkVisual* visual = gdk_visual_get_best(); + GdkColormap *colormap = gdk_colormap_new( visual, FALSE ); + gtk_widget_set_default_colormap( colormap ); } - else - { - /* 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; } } } +#endif - return TRUE; -} - -bool wxApp::ProcessIdle() -{ - wxIdleEvent event; - event.SetEventObject( this ); - ProcessEvent( event ); +#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2 + if ( !GetHildonProgram() ) + { + wxLogError(_("Unable to initialize Hildon program")); + return false; + } +#endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2 - return event.MoreRequested(); + return true; } -void wxApp::OnIdle( wxIdleEvent &event ) +// use unusual names for the parameters to avoid conflict with wxApp::arg[cv] +bool wxApp::Initialize(int& argc_, wxChar **argv_) { - static bool inOnIdle = FALSE; - - /* Avoid recursion (via ProcessEvent default case) */ - if (inOnIdle) - return; - - inOnIdle = TRUE; + if ( !wxAppBase::Initialize(argc_, argv_) ) + return false; #if wxUSE_THREADS - /* Resend in the main thread events which have been prepared in other - threads */ - ProcessPendingEvents(); -#endif + if (!g_thread_supported()) + { + g_thread_init(NULL); + gdk_threads_init(); + } +#endif // wxUSE_THREADS - /* 'Garbage' collection of windows deleted with Close(). */ - DeletePendingObjects(); + // gtk+ 2.0 supports Unicode through UTF-8 strings + wxConvCurrent = &wxConvUTF8; + +#ifdef __UNIX__ + // decide which conversion to use for the file names + + // (1) this variable exists for the sole purpose of specifying the encoding + // of the filenames for GTK+ programs, so use it if it is set + wxString encName(wxGetenv(wxT("G_FILENAME_ENCODING"))); + encName = encName.BeforeFirst(wxT(',')); + if (encName.CmpNoCase(wxT("@locale")) == 0) + encName.clear(); + encName.MakeUpper(); +#if wxUSE_INTL + if (encName.empty()) + { + // (2) if a non default locale is set, assume that the user wants his + // filenames in this locale too + encName = wxLocale::GetSystemEncodingName().Upper(); - /* flush the logged messages if any */ -#if wxUSE_LOG - wxLog *log = wxLog::GetActiveTarget(); - if (log != NULL && log->HasPendingMessages()) - log->Flush(); -#endif // wxUSE_LOG + // But don't consider ASCII in this case. + if ( !encName.empty() ) + { +#if wxUSE_FONTMAP + wxFontEncoding enc = wxFontMapperBase::GetEncodingFromName(encName); + if ( enc == wxFONTENCODING_DEFAULT ) +#else // !wxUSE_FONTMAP + if ( encName == wxT("US-ASCII") ) +#endif // wxUSE_FONTMAP/!wxUSE_FONTMAP + { + // This means US-ASCII when returned from GetEncodingFromName(). + encName.clear(); + } + } - /* Send OnIdle events to all windows */ - bool needMore = SendIdleEvents(); + // (3) finally use UTF-8 by default + if ( encName.empty() ) + encName = wxT("UTF-8"); + wxSetEnv(wxT("G_FILENAME_ENCODING"), encName); + } +#else + if (encName.empty()) + encName = wxT("UTF-8"); - if (needMore) - event.RequestMore(TRUE); + // if wxUSE_INTL==0 it probably indicates that only "C" locale is supported + // by the program anyhow so prevent GTK+ from calling setlocale(LC_ALL, "") + // from gtk_init_check() as it does by default + gtk_disable_setlocale(); - inOnIdle = FALSE; -} +#endif // wxUSE_INTL + static wxConvBrokenFileNames fileconv(encName); + wxConvFileName = &fileconv; +#endif // __UNIX__ -bool wxApp::SendIdleEvents() -{ - bool needMore = FALSE; - wxWindowList::Node* node = wxTopLevelWindows.GetFirst(); - while (node) + bool init_result; + int i; + +#if wxUSE_UNICODE + // gtk_init() wants UTF-8, not wchar_t, so convert + char **argvGTK = new char *[argc_ + 1]; + for ( i = 0; i < argc_; i++ ) { - wxWindow* win = node->GetData(); - if (SendIdleEvents(win)) - needMore = TRUE; - node = node->GetNext(); + argvGTK[i] = wxStrdupA(wxConvUTF8.cWX2MB(argv_[i])); } - return needMore; -} - -bool wxApp::SendIdleEvents( wxWindow* win ) -{ - bool needMore = FALSE; - - wxIdleEvent event; - event.SetEventObject(win); + argvGTK[argc_] = NULL; - win->OnInternalIdle(); + int argcGTK = argc_; - win->ProcessEvent(event); - - if (event.MoreRequested()) - needMore = TRUE; +#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 ) != 0; +#endif + wxUpdateLocaleIsUtf8(); - wxNode* node = win->GetChildren().First(); - while (node) + if ( argcGTK != argc_ ) { - wxWindow* win = (wxWindow*) node->Data(); - if (SendIdleEvents(win)) - needMore = TRUE; + // 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)*sizeof(*argv_)); + } + } - node = node->Next(); + argc_ = argcGTK; + argv_[argc_] = NULL; } - return needMore ; -} - -int wxApp::MainLoop() -{ - gtk_main(); - return 0; -} - -void wxApp::ExitMainLoop() -{ - gtk_main_quit(); -} - -bool wxApp::Initialized() -{ - return m_initialized; -} + //else: gtk_init() didn't modify our parameters -bool wxApp::Pending() -{ - return (gtk_events_pending() > 0); -} + // free our copy + for ( i = 0; i < argcGTK; i++ ) + { + free(argvGTK[i]); + } -void wxApp::Dispatch() -{ - gtk_main_iteration(); -} + 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 -#if wxUSE_THREADS -void wxApp::ProcessPendingEvents() -{ - wxNode *node = wxPendingEvents->First(); - wxCriticalSectionLocker locker(*wxPendingEventsLocker); + // update internal arg[cv] as GTK+ may have removed processed options: + this->argc = argc_; + this->argv = argv_; - while (node) + if ( m_traits ) { - wxEvtHandler *handler = (wxEvtHandler *)node->Data(); - - handler->ProcessPendingEvents(); - - delete node; + // if there are still GTK+ standard options unparsed in the command + // line, it means that they were not syntactically correct and GTK+ + // already printed a warning on the command line and we should now + // exit: + wxArrayString opt, desc; + m_traits->GetStandardCmdLineOptions(opt, desc); + + for ( i = 0; i < argc_; i++ ) + { + // leave just the names of the options with values + const wxString str = wxString(argv_[i]).BeforeFirst('='); - node = wxPendingEvents->First(); + for ( size_t j = 0; j < opt.size(); j++ ) + { + // remove the leading spaces from the option string as it does + // have them + if ( opt[j].Trim(false).BeforeFirst('=') == str ) + { + // a GTK+ option can be left on the command line only if + // there was an error in (or before, in another standard + // options) it, so abort, just as we do if incorrect + // program option is given + wxLogError(_("Invalid GTK+ command line option, use \"%s --help\""), + argv_[0]); + return false; + } + } + } } -} -#endif // wxUSE_THREADS -void wxApp::DeletePendingObjects() -{ - wxNode *node = wxPendingDelete.First(); - while (node) + if ( !init_result ) { - wxObject *obj = (wxObject *)node->Data(); + wxLogError(_("Unable to initialize GTK+, is DISPLAY set properly?")); + return false; + } - delete obj; + // we cannot enter threads before gtk_init is done + gdk_threads_enter(); - if (wxPendingDelete.Find(obj)) - delete node; +#if wxUSE_INTL + wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding()); +#endif - node = wxPendingDelete.First(); - } -} + // make sure GtkWidget type is loaded, idle hooks need it + g_type_class_ref(GTK_TYPE_WIDGET); + WakeUpIdle(); -wxWindow *wxApp::GetTopWindow() -{ - if (m_topWindow) - return m_topWindow; - else if (wxTopLevelWindows.GetCount() > 0) - return wxTopLevelWindows.GetFirst()->GetData(); - else - return NULL; + return true; } -void wxApp::SetTopWindow( wxWindow *win ) +void wxApp::CleanUp() { - m_topWindow = win; -} + if (m_idleSourceId != 0) + g_source_remove(m_idleSourceId); -bool wxApp::Initialize() -{ - wxBuffer = new wxChar[BUFSIZ + 512]; + // release reference acquired by Initialize() + g_type_class_unref(g_type_class_peek(GTK_TYPE_WIDGET)); - wxClassInfo::InitializeClasses(); + gdk_threads_leave(); - wxSystemSettings::Init(); + wxAppBase::CleanUp(); +} - // 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. +void wxApp::WakeUpIdle() +{ #if wxUSE_THREADS - wxPendingEvents = new wxList(); - wxPendingEventsLocker = new wxCriticalSection(); -#endif - -/* - wxTheFontNameDirectory = new wxFontNameDirectory; - wxTheFontNameDirectory->Initialize(); -*/ - - wxTheColourDatabase = new wxColourDatabase( wxKEY_STRING ); - wxTheColourDatabase->Initialize(); - - wxInitializeStockLists(); - wxInitializeStockObjects(); - -#if wxUSE_WX_RESOURCES - wxTheResourceCache = new wxResourceCache( wxKEY_STRING ); - - wxInitializeResourceSystem(); + wxMutexLocker lock(m_idleMutex); #endif - - wxImage::InitStandardHandlers(); - - g_globalCursor = wxCursor(wxCURSOR_DEFAULT); - - wxModule::RegisterModules(); - if (!wxModule::InitializeModules()) return FALSE; - - return TRUE; + if (m_idleSourceId == 0) + m_idleSourceId = g_idle_add_full(G_PRIORITY_LOW, wxapp_idle_callback, NULL, NULL); } -void wxApp::CleanUp() +// Checking for pending events requires first removing our idle source, +// otherwise it will cause the check to always return true. +bool wxApp::EventsPending() { - wxModule::CleanUpModules(); - -#if wxUSE_WX_RESOURCES - wxFlushResources(); - - if (wxTheResourceCache) - delete wxTheResourceCache; - wxTheResourceCache = (wxResourceCache*) NULL; - - wxCleanUpResourceSystem(); -#endif - - if (wxTheColourDatabase) - delete wxTheColourDatabase; - wxTheColourDatabase = (wxColourDatabase*) NULL; - -/* - if (wxTheFontNameDirectory) delete wxTheFontNameDirectory; - wxTheFontNameDirectory = (wxFontNameDirectory*) NULL; -*/ - - wxDeleteStockObjects(); - - wxDeleteStockLists(); - - wxImage::CleanUpHandlers(); - - delete wxTheApp; - wxTheApp = (wxApp*) 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. #if wxUSE_THREADS - delete wxPendingEvents; - delete wxPendingEventsLocker; + wxMutexLocker lock(m_idleMutex); #endif - - wxSystemSettings::Done(); - - delete[] wxBuffer; - - wxClassInfo::CleanUpClasses(); - - // check for memory leaks -#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT - if (wxDebugContext::CountObjectsLeft() > 0) + if (m_idleSourceId != 0) { - wxLogDebug(_T("There were memory leaks.\n")); - wxDebugContext::Dump(); - wxDebugContext::PrintStatistics(); + g_source_remove(m_idleSourceId); + m_idleSourceId = 0; + wx_add_idle_hooks(); } -#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; + return gtk_events_pending() != 0; } -wxLog *wxApp::CreateLogTarget() +void wxApp::OnAssertFailure(const wxChar *file, + int line, + const wxChar* func, + const wxChar* cond, + const wxChar *msg) { - return new wxLogGui; + // there is no need to do anything if asserts are disabled in this build + // anyhow +#if wxDEBUG_LEVEL + // block wx idle events while assert dialog is showing + m_isInAssert = true; + + wxAppBase::OnAssertFailure(file, line, func, cond, msg); + + m_isInAssert = false; +#else // !wxDEBUG_LEVEL + wxUnusedVar(file); + wxUnusedVar(line); + wxUnusedVar(func); + wxUnusedVar(cond); + wxUnusedVar(msg); +#endif // wxDEBUG_LEVEL/!wxDEBUG_LEVEL } -#endif // wxUSE_LOG - -//----------------------------------------------------------------------------- -// wxEntry -//----------------------------------------------------------------------------- -int wxEntry( int argc, char *argv[] ) +#if wxUSE_THREADS +void wxGUIAppTraits::MutexGuiEnter() { - gtk_set_locale(); - - if (!wxOKlibc()) wxConvCurrent = &wxConvLocal; - - gtk_init( &argc, &argv ); - - wxSetDetectableAutoRepeat( TRUE ); - - if (!wxApp::Initialize()) - return -1; - - if (!wxTheApp) - { - wxCHECK_MSG( wxApp::GetInitializerFunction(), -1, - _T("wxWindows error: No initializer - use IMPLEMENT_APP macro.\n") ); - - wxAppInitializerFunction app_ini = wxApp::GetInitializerFunction(); - - wxObject *test_app = app_ini(); - - wxTheApp = (wxApp*) test_app; - } - - wxCHECK_MSG( wxTheApp, -1, _T("wxWindows error: no application object") ); - - wxTheApp->argc = argc; - wxTheApp->argv = argv; - - wxString name(wxFileNameFromPath(argv[0])); - wxStripExtension( name ); - wxTheApp->SetAppName( name ); - - int retValue = 0; - - if ( !wxTheApp->OnInitGui() ) - retValue = -1; - - // Here frames insert themselves automatically into wxTopLevelWindows by - // getting created in OnInit(). - if ( retValue == 0 ) - { - if ( !wxTheApp->OnInit() ) - retValue = -1; - } - - 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(); - - wxTheApp->m_initialized = wxTopLevelWindows.GetCount() != 0; - - if (wxTheApp->Initialized()) - { - retValue = 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 ); - } - } - wxTheApp->OnExit(); - } - } - -#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 + gdk_threads_enter(); +} - wxApp::CleanUp(); +void wxGUIAppTraits::MutexGuiLeave() +{ + gdk_threads_leave(); +} +#endif // wxUSE_THREADS - return retValue; +#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2 +// Maemo-specific method: get the main program object +HildonProgram *wxApp::GetHildonProgram() +{ + return hildon_program_get_instance(); } +#endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2