X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8ce68f7fc03beda6b7cbfdd7180a8f7f7eee952d..54cb21d692f6d62911820c3c6bc063af90d11e47:/include/wx/filedlg.h diff --git a/include/wx/filedlg.h b/include/wx/filedlg.h index 7abc596350..1f9b24715a 100644 --- a/include/wx/filedlg.h +++ b/include/wx/filedlg.h @@ -58,15 +58,15 @@ enum #define wxFD_DEFAULT_STYLE wxFD_OPEN -extern WXDLLEXPORT_DATA(const char) wxFileDialogNameStr[]; -extern WXDLLEXPORT_DATA(const char) wxFileSelectorPromptStr[]; -extern WXDLLEXPORT_DATA(const char) wxFileSelectorDefaultWildcardStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxFileDialogNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxFileSelectorPromptStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxFileSelectorDefaultWildcardStr[]; //---------------------------------------------------------------------------- // wxFileDialogBase //---------------------------------------------------------------------------- -class WXDLLEXPORT wxFileDialogBase: public wxDialog +class WXDLLIMPEXP_CORE wxFileDialogBase: public wxDialog { public: wxFileDialogBase () { Init(); } @@ -170,7 +170,7 @@ private: //---------------------------------------------------------------------------- // File selector - backward compatibility -WXDLLEXPORT wxString +WXDLLIMPEXP_CORE wxString wxFileSelector(const wxString& message = wxFileSelectorPromptStr, const wxString& default_path = wxEmptyString, const wxString& default_filename = wxEmptyString, @@ -181,7 +181,7 @@ wxFileSelector(const wxString& message = wxFileSelectorPromptStr, int x = wxDefaultCoord, int y = wxDefaultCoord); // An extended version of wxFileSelector -WXDLLEXPORT wxString +WXDLLIMPEXP_CORE wxString wxFileSelectorEx(const wxString& message = wxFileSelectorPromptStr, const wxString& default_path = wxEmptyString, const wxString& default_filename = wxEmptyString, @@ -192,14 +192,14 @@ wxFileSelectorEx(const wxString& message = wxFileSelectorPromptStr, int x = wxDefaultCoord, int y = wxDefaultCoord); // Ask for filename to load -WXDLLEXPORT wxString +WXDLLIMPEXP_CORE wxString wxLoadFileSelector(const wxString& what, const wxString& extension, const wxString& default_name = wxEmptyString, wxWindow *parent = NULL); // Ask for filename to save -WXDLLEXPORT wxString +WXDLLIMPEXP_CORE wxString wxSaveFileSelector(const wxString& what, const wxString& extension, const wxString& default_name = wxEmptyString, @@ -218,7 +218,7 @@ wxSaveFileSelector(const wxString& what, #elif defined(__WXGTK__) #include "wx/gtk1/filedlg.h" #elif defined(__WXMAC__) - #include "wx/mac/filedlg.h" + #include "wx/osx/filedlg.h" #elif defined(__WXCOCOA__) #include "wx/cocoa/filedlg.h" #elif defined(__WXPM__)