X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1d115baf4b55f601d34b6f7d8a30d0a905545418..6959763942eb0e852113945c54113f3521b9c26f:/src/gtk/gnome/gvfs.cpp diff --git a/src/gtk/gnome/gvfs.cpp b/src/gtk/gnome/gvfs.cpp index db197126e2..d3f9fbb074 100644 --- a/src/gtk/gnome/gvfs.cpp +++ b/src/gtk/gnome/gvfs.cpp @@ -19,11 +19,14 @@ #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 @@ -62,7 +65,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 +101,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 +128,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 +137,7 @@ bool wxGnomeVFSMimeTypesManagerImpl::DoAssociation(const wxString& strType, // User modificationt to the MIME database // are not supported :-) } - + return false; } @@ -159,7 +162,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 +171,7 @@ void wxGnomeVFSModule::OnExit() { if (gs_lgvfs->IsOk()) gs_lgvfs->gnome_vfs_shutdown(); - + delete gs_lgvfs; }