diff --git a/wxPython/src/__version__.py b/wxPython/src/__version__.py
index 9c9f287e74..f0517aeb07 100644
--- a/wxPython/src/__version__.py
+++ b/wxPython/src/__version__.py
@@ -1 +1 @@
-ver = '2.4.0p1'
+ver = '2.4.0'
diff --git a/wxPython/src/helpers.cpp b/wxPython/src/helpers.cpp
index 0d3571b22d..11d01ea9f8 100644
--- a/wxPython/src/helpers.cpp
+++ b/wxPython/src/helpers.cpp
@@ -1441,10 +1441,14 @@ long wxPyGetWinHandle(wxWindow* win) {
     // Find and return the actual X-Window.
 #ifdef __WXGTK__
     if (win->m_wxwindow) {
+#ifdef __WXGTK20__
+        return (long) GDK_WINDOW_XWINDOW(GTK_PIZZA(win->m_wxwindow)->bin_window);
+#else
         GdkWindowPrivate* bwin = (GdkWindowPrivate*)GTK_PIZZA(win->m_wxwindow)->bin_window;
         if (bwin) {
             return (long)bwin->xwindow;
         }
+#endif
     }
 #endif
     return 0;