Comment out wxHVScrolledWindow

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

diff --git a/src/gtk1/utilsgtk.cpp b/src/gtk1/utilsgtk.cpp
index 39bd7eaa5718cee6b37914b715b0d021c8552c6f..e05a76624681cc4ea762f2829bcdd016adc0b63c 100644 (file)
--- a/src/gtk1/utilsgtk.cpp
+++ b/src/gtk1/utilsgtk.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        src/gtk/utilsgtk.cpp
+// Name:        src/gtk1/utilsgtk.cpp

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -31,9 +31,7 @@
 #include "glib.h"
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
 #include "glib.h"
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"

-#ifndef __WXGTK20__

 #include "gtk/gtkfeatures.h"
 #include "gtk/gtkfeatures.h"

-#endif

 #include "gdk/gdkx.h"
 
 #ifdef HAVE_X11_XKBLIB_H
 #include "gdk/gdkx.h"
 
 #ifdef HAVE_X11_XKBLIB_H


@@ -131,18 +129,14 @@ int wxDisplayDepth()
 wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo()
 {
     static wxToolkitInfo info;
 wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo()
 {
     static wxToolkitInfo info;

-#ifdef __WXGTK20__
-    info.shortName = _T("gtk2");
-#else

     info.shortName = _T("gtk");
     info.shortName = _T("gtk");

-#endif

     info.name = _T("wxGTK");
 #ifdef __WXUNIVERSAL__
     info.shortName << _T("univ");
     info.name << _T("/wxUniversal");
 #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;
 }
     info.os = wxGTK;
     return info;
 }


@@ -157,7 +151,8 @@ wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
 // subprocess routines
 // ----------------------------------------------------------------------------
 
 // subprocess routines
 // ----------------------------------------------------------------------------
 

-extern "C"
+extern "C" {
+static

 void GTK_EndProcessDetector(gpointer data, gint source,
                             GdkInputCondition WXUNUSED(condition) )
 {
 void GTK_EndProcessDetector(gpointer data, gint source,
                             GdkInputCondition WXUNUSED(condition) )
 {


@@ -188,6 +183,7 @@ void GTK_EndProcessDetector(gpointer data, gint source,
 
    wxHandleProcessTermination(proc_data);
 }
 
    wxHandleProcessTermination(proc_data);
 }

+}

 
 int wxAddProcessCallback(wxEndProcessData *proc_data, int fd)
 {
 
 int wxAddProcessCallback(wxEndProcessData *proc_data, int fd)
 {