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

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

diff --git a/include/wx/x11/private.h b/include/wx/x11/private.h
index 08406a39bff03407360882679643307b9519700c..6422308b6381b59e621344ae3423725e85446960 100644 (file)
--- a/include/wx/x11/private.h
+++ b/include/wx/x11/private.h
@@ -28,13 +28,13 @@
 // Include common declarations
 #include "wx/x11/privx.h"
 
 // Include common declarations
 #include "wx/x11/privx.h"
 

-#if wxUSE_UNICODE
-#include "pango/pango.h"
+#if wxUSE_PANGO
+#include <pango/pango.h>

 #endif
 
 #endif
 

-class WXDLLIMPEXP_CORE wxMouseEvent;
-class WXDLLIMPEXP_CORE wxKeyEvent;
-class WXDLLIMPEXP_CORE wxWindow;
+class WXDLLIMPEXP_FWD_CORE wxMouseEvent;
+class WXDLLIMPEXP_FWD_CORE wxKeyEvent;
+class WXDLLIMPEXP_FWD_CORE wxWindow;

 
 // ----------------------------------------------------------------------------
 // Some Unicode <-> UTF8 macros stolen from GTK
 
 // ----------------------------------------------------------------------------
 // Some Unicode <-> UTF8 macros stolen from GTK


@@ -80,9 +80,5 @@ extern Window wxGetWindowParent(Window window);
 bool wxSetWMDecorations(Window w, long style);
 bool wxMWMIsRunning(Window w);
 
 bool wxSetWMDecorations(Window w, long style);
 bool wxMWMIsRunning(Window w);
 

-// Checks if any of our children are finished.
-// implemented in src/x11/utils.cpp
-void wxCheckForFinishedChildren();
-

 #endif
 // _WX_PRIVATE_H_
 #endif
 // _WX_PRIVATE_H_