substitute WXDLLEXPORT with WXDLLIMPEXP_CORE and WXDLLEXPORT_DATA with WXDLLIMPEXP_DATA_CORE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52834 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -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,
|
||||
|
Reference in New Issue
Block a user