#pragma implementation "app.h"
#endif
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
#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/filename.h"
#include "wx/module.h"
#include "wx/image.h"
+#include "wx/thread.h"
+
+#ifdef __WXGPE__
+#include <gpe/init.h>
+#endif
#ifdef __WXUNIVERSAL__
#include "wx/univ/theme.h"
#include <gtk/gtk.h>
-
//-----------------------------------------------------------------------------
// global data
//-----------------------------------------------------------------------------
void wxapp_install_idle_handler();
+#if wxUSE_THREADS
+static wxMutex gs_idleTagsMutex;
+#endif
+
//-----------------------------------------------------------------------------
// wxYield
//-----------------------------------------------------------------------------
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();
// disable log flushing from here because a call to wxYield() shouldn't
// normally result in message boxes popping up &c
// 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()
{
+#ifndef __WXGTK20__
#if wxUSE_THREADS
if (!wxThread::IsMain())
wxMutexGuiEnter();
-#endif
+#endif // wxUSE_THREADS_
+#endif // __WXGTK2__
- if (g_isIdle)
- wxapp_install_idle_handler();
+ wxapp_install_idle_handler();
+#ifndef __WXGTK20__
#if wxUSE_THREADS
if (!wxThread::IsMain())
wxMutexGuiLeave();
-#endif
+#endif // wxUSE_THREADS_
+#endif // __WXGTK2__
}
//-----------------------------------------------------------------------------
// 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
// 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.
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?
wxApp::wxApp()
{
- m_initialized = FALSE;
#ifdef __WXDEBUG__
m_isInAssert = FALSE;
#endif // __WXDEBUG__
m_idleTag = 0;
+ g_isIdle = TRUE;
wxapp_install_idle_handler();
#if wxUSE_THREADS
// 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()
return visual;
}
-int wxApp::MainLoop()
-{
- gtk_main();
- return 0;
-}
-
-void wxApp::Exit()
-{
- // VZ: no idea why is it different from ExitMainLoop() but this is what
- // wxExit() used to do
- gtk_main_quit();
-}
-
-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();
-}
-
bool wxApp::Initialize(int& argc, wxChar **argv)
{
+ bool init_result;
+
#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 // wxUSE_THREADS
wxConvCurrent = (wxMBConv*) NULL;
#endif // wxUSE_WCHAR_T/!wxUSE_WCHAR_T
+#ifdef __WXGTK20__
+ m_convBrokenFileNames = new wxConvBrokenFileNames;
+ m_oldConvFileName = wxConvFileName;
+ wxConvFileName = m_convBrokenFileNames;
+#endif
+
#if wxUSE_UNICODE
// gtk_init() wants UTF-8, not wchar_t, so convert
int i;
argvGTK[argc] = NULL;
int argcGTK = argc;
- gtk_init( &argcGTK, &argvGTK );
+
+#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
if ( argcGTK != argc )
{
#else // !wxUSE_UNICODE
// gtk_init() shouldn't actually change argv itself (just its contents) so
// it's ok to pass pointer to it
- gtk_init( &argc, &argv );
+ init_result = gtk_init_check( &argc, &argv );
#endif // wxUSE_UNICODE/!wxUSE_UNICODE
+ if (!init_result) {
+ wxLogError(wxT("Unable to initialize gtk, is DISPLAY set properly?"));
+ return false;
+ }
+
// we can not enter threads before gtk_init is done
gdk_threads_enter();
wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding());
#endif
- wxGetRootWindow();
-
return true;
}
void wxApp::CleanUp()
{
+#ifdef __WXGTK20__
+ delete m_convBrokenFileNames;
+ wxConvFileName = m_oldConvFileName;
+#endif
+
gdk_threads_leave();
wxAppBase::CleanUp();
#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