From 656fc51cda91ea40154358a6adcd85ded506812a Mon Sep 17 00:00:00 2001 From: Gilles Depeyrot Date: Thu, 19 Apr 2001 19:06:42 +0000 Subject: [PATCH] corrections for Mac OS X git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9793 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/filefn.h | 2 +- include/wx/statusbr.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/wx/filefn.h b/include/wx/filefn.h index baccc0131f..8021da6a17 100644 --- a/include/wx/filefn.h +++ b/include/wx/filefn.h @@ -167,7 +167,7 @@ WXDLLEXPORT void wxDos2UnixFilename(wxChar *s); WXDLLEXPORT void wxUnix2DosFilename(wxChar *s); #define Unix2DosFilename wxUnix2DosFilename -#ifdef __WXMAC__ +#if defined(__WXMAC__) && !defined(__UNIX__) WXDLLEXPORT wxString wxMacFSSpec2MacFilename( const FSSpec *spec ) ; WXDLLEXPORT wxString wxMacFSSpec2UnixFilename( const FSSpec *spec ) ; WXDLLEXPORT void wxUnixFilename2FSSpec( const char *path , FSSpec *spec ) ; diff --git a/include/wx/statusbr.h b/include/wx/statusbr.h index 8bd7b8965e..0f1c587e6c 100644 --- a/include/wx/statusbr.h +++ b/include/wx/statusbr.h @@ -54,7 +54,7 @@ protected: #include "wx/msw/statbr95.h" typedef wxStatusBar95 wxStatusBarReal; -#elif defined(__WXMAC__) /* && !defined(__UNIX__) */ +#elif defined(__WXMAC__) #include "wx/generic/statusbr.h" #include "wx/mac/statusbr.h" -- 2.45.2