X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/66bd83b4ec25c06bbd72cf2aa7cedd94892660b4..63a3cd7a8c737eb4571f27e5f2af37eda0f1c5cc:/src/gtk/utilsgtk.cpp diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp index e76e3187f3..6385e82fef 100644 --- a/src/gtk/utilsgtk.cpp +++ b/src/gtk/utilsgtk.cpp @@ -31,9 +31,6 @@ #include "glib.h" #include "gdk/gdk.h" #include "gtk/gtk.h" -#ifndef __WXGTK20__ -#include "gtk/gtkfeatures.h" -#endif #include "gdk/gdkx.h" #ifdef HAVE_X11_XKBLIB_H @@ -81,7 +78,6 @@ bool wxSetDetectableAutoRepeat( bool WXUNUSED(flag) ) } #endif -#ifdef __WXGTK20__ // Escapes string so that it is valid Pango markup XML string: wxString wxEscapeStringForPangoMarkup(const wxString& str) { @@ -115,7 +111,6 @@ wxString wxEscapeStringForPangoMarkup(const wxString& str) } return out; } -#endif // ---------------------------------------------------------------------------- @@ -168,11 +163,7 @@ int wxDisplayDepth() wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo() { static wxToolkitInfo info; -#ifdef __WXGTK20__ info.shortName = _T("gtk2"); -#else - info.shortName = _T("gtk"); -#endif info.name = _T("wxGTK"); #ifdef __WXUNIVERSAL__ info.shortName << _T("univ"); @@ -194,7 +185,8 @@ wxWindow* wxFindWindowAtPoint(const wxPoint& pt) // subprocess routines // ---------------------------------------------------------------------------- -extern "C" +extern "C" { +static void GTK_EndProcessDetector(gpointer data, gint source, GdkInputCondition WXUNUSED(condition) ) { @@ -225,6 +217,7 @@ void GTK_EndProcessDetector(gpointer data, gint source, wxHandleProcessTermination(proc_data); } +} int wxAddProcessCallback(wxEndProcessData *proc_data, int fd) {