wxListbook needs to clean up the wxListCtrl when DeleteAllPages is called.

[wxWidgets.git] / src / unix / utilsx11.cpp

diff --git a/src/unix/utilsx11.cpp b/src/unix/utilsx11.cpp
index 4f16da9388bb79acfbc74caba2dc335cef272c1a..8d400126c660603c0a30818813df572f6cd44387 100644 (file)
--- a/src/unix/utilsx11.cpp
+++ b/src/unix/utilsx11.cpp
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     25.03.02
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
+// Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -29,7 +29,7 @@
 #pragma message enable nosimpint
 #endif
 
-#ifdef __WXGTK20__
+#ifdef __WXGTK__
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
 #endif
@@ -199,7 +199,7 @@ void wxSetIconsX11( WXDisplay* display, WXWindow window,
 //     unless it has better compatiblity with older WMs).
 //
 //     
-//     This is what wxWindows does in wxSetFullScreenStateX11:
+//     This is what wxWidgets does in wxSetFullScreenStateX11:
 //       1) if _NET_WM_STATE_FULLSCREEN is supported, use it
 //       2) otherwise try WM-specific hacks (KDE, IceWM)
 //       3) use _WIN_LAYER and hope that the WM will recognize it
@@ -765,9 +765,11 @@ KeySym wxCharCodeWXToX(int id)
 bool wxGetKeyState(wxKeyCode key)
 {
 #if defined(__WXX11__)
-    Display *pDisplay = wxApp::GetDisplay();
+    Display *pDisplay = (Display*) wxApp::GetDisplay();
 #elif defined(__WXGTK__)
     Display *pDisplay = GDK_DISPLAY();
+#elif defined(__WXMOTIF__)
+    Display *pDisplay = (Display*) (wxTheApp ? wxTheApp->GetInitialDisplay() : NULL);
 #else
 #error  Add code to get the DISPLAY for this platform
 #endif