From cda461a616dfaac5f73a11159a16fe54ae463362 Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Thu, 2 Jan 2003 06:10:21 +0000
Subject: [PATCH] Additional change for wxGTK2 that I forgot to check in
 yesterday

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@18501 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 wxPython/src/__version__.py | 2 +-
 wxPython/src/helpers.cpp    | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

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;