fix broken compilation

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

diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp
index 8709321cf182e41318b085dbf1d1e30336b5746a..abe366b9fcb50c804cd85a9422f9b338211aceef 100644 (file)
--- a/src/unix/utilsunx.cpp
+++ b/src/unix/utilsunx.cpp
@@ -1189,5 +1189,4 @@ void wxHandleProcessTermination(wxEndProcessData *proc_data)
     }
 }
 
     }
 }
 

-

 #endif // wxUSE_BASE
 #endif // wxUSE_BASE

diff --git a/src/unix/utilsx11.cpp b/src/unix/utilsx11.cpp
index 2a6eaf0deb17ac9ff02ba6c9570616f403f04d4e..a5809199b298fde93150351684a44bb70a326030 100644 (file)
--- a/src/unix/utilsx11.cpp
+++ b/src/unix/utilsx11.cpp
@@ -15,10 +15,12 @@
 #include "wx/wxprec.h"
 
 #include "wx/unix/utilsx11.h"
 #include "wx/wxprec.h"
 
 #include "wx/unix/utilsx11.h"

+#include "wx/x11/privx.h"

 #include "wx/iconbndl.h"
 #include "wx/image.h"
 #include "wx/icon.h"
 #include "wx/log.h"
 #include "wx/iconbndl.h"
 #include "wx/image.h"
 #include "wx/icon.h"
 #include "wx/log.h"

+#include "wx/utils.h"

 
 #ifdef __VMS
 #pragma message disable nosimpint
 
 #ifdef __VMS
 #pragma message disable nosimpint


@@ -508,7 +510,7 @@ void wxSetFullScreenStateX11(WXDisplay* display, WXWindow rootWindow,
 
 bool wxGetKeyState(wxKeyCode key)
 {
 
 bool wxGetKeyState(wxKeyCode key)
 {

-  Display *pDisplay = wxApp::GetDisplay();
+  Display *pDisplay = (Display*) wxGetDisplay();

   int iKey = wxCharCodeWXToX(key);
   int          iKeyMask = 0;
   Window       wDummy1, wDummy2;
   int iKey = wxCharCodeWXToX(key);
   int          iKeyMask = 0;
   Window       wDummy1, wDummy2;