#include <unistd.h>
#endif // HAVE_POLL/!HAVE_POLL
+#include "wx/unix/private.h"
#include "wx/gtk/win_gtk.h"
+#include "wx/gtk/private.h"
#include <gtk/gtk.h>
+//-----------------------------------------------------------------------------
+// link GnomeVFS
+//-----------------------------------------------------------------------------
+
+#if wxUSE_LIBGNOMEVFS
+#include "wx/html/forcelnk.h"
+FORCE_LINK(gnome_vfs)
+#endif
+
//-----------------------------------------------------------------------------
// global data
//-----------------------------------------------------------------------------
// idle system
//-----------------------------------------------------------------------------
-extern bool g_isIdle;
-
void wxapp_install_idle_handler();
#if wxUSE_THREADS
// 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.
+// RR/KH: No wxMutexGui calls are needed here according to the GTK faq,
+// http://www.gtk.org/faq/#AEN500 - this caused problems for wxPostEvent.
void wxApp::WakeUpIdle()
{
-#ifndef __WXGTK20__
-#if wxUSE_THREADS
- if (!wxThread::IsMain())
- wxMutexGuiEnter();
-#endif // wxUSE_THREADS_
-#endif // __WXGTK2__
-
wxapp_install_idle_handler();
-
-#ifndef __WXGTK20__
-#if wxUSE_THREADS
- if (!wxThread::IsMain())
- wxMutexGuiLeave();
-#endif // wxUSE_THREADS_
-#endif // __WXGTK2__
}
//-----------------------------------------------------------------------------
if (wxTopLevelWindows.GetCount() > 0)
{
wxWindow* win = (wxWindow*) wxTopLevelWindows.GetLast()->GetData();
-#ifdef __WXGTK20__
if (win->IsKindOf(CLASSINFO(wxMessageDialog)))
-#else
- if (win->IsKindOf(CLASSINFO(wxGenericMessageDialog)))
-#endif
win->OnInternalIdle();
}
return TRUE;
wxTheApp->m_idleTag = 0;
}
+ bool moreIdles;
+
// Send idle event to all who request them as long as
// no events have popped up in the event queue.
- while (wxTheApp->ProcessIdle() && (gtk_events_pending() == 0))
+ while ( (moreIdles = wxTheApp->ProcessIdle()) && gtk_events_pending() == 0)
;
// 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;
+ // Return FALSE if no more idle events are to be sent
+ return moreIdles;
}
#if wxUSE_THREADS
fd_set readfds;
fd_set writefds;
fd_set exceptfds;
- FD_ZERO(&readfds);
- FD_ZERO(&writefds);
- FD_ZERO(&exceptfds);
+ wxFD_ZERO(&readfds);
+ wxFD_ZERO(&writefds);
+ wxFD_ZERO(&exceptfds);
unsigned int i;
for ( i = 0; i < nfds; i++ )
{
- wxASSERT_MSG( ufds[i].fd < FD_SETSIZE, _T("fd out of range") );
+ wxASSERT_MSG( ufds[i].fd < wxFD_SETSIZE, _T("fd out of range") );
if ( ufds[i].events & G_IO_IN )
- FD_SET(ufds[i].fd, &readfds);
+ wxFD_SET(ufds[i].fd, &readfds);
if ( ufds[i].events & G_IO_PRI )
- FD_SET(ufds[i].fd, &exceptfds);
+ wxFD_SET(ufds[i].fd, &exceptfds);
if ( ufds[i].events & G_IO_OUT )
- FD_SET(ufds[i].fd, &writefds);
+ wxFD_SET(ufds[i].fd, &writefds);
if ( ufds[i].fd > fdMax )
fdMax = ufds[i].fd;
{
ufds[i].revents = 0;
- if ( FD_ISSET(ufds[i].fd, &readfds ) )
+ if ( wxFD_ISSET(ufds[i].fd, &readfds ) )
ufds[i].revents |= G_IO_IN;
- if ( FD_ISSET(ufds[i].fd, &exceptfds ) )
+ if ( wxFD_ISSET(ufds[i].fd, &exceptfds ) )
ufds[i].revents |= G_IO_PRI;
- if ( FD_ISSET(ufds[i].fd, &writefds ) )
+ if ( wxFD_ISSET(ufds[i].fd, &writefds ) )
ufds[i].revents |= G_IO_OUT;
}
g_isIdle = FALSE;
if (g_pendingTag == 0)
- g_pendingTag = gtk_idle_add_priority( 900, wxapp_pending_callback, (gpointer) NULL );
+ 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 = gtk_idle_add_priority( 1000, wxapp_idle_callback, (gpointer) NULL );
+ wxTheApp->m_idleTag = g_idle_add_full( 1000, wxapp_idle_callback, NULL, NULL );
}
//-----------------------------------------------------------------------------
wxapp_install_idle_handler();
#if wxUSE_THREADS
- g_main_set_poll_func( wxapp_poll_func );
+ g_main_context_set_poll_func( NULL, wxapp_poll_func );
#endif
m_colorCube = (unsigned char*) NULL;
wxApp::~wxApp()
{
- if (m_idleTag) gtk_idle_remove( m_idleTag );
+ if (m_idleTag)
+ g_source_remove( m_idleTag );
- if (m_colorCube) free(m_colorCube);
+ if (m_colorCube)
+ free(m_colorCube);
}
bool wxApp::OnInitGui()
// 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 );
else
if ((gdk_visual_get_best() != gdk_visual_get_system()) && (m_useBestVisual))
{
-#ifdef __WXGTK20__
/* seems gtk_widget_set_default_visual no longer exists? */
GdkVisual* vis = gtk_widget_get_default_visual();
-#else
- GdkVisual* vis = gdk_visual_get_best();
- gtk_widget_set_default_visual( vis );
-#endif
GdkColormap *colormap = gdk_colormap_new( vis, FALSE );
gtk_widget_set_default_colormap( colormap );
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) &&
// We should have the wxUSE_WCHAR_T test on the _outside_
#if wxUSE_WCHAR_T
- #if defined(__WXGTK20__)
- // gtk+ 2.0 supports Unicode through UTF-8 strings
- wxConvCurrent = &wxConvUTF8;
- #else // GTK 1.x
- if (!wxOKlibc())
- wxConvCurrent = &wxConvLocal;
- #endif
+ // gtk+ 2.0 supports Unicode through UTF-8 strings
+ wxConvCurrent = &wxConvUTF8;
#else // !wxUSE_WCHAR_T
if (!wxOKlibc())
wxConvCurrent = (wxMBConv*) NULL;
#endif // wxUSE_WCHAR_T/!wxUSE_WCHAR_T
-#ifdef __WXGTK20__
// decide which conversion to use for the file names
// (1) this variable exists for the sole purpose of specifying the encoding
if (encName == _T("@locale"))
encName.clear();
encName.MakeUpper();
-#if wxUSE_INTL
+#if wxUSE_INTL
if (encName.empty())
{
// (2) if a non default locale is set, assume that the user wants his
#endif // wxUSE_INTL
static wxConvBrokenFileNames fileconv(encName);
wxConvFileName = &fileconv;
-#endif // __WXGTK20__
#if wxUSE_UNICODE
// gtk_init() wants UTF-8, not wchar_t, so convert
argvGTK[argc] = NULL;
int argcGTK = argc;
-
+
#ifdef __WXGPE__
init_result = true; // is there a _check() version of this?
gpe_application_init( &argcGTK, &argvGTK );
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();
#endif
if (!g_isIdle)
{
- gtk_idle_remove( wxTheApp->m_idleTag );
+ g_source_remove( wxTheApp->m_idleTag );
wxTheApp->m_idleTag = 0;
g_isIdle = TRUE;
}
projects / wxWidgets.git / blobdiff