Fixed remaining int vs. long warnings.

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

diff --git a/src/stubs/filedlg.cpp b/src/stubs/filedlg.cpp
index 2aeffdf926776a60104fba72807157738c254091..8d1b8731a0f5c0d8ba6961e46965b2b13d59d6fa 100644 (file)
--- a/src/stubs/filedlg.cpp
+++ b/src/stubs/filedlg.cpp
@@ -19,11 +19,9 @@
 #include "wx/filedlg.h"
 #include "wx/intl.h"
 
 #include "wx/filedlg.h"
 #include "wx/intl.h"
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_CLASS(wxFileDialog, wxDialog)
 IMPLEMENT_CLASS(wxFileDialog, wxDialog)

-#endif

 
 

-char *wxFileSelector(const char *title,
+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)


@@ -53,14 +51,13 @@ char *wxFileSelector(const char *title,
 
     if ( fileDialog.ShowModal() == wxID_OK )
     {
 
     if ( fileDialog.ShowModal() == wxID_OK )
     {

-        strcpy(wxBuffer, (const char *)fileDialog.GetPath());
-        return wxBuffer;
+        return fileDialog.GetPath();

     }
     else
     }
     else

-        return NULL;
+        return wxEmptyString;

 }
 
 }
 

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

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


@@ -77,11 +74,10 @@ char *wxFileSelectorEx(const char *title,
     if ( fileDialog.ShowModal() == wxID_OK )
     {
         *defaultFilterIndex = fileDialog.GetFilterIndex();
     if ( fileDialog.ShowModal() == wxID_OK )
     {
         *defaultFilterIndex = fileDialog.GetFilterIndex();

-        strcpy(wxBuffer, (const char *)fileDialog.GetPath());
-        return wxBuffer;
+        return fileDialog.GetPath();

     }
     else
     }
     else

-        return NULL;
+        return wxEmptyString;

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


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

-static char *
-wxDefaultFileSelector(bool load, const char *what, const char *extension, const char *default_name, wxWindow *parent)
+static wxString wxDefaultFileSelector(bool load, const char *what, const char *extension, const char *default_name, wxWindow *parent)

 {
   char *ext = (char *)extension;
   
 {
   char *ext = (char *)extension;
   


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

-char *
-wxLoadFileSelector(const char *what, const char *extension, const char *default_name, wxWindow *parent)
+wxString wxLoadFileSelector(const char *what, const char *extension, const char *default_name, wxWindow *parent)

 {
   return wxDefaultFileSelector(TRUE, what, extension, default_name, parent);
 }
 
 
 // Generic file save dialog
 {
   return wxDefaultFileSelector(TRUE, what, extension, default_name, parent);
 }
 
 
 // Generic file save dialog

-char *
-wxSaveFileSelector(const char *what, const char *extension, const char *default_name, wxWindow *parent)
+wxString wxSaveFileSelector(const char *what, const char *extension, const char *default_name, wxWindow *parent)

 {
   return wxDefaultFileSelector(FALSE, what, extension, default_name, parent);
 }
 {
   return wxDefaultFileSelector(FALSE, what, extension, default_name, parent);
 }