Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

conditional compilation for Mac OS X

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12134 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Gilles Depeyrot
2001-10-21 12:32:39 +00:00
parent ac0fa9eff8
commit bb378910f7
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/mac/carbon/filedlg.cpp
View File

@@ -31,9 +31,7 @@ IMPLEMENT_CLASS(wxFileDialog, wxDialog)
// begin wxmac // begin wxmac
#ifndef __DARWIN__
#include <Navigation.h> #include <Navigation.h>
#endif
#include "MoreFiles.h" #include "MoreFiles.h"
#include "MoreFilesExtras.h" #include "MoreFilesExtras.h"
@@ -301,6 +299,8 @@ void MakeUserDataRec(OpenUserDataRec *myData , const wxString& filter )
} }
} }
#ifndef __DARWIN__
void ExtendedOpenFile( ConstStr255Param message , ConstStr255Param path , const char *filter , FileFilterYDUPP fileFilter, StandardFileReply *theSFR ) void ExtendedOpenFile( ConstStr255Param message , ConstStr255Param path , const char *filter , FileFilterYDUPP fileFilter, StandardFileReply *theSFR )
{ {
Point thePt; Point thePt;
@@ -405,6 +405,7 @@ void ExtendedOpenFile( ConstStr255Param message , ConstStr255Param path , const
} }
} }
} }
#endif
static Boolean CheckFile( ConstStr255Param name , OSType type , OpenUserDataRecPtr data) static Boolean CheckFile( ConstStr255Param name , OSType type , OpenUserDataRecPtr data)
{ {
@@ -446,6 +447,7 @@ static Boolean CheckFile( ConstStr255Param name , OSType type , OpenUserDataRecP
return true ; return true ;
} }
#ifndef __DARWIN__
static pascal Boolean CrossPlatformFileFilter(CInfoPBPtr myCInfoPBPtr, void *dataPtr) static pascal Boolean CrossPlatformFileFilter(CInfoPBPtr myCInfoPBPtr, void *dataPtr)
{ {
OpenUserDataRecPtr data = (OpenUserDataRecPtr) dataPtr ; OpenUserDataRecPtr data = (OpenUserDataRecPtr) dataPtr ;
@@ -470,6 +472,7 @@ static pascal Boolean CrossPlatformFileFilter(CInfoPBPtr myCInfoPBPtr, void *dat
return false ; return false ;
} }
#endif
// end wxmac // end wxmac

7
src/mac/filedlg.cpp
View File

@@ -31,9 +31,7 @@ IMPLEMENT_CLASS(wxFileDialog, wxDialog)
// begin wxmac // begin wxmac
#ifndef __DARWIN__
#include <Navigation.h> #include <Navigation.h>
#endif
#include "MoreFiles.h" #include "MoreFiles.h"
#include "MoreFilesExtras.h" #include "MoreFilesExtras.h"
@@ -301,6 +299,8 @@ void MakeUserDataRec(OpenUserDataRec *myData , const wxString& filter )
} }
} }
#ifndef __DARWIN__
void ExtendedOpenFile( ConstStr255Param message , ConstStr255Param path , const char *filter , FileFilterYDUPP fileFilter, StandardFileReply *theSFR ) void ExtendedOpenFile( ConstStr255Param message , ConstStr255Param path , const char *filter , FileFilterYDUPP fileFilter, StandardFileReply *theSFR )
{ {
Point thePt; Point thePt;
@@ -405,6 +405,7 @@ void ExtendedOpenFile( ConstStr255Param message , ConstStr255Param path , const
} }
} }
} }
#endif
static Boolean CheckFile( ConstStr255Param name , OSType type , OpenUserDataRecPtr data) static Boolean CheckFile( ConstStr255Param name , OSType type , OpenUserDataRecPtr data)
{ {
@@ -446,6 +447,7 @@ static Boolean CheckFile( ConstStr255Param name , OSType type , OpenUserDataRecP
return true ; return true ;
} }
#ifndef __DARWIN__
static pascal Boolean CrossPlatformFileFilter(CInfoPBPtr myCInfoPBPtr, void *dataPtr) static pascal Boolean CrossPlatformFileFilter(CInfoPBPtr myCInfoPBPtr, void *dataPtr)
{ {
OpenUserDataRecPtr data = (OpenUserDataRecPtr) dataPtr ; OpenUserDataRecPtr data = (OpenUserDataRecPtr) dataPtr ;
@@ -470,6 +472,7 @@ static pascal Boolean CrossPlatformFileFilter(CInfoPBPtr myCInfoPBPtr, void *dat
return false ; return false ;
} }
#endif
// end wxmac // end wxmac