Implemented wxEventLoop for wxMotif, and used it in wxDialog::ShowModal,

[wxWidgets.git] / include / wx / ffile.h

diff --git a/include/wx/ffile.h b/include/wx/ffile.h
index aee7d99257a047eb15828b523e0cc00e4474919b..3374ed94001664d4c17c97be6118e4c05f62556c 100644 (file)
--- a/include/wx/ffile.h
+++ b/include/wx/ffile.h
@@ -12,7 +12,7 @@
 #ifndef   _WX_FFILE_H_
 #define   _WX_FFILE_H_
 
 #ifndef   _WX_FFILE_H_
 #define   _WX_FFILE_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

     #pragma interface "ffile.h"
 #endif
 
     #pragma interface "ffile.h"
 #endif
 


@@ -42,13 +42,13 @@ public:
     // def ctor
   wxFFile() { m_fp = NULL; }
     // open specified file (may fail, use IsOpened())
     // def ctor
   wxFFile() { m_fp = NULL; }
     // open specified file (may fail, use IsOpened())

-  wxFFile(const wxChar *filename, const char *mode = "r");
+  wxFFile(const wxChar *filename, const wxChar *mode = _T("r"));

     // attach to (already opened) file
   wxFFile(FILE *fp) { m_fp = fp; }
 
   // open/close
     // open a file (existing or not - the mode controls what happens)
     // attach to (already opened) file
   wxFFile(FILE *fp) { m_fp = fp; }
 
   // open/close
     // open a file (existing or not - the mode controls what happens)

-  bool Open(const wxChar *filename, const char *mode = "r");
+  bool Open(const wxChar *filename, const wxChar *mode = _T("r"));

     // closes the opened file (this is a NOP if not opened)
   bool Close();
 
     // closes the opened file (this is a NOP if not opened)
   bool Close();