reverted Julian's r44600, it broke help window behavior so that it prevented apps...

[wxWidgets.git] / include / wx / x11 / app.h

diff --git a/include/wx/x11/app.h b/include/wx/x11/app.h
index ac5f86fdce6a90947cd8723534d68726470820f0..0aa5f73d7fd582867aa86a311a46f2f20f38410a 100644 (file)
--- a/include/wx/x11/app.h
+++ b/include/wx/x11/app.h
@@ -27,7 +27,7 @@ class WXDLLIMPEXP_FWD_CORE wxFrame;
 class WXDLLIMPEXP_FWD_CORE wxWindow;
 class WXDLLIMPEXP_FWD_CORE wxApp;
 class WXDLLIMPEXP_FWD_CORE wxKeyEvent;
 class WXDLLIMPEXP_FWD_CORE wxWindow;
 class WXDLLIMPEXP_FWD_CORE wxApp;
 class WXDLLIMPEXP_FWD_CORE wxKeyEvent;

-class WXDLLIMPEXP_FWD_CORE wxLog;
+class WXDLLIMPEXP_FWD_BASE wxLog;

 class WXDLLIMPEXP_FWD_CORE wxXVisualInfo;
 
 // ----------------------------------------------------------------------------
 class WXDLLIMPEXP_FWD_CORE wxXVisualInfo;
 
 // ----------------------------------------------------------------------------


@@ -84,7 +84,7 @@ public:
     PangoContext* GetPangoContext();
 #endif
 
     PangoContext* GetPangoContext();
 #endif
 

-    wxXVisualInfo* GetVisualInfo(WXDisplay* display)
+    wxXVisualInfo* GetVisualInfo(WXDisplay* WXUNUSED(display))

     {
         // this should be implemented correctly for wxBitmap to work
         // with multiple display
     {
         // this should be implemented correctly for wxBitmap to work
         // with multiple display