some GTK1 bulkd fixes from Sander Niemeijer

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42414 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/gtk1/utilsgtk.cpp

@@ -196,3 +196,8 @@ wxPortId wxGUIAppTraits::GetToolkitVersion(int *verMaj, int *verMin) const
 
     return wxPORT_GTK;
 }
+
+wxString wxGUIAppTraits::GetDesktopEnvironment() const
+{
+    return wxEmptyString;
+}

src/mac/corefoundation/stdpaths_cf.cpp

@@ -31,7 +31,6 @@
 #include "wx/mac/private.h"
 #endif
 #include "wx/mac/corefoundation/cfstring.h"
-#include "wx/mac/private.h"
 
 #if defined(__DARWIN__)
 #include <CoreFoundation/CFBundle.h>

wxPython/setup.py

@@ -793,6 +793,8 @@ else:
     i_files = glob.glob(opj("src/*.i"))   + \
               glob.glob(opj("src/_*.py")) + \
               glob.glob(opj("src/*.swg"))
+    if BUILD_GLCANVAS:
+        i_files += glob.glob(opj("contrib/glcanvas/*.i"))
 
     HEADERS = zip(h_files, ["/wxPython"]*len(h_files)) + \
               zip(i_files, ["/wxPython/i_files"]*len(i_files))

wxPython/src/helpers.cpp

@@ -29,7 +29,11 @@
 #include <gdk/gdkx.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkprivate.h>
+#ifdef __WXGTK20__
 #include <wx/gtk/win_gtk.h>
+#else
+#include <wx/gtk1/win_gtk.h>
+#endif
 #define GetXWindow(wxwin) (wxwin)->m_wxwindow ? \
                           GDK_WINDOW_XWINDOW(GTK_PIZZA((wxwin)->m_wxwindow)->bin_window) : \
                           GDK_WINDOW_XWINDOW((wxwin)->m_widget->window)