DJGPP compilation

[wxWidgets.git] / src / mac / filedlg.cpp

diff --git a/src/mac/filedlg.cpp b/src/mac/filedlg.cpp
index b1b059f05cba9cbf365af850c90c700e311d8b41..6ca66d390fc4a8f7b6c44af9a88b55b1bc86120f 100644 (file)
--- a/src/mac/filedlg.cpp
+++ b/src/mac/filedlg.cpp
@@ -31,9 +31,7 @@ IMPLEMENT_CLASS(wxFileDialog, wxDialog)
 
 // begin wxmac
 
 
 // begin wxmac
 

-#ifndef __DARWIN__
-  #include <Navigation.h>
-#endif
+#include <Navigation.h>

 
 #include "MoreFiles.h"
 #include "MoreFilesExtras.h"
 
 #include "MoreFiles.h"
 #include "MoreFilesExtras.h"


@@ -95,7 +93,7 @@ NavEventProc(
        }
 }
 
        }
 }
 

-char * gfilters[] =
+const char * gfilters[] =

 {
        "*.TXT" ,
        "*.TIF" ,
 {
        "*.TXT" ,
        "*.TIF" ,


@@ -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 )
 {
        Point                           thePt;
 void ExtendedOpenFile( ConstStr255Param message , ConstStr255Param path , const char *filter , FileFilterYDUPP fileFilter, StandardFileReply *theSFR )
 {
        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)
 {      
        OpenUserDataRecPtr data = (OpenUserDataRecPtr) dataPtr ;
 static pascal Boolean CrossPlatformFileFilter(CInfoPBPtr myCInfoPBPtr, void *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