From 09a094552238443f82cb12a105bf88f3ca5b83a3 Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@bullseye.com>
Date: Mon, 15 Jan 2007 01:26:05 +0000
Subject: [PATCH] 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 |  8 ++++----
 src/gtk/app.cpp          | 13 +++----------
 src/gtk/gnome/gprint.cpp |  8 ++++----
 src/gtk/gnome/gvfs.cpp   |  9 ++++-----
 4 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/src/generic/prntdlgg.cpp b/src/generic/prntdlgg.cpp
index 2e3f502320..3270cfddaa 100644
--- a/src/generic/prntdlgg.cpp
+++ b/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"
-FORCE_LINK(gnome_print)
+    #include "wx/link.h"
+    wxFORCE_LINK_MODULE(gnome_print)
 #endif
 
 // ----------------------------------------------------------------------------
diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index ed899e5cee..1aee54439b 100644
--- a/src/gtk/app.cpp
+++ b/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
-#include "wx/html/forcelnk.h"
-FORCE_LINK(gnome_vfs)
+#if wxUSE_MIMETYPE && wxUSE_LIBGNOMEVFS
+    #include "wx/link.h"
+    wxFORCE_LINK_MODULE(gnome_vfs)
 #endif
 
 //-----------------------------------------------------------------------------
diff --git a/src/gtk/gnome/gprint.cpp b/src/gtk/gnome/gprint.cpp
index 8949d9f3f2..d9e20d0662 100644
--- a/src/gtk/gnome/gprint.cpp
+++ b/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"
-FORCE_LINK_ME(gnome_print)
+#include "wx/link.h"
+wxFORCE_LINK_THIS_MODULE(gnome_print)
 
 //----------------------------------------------------------------------------
 // wxGnomePrintLibrary
diff --git a/src/gtk/gnome/gvfs.cpp b/src/gtk/gnome/gvfs.cpp
index d3f9fbb074..b1fc2b8d66 100644
--- a/src/gtk/gnome/gvfs.cpp
+++ b/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"
-FORCE_LINK_ME(gnome_vfs)
+#include "wx/link.h"
+wxFORCE_LINK_THIS_MODULE(gnome_vfs)
 
 //----------------------------------------------------------------------------
 // wxGnomeVFSLibrary
-- 
2.45.2