set device origin when drawing on a frame in order to not overwrite the menu/toolbar...

[wxWidgets.git] / src / gtk1 / utilsgtk.cpp

diff --git a/src/gtk1/utilsgtk.cpp b/src/gtk1/utilsgtk.cpp
index 69f73141b683bd5523897bf1d0c81c7663124ba0..cef8dbe54e4c67a2000bf062b6a8dee8cd199b1a 100644 (file)
--- a/src/gtk1/utilsgtk.cpp
+++ b/src/gtk1/utilsgtk.cpp
@@ -56,11 +56,14 @@ extern GtkWidget *wxGetRootWindow();
 //----------------------------------------------------------------------------
 // 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. */
@@ -138,8 +141,8 @@ wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo()
     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;
 }