/////////////////////////////////////////////////////////////////////////////
-// Name: src/gtk/utilsgtk.cpp
+// Name: src/gtk1/utilsgtk.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
#include "wx/utils.h"
#include "wx/string.h"
#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
//----------------------------------------------------------------------------
// misc.
//----------------------------------------------------------------------------
+#ifndef __EMX__
+// on OS/2, we use the wxBell from wxBase library
void wxBell()
{
gdk_beep();
}
+#endif
/* Don't synthesize KeyUp events holding down a key and producing
KeyDown events with autorepeat. */
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");
info.name << _T("/wxUniversal");
#endif
- info.versionMajor = GTK_MAJOR_VERSION;
- info.versionMinor = GTK_MINOR_VERSION;
+ info.versionMajor = gtk_major_version;
+ info.versionMinor = gtk_minor_version;
info.os = wxGTK;
return info;
}
// subprocess routines
// ----------------------------------------------------------------------------
-extern "C"
+extern "C" {
+static
void GTK_EndProcessDetector(gpointer data, gint source,
GdkInputCondition WXUNUSED(condition) )
{
wxHandleProcessTermination(proc_data);
}
+}
int wxAddProcessCallback(wxEndProcessData *proc_data, int fd)
{