#include "wx/module.h"
#include "wx/image.h"
+#ifdef __WXUNIVERSAL__
+ #include "wx/univ/theme.h"
+ #include "wx/univ/renderer.h"
+#endif
+
#if wxUSE_THREADS
#include "wx/thread.h"
#endif
#include <unistd.h>
+#include "wx/gtk/win_gtk.h"
-#include <glib.h>
-#include <gdk/gdk.h>
#include <gtk/gtk.h>
-#include "wx/gtk/win_gtk.h"
//-----------------------------------------------------------------------------
// global data
// wxYield
//-----------------------------------------------------------------------------
-static bool gs_inYield = FALSE;
-
-bool wxYield()
+bool wxApp::Yield(bool onlyIfNeeded)
{
+ // MT-FIXME
+ static bool s_inYield = FALSE;
+
+ if ( s_inYield )
+ {
+ if ( !onlyIfNeeded )
+ {
+ wxFAIL_MSG( wxT("wxYield called recursively" ) );
+ }
+
+ return FALSE;
+ }
+
#if wxUSE_THREADS
if ( !wxThread::IsMain() )
{
}
#endif // wxUSE_THREADS
-#ifdef __WXDEBUG__
- if (gs_inYield)
- wxFAIL_MSG( wxT("wxYield called recursively" ) );
-#endif
-
- gs_inYield = TRUE;
+ s_inYield = TRUE;
if (!g_isIdle)
{
// We need to remove idle callbacks or the loop will
// never finish.
- gtk_idle_remove( wxTheApp->m_idleTag );
- wxTheApp->m_idleTag = 0;
+ gtk_idle_remove( m_idleTag );
+ m_idleTag = 0;
g_isIdle = TRUE;
}
- while (gtk_events_pending())
- gtk_main_iteration();
-
// disable log flushing from here because a call to wxYield() shouldn't
// normally result in message boxes popping up &c
wxLog::Suspend();
+ 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) */
- while (wxTheApp->ProcessIdle()) { }
+ while ( ProcessIdle() )
+ {
+ }
// let the logs be flashed again
wxLog::Resume();
- gs_inYield = FALSE;
+ s_inYield = FALSE;
return TRUE;
}
-//-----------------------------------------------------------------------------
-// wxYieldIfNeeded
-// Like wxYield, but fails silently if the yield is recursive.
-//-----------------------------------------------------------------------------
-
-bool wxYieldIfNeeded()
-{
- if (gs_inYield)
- return FALSE;
-
- return wxYield();
-}
-
//-----------------------------------------------------------------------------
// wxWakeUpIdle
//-----------------------------------------------------------------------------
gint wxapp_idle_callback( gpointer WXUNUSED(data) )
{
- if (!wxTheApp) return TRUE;
+ if (!wxTheApp)
+ return TRUE;
+
+#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() )
+ {
+ return TRUE;
+ }
+#endif // __WXDEBUG__
// when getting called from GDK's time-out handler
// we are no longer within GDK's grab on the GUI
g_isIdle = TRUE;
wxTheApp->m_idleTag = 0;
- // Sent idle event to all who request them
- while (wxTheApp->ProcessIdle()) { }
+ // Sent idle event to all who request them as long as they do
+ while (wxTheApp->ProcessIdle())
+ ;
// Release lock again
gdk_threads_leave();
wxApp::wxApp()
{
- wxTheApp = this;
-
- m_topWindow = (wxWindow *) NULL;
- m_exitOnFrameDelete = TRUE;
+ m_initialized = FALSE;
+#ifdef __WXDEBUG__
+ m_isInAssert = FALSE;
+#endif // __WXDEBUG__
m_idleTag = 0;
wxapp_install_idle_handler();
#endif
m_colorCube = (unsigned char*) NULL;
-
- m_useBestVisual = FALSE;
+
+ // this is NULL for a "regular" wxApp, but is set (and freed) by a wxGLApp
+ m_glVisualInfo = (void *) NULL;
}
wxApp::~wxApp()
bool wxApp::OnInitGui()
{
+ if ( !wxAppBase::OnInitGui() )
+ return FALSE;
+
GdkVisual *visual = gdk_visual_get_system();
+ // if this is a wxGLApp (derived from wxApp), and we've already
+ // 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(
+ ((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,
of course, but what do these guys pay $30.000 for? */
- if ((gdk_visual_get_best() != gdk_visual_get_system()) &&
+ else if ((gdk_visual_get_best() != gdk_visual_get_system()) &&
(m_useBestVisual))
{
#ifdef __WXGTK20__
wxClassInfo::InitializeClasses();
wxSystemSettings::Init();
+
+#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.
return retValue;
}
+#ifndef __WXUNIVERSAL__
+
#include "wx/gtk/info.xpm"
#include "wx/gtk/error.xpm"
#include "wx/gtk/question.xpm"
#include "wx/gtk/warning.xpm"
-wxIcon
-wxApp::GetStdIcon(int which) const
+wxIcon wxApp::GetStdIcon(int which) const
{
switch(which)
{
return wxIcon(error_xpm);
}
}
+#else
+wxIcon wxApp::GetStdIcon(int which) const
+{
+ return wxTheme::Get()->GetRenderer()->GetStdIcon(which);
+}
+#endif // !__WXUNIVERSAL__
+
+
+#ifdef __WXDEBUG__
+
+void wxApp::OnAssert(const wxChar *file, int line, const wxChar *msg)
+{
+ m_isInAssert = TRUE;
+
+ wxAppBase::OnAssert(file, line, msg);
+
+ m_isInAssert = FALSE;
+}
+
+#endif // __WXDEBUG__
+
projects / wxWidgets.git / blobdiff