/////////////////////////////////////////////////////////////////////////////
-// Name: src/gtk/utilsgtk.cpp
+// Name: src/gtk1/utilsgtk.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
-// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Copyright: (c) 1998 Robert Roebling
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
#include "wx/utils.h"
#include "wx/string.h"
+#include "wx/apptrait.h"
#include "wx/intl.h"
#include "wx/log.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. */
return gdk_window_get_visual( wxGetRootWindow()->window )->depth;
}
-int wxGetOsVersion(int *majorVsn, int *minorVsn)
+wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo()
{
- if (majorVsn) *majorVsn = GTK_MAJOR_VERSION;
- if (minorVsn) *minorVsn = GTK_MINOR_VERSION;
-
- return wxGTK;
+ static wxToolkitInfo info;
+ info.shortName = _T("gtk");
+ 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.os = wxGTK;
+ return info;
}
wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
// subprocess routines
// ----------------------------------------------------------------------------
-static void GTK_EndProcessDetector(gpointer data, gint source,
- GdkInputCondition WXUNUSED(condition) )
+extern "C" {
+static
+void GTK_EndProcessDetector(gpointer data, gint source,
+ GdkInputCondition WXUNUSED(condition) )
{
wxEndProcessData *proc_data = (wxEndProcessData *)data;
wxHandleProcessTermination(proc_data);
}
+}
int wxAddProcessCallback(wxEndProcessData *proc_data, int fd)
{