From: Mart Raudsepp Date: Tue, 6 Nov 2007 01:35:56 +0000 (+0000) Subject: Fix compilation of gnome-vfs module after dynlib.h changes back in September: X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/0a5b15da927024adf58063c28c6406965ea9a293 Fix compilation of gnome-vfs module after dynlib.h changes back in September: * Use wxDL_VOIDMETHOD_DEFINE where necessary * Add a semi-colon after wxDL_METHOD_LOAD calls Linking is still broken though (MimeTypesManagerImpl::AddToMimeData required, but not exported from base) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49670 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/gtk/gnome/gvfs.cpp b/src/gtk/gnome/gvfs.cpp index 0651c72f82..17e8bc267f 100644 --- a/src/gtk/gnome/gvfs.cpp +++ b/src/gtk/gnome/gvfs.cpp @@ -41,9 +41,9 @@ class wxGnomeVFSLibrary public: wxGnomeVFSLibrary(); ~wxGnomeVFSLibrary(); + bool IsOk(); private: - bool IsOk(); bool InitializeMethods(); wxDynamicLibrary m_libGnomeVFS; @@ -56,8 +56,8 @@ private: public: wxDL_METHOD_DEFINE( gboolean, gnome_vfs_init, (), (), FALSE ) - wxDL_METHOD_DEFINE( void, gnome_vfs_shutdown, - (), (), /**/ ) + wxDL_VOIDMETHOD_DEFINE( 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 ) @@ -82,8 +82,8 @@ bool wxGnomeVFSLibrary::IsOk() bool wxGnomeVFSLibrary::InitializeMethods() { - wxDL_METHOD_LOAD( m_libGnomeVFS, gnome_vfs_init ) - wxDL_METHOD_LOAD( m_libGnomeVFS, gnome_vfs_shutdown ) + wxDL_METHOD_LOAD( m_libGnomeVFS, gnome_vfs_init ); + wxDL_METHOD_LOAD( m_libGnomeVFS, gnome_vfs_shutdown ); return true; }