remove some unneeded includes, clean up gnome force link stuff a bit

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

src/generic/prntdlgg.cpp

@@ -26,6 +26,8 @@
 
 #if wxUSE_PRINTING_ARCHITECTURE && (!defined(__WXMSW__) || wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW)
 
+#include "wx/generic/prntdlgg.h"
+
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/dc.h"
@@ -46,8 +48,6 @@
     #include "wx/statline.h"
 #endif
 
-#include "wx/generic/prntdlgg.h"
-
 #if wxUSE_POSTSCRIPT
     #include "wx/generic/dcpsg.h"
 #endif
@@ -63,8 +63,8 @@
 #include <string.h>
 
 #if wxUSE_LIBGNOMEPRINT
-#include "wx/html/forcelnk.h"
+    #include "wx/link.h"
-FORCE_LINK(gnome_print)
+    wxFORCE_LINK_MODULE(gnome_print)
 #endif
 
 // ----------------------------------------------------------------------------

src/gtk/app.cpp

@@ -26,19 +26,12 @@
     #include "wx/font.h"
 #endif
 
-#include "wx/file.h"
-#include "wx/filename.h"
 #include "wx/thread.h"
 
 #ifdef __WXGPE__
     #include <gpe/init.h>
 #endif
 
-#ifdef __WXUNIVERSAL__
-    #include "wx/univ/theme.h"
-    #include "wx/univ/renderer.h"
-#endif
-
 #include "wx/gtk/win_gtk.h"
 #include "wx/gtk/private.h"
 
@@ -48,9 +41,9 @@
 // link GnomeVFS
 //-----------------------------------------------------------------------------
 
-#if wxUSE_LIBGNOMEVFS
+#if wxUSE_MIMETYPE && wxUSE_LIBGNOMEVFS
-#include "wx/html/forcelnk.h"
+    #include "wx/link.h"
-FORCE_LINK(gnome_vfs)
+    wxFORCE_LINK_MODULE(gnome_vfs)
 #endif
 
 //-----------------------------------------------------------------------------

src/gtk/gnome/gprint.cpp

@@ -15,10 +15,10 @@
     #pragma hdrstop
 #endif
 
-#include "wx/gtk/gnome/gprint.h"
-
 #if wxUSE_LIBGNOMEPRINT
 
+#include "wx/gtk/gnome/gprint.h"
+
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/dcmemory.h"
@@ -42,8 +42,8 @@
 
 static const double RAD2DEG  = 180.0 / M_PI;
 
-#include "wx/html/forcelnk.h"
+#include "wx/link.h"
-FORCE_LINK_ME(gnome_print)
+wxFORCE_LINK_THIS_MODULE(gnome_print)
 
 //----------------------------------------------------------------------------
 // wxGnomePrintLibrary

src/gtk/gnome/gvfs.cpp

@@ -15,23 +15,22 @@
     #pragma hdrstop
 #endif
 
-#include "wx/gtk/gnome/gvfs.h"
-
 #if wxUSE_MIMETYPE && wxUSE_LIBGNOMEVFS
 
+#include "wx/gtk/gnome/gvfs.h"
+
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/module.h"
 #endif
 
 #include "wx/mimetype.h"
-#include "wx/gtk/private.h"
 #include "wx/dynlib.h"
 
 #include <libgnomevfs/gnome-vfs-mime-handlers.h>
 
-#include "wx/html/forcelnk.h"
+#include "wx/link.h"
-FORCE_LINK_ME(gnome_vfs)
+wxFORCE_LINK_THIS_MODULE(gnome_vfs)
 
 //----------------------------------------------------------------------------
 // wxGnomeVFSLibrary