MingW32 compilation works now.

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

diff --git a/src/mac/filedlg.cpp b/src/mac/filedlg.cpp
index 2aeffdf926776a60104fba72807157738c254091..b6f5b1912dfc28663d161dfb4d5d88c2a79c5fe1 100644 (file)
--- a/src/mac/filedlg.cpp
+++ b/src/mac/filedlg.cpp
@@ -23,7 +23,7 @@
 IMPLEMENT_CLASS(wxFileDialog, wxDialog)
 #endif
 
 IMPLEMENT_CLASS(wxFileDialog, wxDialog)
 #endif
 

-char *wxFileSelector(const char *title,
+WXDLLEXPORT wxString wxFileSelector(const char *title,

                      const char *defaultDir, const char *defaultFileName,
                      const char *defaultExtension, const char *filter, int flags,
                      wxWindow *parent, int x, int y)
                      const char *defaultDir, const char *defaultFileName,
                      const char *defaultExtension, const char *filter, int flags,
                      wxWindow *parent, int x, int y)


@@ -57,10 +57,10 @@ char *wxFileSelector(const char *title,
         return wxBuffer;
     }
     else
         return wxBuffer;
     }
     else

-        return NULL;
+        return wxGetEmptyString();

 }
 
 }
 

-char *wxFileSelectorEx(const char *title,
+WXDLLEXPORT wxString wxFileSelectorEx(const char *title,

                        const char *defaultDir,
                        const char *defaultFileName,
                        int* defaultFilterIndex,
                        const char *defaultDir,
                        const char *defaultFileName,
                        int* defaultFilterIndex,


@@ -81,7 +81,7 @@ char *wxFileSelectorEx(const char *title,
         return wxBuffer;
     }
     else
         return wxBuffer;
     }
     else

-        return NULL;
+        return wxGetEmptyString();

 }
 
 wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
 }
 
 wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,


@@ -105,7 +105,7 @@ int wxFileDialog::ShowModal()
 }
 
 // Generic file load/save dialog
 }
 
 // Generic file load/save dialog

-static char *
+static wxString

 wxDefaultFileSelector(bool load, const char *what, const char *extension, const char *default_name, wxWindow *parent)
 {
   char *ext = (char *)extension;
 wxDefaultFileSelector(bool load, const char *what, const char *extension, const char *default_name, wxWindow *parent)
 {
   char *ext = (char *)extension;


@@ -126,7 +126,7 @@ wxDefaultFileSelector(bool load, const char *what, const char *extension, const
 }
 
 // Generic file load dialog
 }
 
 // Generic file load dialog

-char *
+wxString

 wxLoadFileSelector(const char *what, const char *extension, const char *default_name, wxWindow *parent)
 {
   return wxDefaultFileSelector(TRUE, what, extension, default_name, parent);
 wxLoadFileSelector(const char *what, const char *extension, const char *default_name, wxWindow *parent)
 {
   return wxDefaultFileSelector(TRUE, what, extension, default_name, parent);


@@ -134,7 +134,7 @@ wxLoadFileSelector(const char *what, const char *extension, const char *default_
 
 
 // Generic file save dialog
 
 
 // Generic file save dialog

-char *
+wxString

 wxSaveFileSelector(const char *what, const char *extension, const char *default_name, wxWindow *parent)
 {
   return wxDefaultFileSelector(FALSE, what, extension, default_name, parent);
 wxSaveFileSelector(const char *what, const char *extension, const char *default_name, wxWindow *parent)
 {
   return wxDefaultFileSelector(FALSE, what, extension, default_name, parent);