/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
- #pragma implementation "appbase.h"
#pragma implementation "app.h"
#endif
#include "wx/thread.h"
#endif
-#include "unistd.h"
+#include <unistd.h>
-#include "glib.h"
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include <glib.h>
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
#include "wx/gtk/win_gtk.h"
wxApp *wxTheApp = (wxApp *) NULL;
wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL;
-#if wxUSE_THREADS
-extern wxList *wxPendingEvents;
-extern wxCriticalSection *wxPendingEventsLocker;
-#endif
extern wxResourceCache *wxTheResourceCache;
extern bool g_isIdle;
// local functions
//-----------------------------------------------------------------------------
-extern void wxFlushResources(void);
+extern void wxFlushResources();
+
+/* forward declaration */
+gint wxapp_idle_callback( gpointer WXUNUSED(data) );
+void wxapp_install_idle_handler();
+
+#if wxUSE_THREADS
+gint wxapp_wakeup_timerout_callback( gpointer WXUNUSED(data) );
+#endif
//-----------------------------------------------------------------------------
-// global functions
+// wxExit
//-----------------------------------------------------------------------------
void wxExit()
gtk_main_quit();
}
-/* forward declaration */
-gint wxapp_idle_callback( gpointer WXUNUSED(data) );
+//-----------------------------------------------------------------------------
+// wxYield
+//-----------------------------------------------------------------------------
bool wxYield()
{
bool has_idle = (wxTheApp->m_idleTag != 0);
-
+
if (has_idle)
{
/* We need to temporarily remove idle callbacks or the loop will
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 (has_idle)
{
/* re-add idle handler */
wxTheApp->m_idleTag = gtk_idle_add( wxapp_idle_callback, (gpointer) NULL );
}
-
+
return TRUE;
}
+//-----------------------------------------------------------------------------
+// wxWakeUpIdle
+//-----------------------------------------------------------------------------
+
+void wxWakeUpIdle()
+{
+ if (g_isIdle)
+ wxapp_install_idle_handler();
+}
+
+//-----------------------------------------------------------------------------
+// local functions
+//-----------------------------------------------------------------------------
+
gint wxapp_idle_callback( gpointer WXUNUSED(data) )
{
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
void wxapp_install_idle_handler()
{
- wxASSERT_MSG( wxTheApp->m_idleTag == 0, _T("attempt to install idle handler twice") );
+ wxASSERT_MSG( wxTheApp->m_idleTag == 0, wxT("attempt to install idle handler twice") );
- /* this routine gets called by all event handlers
- indicating that the idle is over. */
+ /* 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). */
+
+#if wxUSE_THREADS
+ if (!wxThread::IsMain())
+ GDK_THREADS_ENTER ();
+#endif
wxTheApp->m_idleTag = gtk_idle_add( wxapp_idle_callback, (gpointer) NULL );
g_isIdle = FALSE;
+
+#if wxUSE_THREADS
+ if (!wxThread::IsMain())
+ GDK_THREADS_LEAVE ();
+#endif
}
#if wxUSE_THREADS
-/* forward declaration */
-static gint wxapp_wakeup_timerout_callback( gpointer WXUNUSED(data) );
-
void wxapp_install_thread_wakeup()
{
if (wxTheApp->m_wakeUpTimerTag) return;
-
+
wxTheApp->m_wakeUpTimerTag = gtk_timeout_add( 100, wxapp_wakeup_timerout_callback, (gpointer) NULL );
}
void wxapp_uninstall_thread_wakeup()
{
if (!wxTheApp->m_wakeUpTimerTag) return;
-
+
gtk_timeout_remove( wxTheApp->m_wakeUpTimerTag );
wxTheApp->m_wakeUpTimerTag = 0;
}
-static gint wxapp_wakeup_timerout_callback( gpointer WXUNUSED(data) )
+gint wxapp_wakeup_timerout_callback( gpointer WXUNUSED(data) )
{
wxapp_uninstall_thread_wakeup();
return TRUE;
}
-#endif
+
+#endif // wxUSE_THREADS
//-----------------------------------------------------------------------------
// wxApp
index |= (g >> (5 - vis->green_prec)) << vis->green_shift;
index |= (b >> (5 - vis->blue_prec)) << vis->blue_shift;
#else
- wxFAIL_MSG( _T("Unsupported graphics hardware") );
+ wxFAIL_MSG( wxT("Unsupported graphics hardware") );
#endif
}
m_colorCube[ (r*1024) + (g*32) + b ] = index;
event.SetEventObject( this );
ProcessEvent( event );
- wxWindowList::Node* node = wxTopLevelWindows.GetFirst();
- while (node)
- {
- wxWindow* win = node->GetData();
- win->OnInternalIdle();
- node = node->GetNext();
- }
-
return event.MoreRequested();
}
s_inOnIdle = TRUE;
-#if wxUSE_THREADS
/* Resend in the main thread events which have been prepared in other
threads */
ProcessPendingEvents();
-#endif
/* 'Garbage' collection of windows deleted with Close(). */
DeletePendingObjects();
win->ProcessEvent(event);
+ win->OnInternalIdle();
+
if (event.MoreRequested())
needMore = TRUE;
gtk_main_iteration();
}
-#if wxUSE_THREADS
-void wxApp::ProcessPendingEvents()
-{
- wxNode *node = wxPendingEvents->First();
- wxCriticalSectionLocker locker(*wxPendingEventsLocker);
-
- while (node)
- {
- wxEvtHandler *handler = (wxEvtHandler *)node->Data();
-
- handler->ProcessPendingEvents();
-
- delete node;
-
- node = wxPendingEvents->First();
- }
-}
-#endif // wxUSE_THREADS
-
void wxApp::DeletePendingObjects()
{
wxNode *node = wxPendingDelete.First();
wxInitializeResourceSystem();
#endif
- wxImage::InitStandardHandlers();
-
wxModule::RegisterModules();
if (!wxModule::InitializeModules()) return FALSE;
wxDeleteStockLists();
- wxImage::CleanUpHandlers();
-
delete wxTheApp;
wxTheApp = (wxApp*) NULL;
#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
if (wxDebugContext::CountObjectsLeft() > 0)
{
- wxLogDebug(_T("There were memory leaks.\n"));
+ wxLogDebug(wxT("There were memory leaks.\n"));
wxDebugContext::Dump();
wxDebugContext::PrintStatistics();
}
wxLog *oldLog = wxLog::SetActiveTarget( (wxLog*) NULL );
if (oldLog)
delete oldLog;
-}
-
#endif // wxUSE_LOG
+}
//-----------------------------------------------------------------------------
// wxEntry
{
gtk_set_locale();
+#if wxUSE_WCHAR_T
if (!wxOKlibc()) wxConvCurrent = &wxConvLocal;
+#else
+ if (!wxOKlibc()) wxConvCurrent = (wxMBConv*) NULL;
+#endif
gtk_init( &argc, &argv );
if (!wxTheApp)
{
wxCHECK_MSG( wxApp::GetInitializerFunction(), -1,
- _T("wxWindows error: No initializer - use IMPLEMENT_APP macro.\n") );
+ wxT("wxWindows error: No initializer - use IMPLEMENT_APP macro.\n") );
wxAppInitializerFunction app_ini = wxApp::GetInitializerFunction();
wxTheApp = (wxApp*) test_app;
}
- wxCHECK_MSG( wxTheApp, -1, _T("wxWindows error: no application object") );
+ wxCHECK_MSG( wxTheApp, -1, wxT("wxWindows error: no application object") );
wxTheApp->argc = argc;
#if wxUSE_UNICODE
return wxIcon(warning_xpm);
default:
- wxFAIL_MSG(_T("requested non existent standard icon"));
+ wxFAIL_MSG(wxT("requested non existent standard icon"));
// still fall through
case wxICON_HAND:
projects / wxWidgets.git / blobdiff