X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1d115baf4b55f601d34b6f7d8a30d0a905545418..129b8b1a215fc1fcc1b9f06daa0aeaf22bbce614:/src/gtk/gnome/gvfs.cpp

diff --git a/src/gtk/gnome/gvfs.cpp b/src/gtk/gnome/gvfs.cpp
index db197126e2..b1fc2b8d66 100644
--- a/src/gtk/gnome/gvfs.cpp
+++ b/src/gtk/gnome/gvfs.cpp
@@ -15,20 +15,22 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_MIMETYPE && wxUSE_LIBGNOMEVFS
+
 #include "wx/gtk/gnome/gvfs.h"
 
-#if wxUSE_MIMETYPE && wxUSE_LIBGNOMEVFS
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/module.h"
+#endif
 
 #include "wx/mimetype.h"
-#include "wx/gtk/private.h"
-#include "wx/module.h"
 #include "wx/dynlib.h"
-#include "wx/log.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
@@ -62,7 +64,7 @@ public:
         (), (), FALSE )
     wxDL_METHOD_DEFINE( void, gnome_vfs_shutdown,
         (), (), /**/ )
-        
+
     wxDL_METHOD_DEFINE( GnomeVFSResult, gnome_vfs_mime_set_icon,
         (const char *mime_type, const char *filename), (mime_type, filename), GNOME_VFS_OK )
 };
@@ -98,7 +100,7 @@ void wxGnomeVFSLibrary::InitializeMethods()
 
     wxDL_METHOD_LOAD( m_gnome_vfs_lib, gnome_vfs_init, success )
     wxDL_METHOD_LOAD( m_gnome_vfs_lib, gnome_vfs_shutdown, success )
-    
+
     m_ok = true;
 }
 
@@ -125,7 +127,7 @@ bool wxGnomeVFSMimeTypesManagerImpl::DoAssociation(const wxString& strType,
                        const wxString& strDesc)
 {
     int nIndex = AddToMimeData(strType, strIcon, entry, strExtensions, strDesc, true);
-    
+
     if ( nIndex == wxNOT_FOUND )
         return false;
 
@@ -134,7 +136,7 @@ bool wxGnomeVFSMimeTypesManagerImpl::DoAssociation(const wxString& strType,
         // User modificationt to the MIME database
         // are not supported :-)
     }
-        
+
     return false;
 }
 
@@ -159,7 +161,7 @@ bool wxGnomeVFSModule::OnInit()
     if (gs_lgvfs->IsOk())
     {
         if (gs_lgvfs->gnome_vfs_init())
-            wxMimeTypesManagerFactory::SetFactory( new wxGnomeVFSMimeTypesManagerFactory );
+            wxMimeTypesManagerFactory::Set( new wxGnomeVFSMimeTypesManagerFactory );
     }
     return true;
 }
@@ -168,7 +170,7 @@ void wxGnomeVFSModule::OnExit()
 {
     if (gs_lgvfs->IsOk())
         gs_lgvfs->gnome_vfs_shutdown();
-        
+
     delete gs_lgvfs;
 }