#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"
#endif
#include "wx/file.h"
#include "wx/filename.h"
-#include "wx/module.h"
#include "wx/thread.h"
#ifdef __WXGPE__
//-----------------------------------------------------------------------------
bool g_mainThreadLocked = false;
-gint g_pendingTag = 0;
static GtkWidget *gs_RootWindow = (GtkWidget*) NULL;
// We need to remove idle callbacks or the loop will
// never finish.
- wxTheApp->RemoveIdleTag();
+ RemoveIdleSource();
#if wxUSE_LOG
// disable log flushing from here because a call to wxYield() shouldn't
extern "C"
{
-static gint wxapp_pending_callback( gpointer WXUNUSED(data) )
+// One-shot emission hook for "event" signal, to install idle handler.
+// This will be called when the "event" signal is issued on any GtkWidget object.
+static gboolean
+event_emission_hook(GSignalInvocationHint*, guint, const GValue*, gpointer)
{
- 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();
+ wxapp_install_idle_handler();
+ // remove hook
+ return false;
+}
+// add emission hook for "event" signal, to re-install idle handler when needed
+static inline void wxAddEmissionHook()
+{
+ GType widgetType = GTK_TYPE_WIDGET;
+ // if GtkWidget type is loaded
+ if (g_type_class_peek(widgetType) != NULL)
{
-#if wxUSE_THREADS
- wxMutexLocker lock(gs_idleTagsMutex);
-#endif
- g_pendingTag = 0;
+ guint sig_id = g_signal_lookup("event", widgetType);
+ g_signal_add_emission_hook(sig_id, 0, event_emission_hook, NULL, NULL);
}
-
- // 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;
+ return false;
#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() )
- {
- // But repaint the assertion message if necessary
- if (wxTopLevelWindows.GetCount() > 0)
- {
- wxWindow* win = (wxWindow*) wxTopLevelWindows.GetLast()->GetData();
- if (win->IsKindOf(CLASSINFO(wxMessageDialog)))
- win->OnInternalIdle();
- }
- return TRUE;
- }
+ return false;
#endif // __WXDEBUG__
// When getting called from GDK's time-out handler
// 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.
- {
-#if wxUSE_THREADS
- wxMutexLocker lock(gs_idleTagsMutex);
-#endif
- g_isIdle = true;
- wxTheApp->m_idleTag = 0;
- }
-
bool moreIdles;
// Send idle event to all who request them as long as
// Release lock again
gdk_threads_leave();
+ if (!moreIdles)
+ {
+#if wxUSE_THREADS
+ wxMutexLocker lock(gs_idleTagsMutex);
+#endif
+ // 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;
+
+ wxAddEmissionHook();
+ }
+
// Return FALSE if no more idle events are to be sent
return moreIdles;
}
unsigned int i;
for ( i = 0; i < nfds; i++ )
{
- wxASSERT_MSG( ufds[i].fd < wxFD_SETSIZE, _T("fd out of range") );
+ wxASSERT_MSG( ufds[i].fd < FD_SETSIZE, _T("fd out of range") );
if ( ufds[i].events & G_IO_IN )
wxFD_SET(ufds[i].fd, &readfds);
void wxapp_install_idle_handler()
{
+ if (wxTheApp == NULL)
+ return;
+
#if wxUSE_THREADS
wxMutexLocker lock(gs_idleTagsMutex);
#endif
g_isIdle = false;
- if (g_pendingTag == 0)
- g_pendingTag = g_idle_add_full( 900, wxapp_pending_callback, NULL, 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 = g_idle_add_full( 1000, wxapp_idle_callback, NULL, NULL );
+ wxTheApp->m_idleTag = g_idle_add_full(G_PRIORITY_LOW, wxapp_idle_callback, NULL, NULL);
}
//-----------------------------------------------------------------------------
// chosen a specific visual, then derive the GdkVisual from that
if (m_glVisualInfo != NULL)
{
- // seems gtk_widget_set_default_visual no longer exists?
GdkVisual* vis = gtk_widget_get_default_visual();
GdkColormap *colormap = gdk_colormap_new( vis, FALSE );
gtk_widget_set_default_colormap( colormap );
}
-
- // 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))
{
- /* seems gtk_widget_set_default_visual no longer exists? */
- GdkVisual* vis = gtk_widget_get_default_visual();
-
- GdkColormap *colormap = gdk_colormap_new( vis, FALSE );
- gtk_widget_set_default_colormap( colormap );
+ // 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)
+ {
+ if (m_forceTrueColour)
+ {
+ 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())
+ {
+ GdkVisual* visual = gdk_visual_get_best();
+ GdkColormap *colormap = gdk_colormap_new( visual, FALSE );
+ gtk_widget_set_default_colormap( colormap );
+ }
+ }
+ }
}
return true;
// of the filenames for GTK+ programs, so use it if it is set
wxString encName(wxGetenv(_T("G_FILENAME_ENCODING")));
encName = encName.BeforeFirst(_T(','));
- if (encName == _T("@locale"))
+ if (encName.CmpNoCase(_T("@locale")) == 0)
encName.clear();
encName.MakeUpper();
#if wxUSE_INTL
#ifdef __WXDEBUG__
-void wxApp::OnAssert(const wxChar *file, int line, const wxChar* cond, const wxChar *msg)
+void wxApp::OnAssertFailure(const wxChar *file,
+ int line,
+ const wxChar* func,
+ const wxChar* cond,
+ const wxChar *msg)
{
m_isInAssert = true;
- wxAppBase::OnAssert(file, line, cond, msg);
+ wxAppBase::OnAssertFailure(file, line, func, cond, msg);
m_isInAssert = false;
}
#endif // __WXDEBUG__
-void wxApp::RemoveIdleTag()
+void wxApp::RemoveIdleSource()
{
#if wxUSE_THREADS
wxMutexLocker lock(gs_idleTagsMutex);
#endif
- if (!g_isIdle)
+ if (m_idleTag != 0)
{
- g_source_remove( wxTheApp->m_idleTag );
- wxTheApp->m_idleTag = 0;
+ g_source_remove(m_idleTag);
+ m_idleTag = 0;
g_isIdle = true;
+ wxAddEmissionHook();
}
}
projects / wxWidgets.git / blobdiff