From fd1bc7fcb319961b88a05d55ebcaaea6da3f9f95 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Fri, 4 Jan 2002 17:09:59 +0000 Subject: [PATCH] removing dependany on mac headers from public wx headers git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13367 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/dynlib.h | 2 +- include/wx/filefn.h | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/include/wx/dynlib.h b/include/wx/dynlib.h index 56fd795c0b..a3c4f2d98b 100644 --- a/include/wx/dynlib.h +++ b/include/wx/dynlib.h @@ -55,7 +55,7 @@ #elif defined(__DARWIN__) typedef void *wxDllType; #elif defined(__WXMAC__) - typedef CFragConnectionID wxDllType; + typedef void *wxDllType; #else # error "wxLibrary can't be compiled on this platform, sorry." #endif // OS diff --git a/include/wx/filefn.h b/include/wx/filefn.h index 4d914f458f..393abee3a1 100644 --- a/include/wx/filefn.h +++ b/include/wx/filefn.h @@ -173,18 +173,6 @@ WXDLLEXPORT void wxDos2UnixFilename(wxChar *s); WXDLLEXPORT void wxUnix2DosFilename(wxChar *s); #define Unix2DosFilename wxUnix2DosFilename -#ifdef __WXMAC__ -WXDLLEXPORT wxString wxMacFSSpec2MacFilename( const FSSpec *spec ) ; -WXDLLEXPORT void wxMacFilename2FSSpec( const char *path , FSSpec *spec ) ; -# ifndef __DARWIN__ -// Mac file names are POSIX (Unix style) under Darwin, so these are not needed -WXDLLEXPORT wxString wxMacFSSpec2UnixFilename( const FSSpec *spec ) ; -WXDLLEXPORT void wxUnixFilename2FSSpec( const char *path , FSSpec *spec ) ; -WXDLLEXPORT wxString wxMac2UnixFilename( const char *s) ; -WXDLLEXPORT wxString wxUnix2MacFilename( const char *s); -# endif -#endif - // Strip the extension, in situ WXDLLEXPORT void wxStripExtension(wxChar *buffer); WXDLLEXPORT void wxStripExtension(wxString& buffer);