X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f36e602b3f4cccedfa2d8932c288f3dfed7b549e..f6669958924c3c3833e2932b65598b06073d2e65:/include/wx/dirdlg.h diff --git a/include/wx/dirdlg.h b/include/wx/dirdlg.h index 46dfd1bda2..d02325f8f1 100644 --- a/include/wx/dirdlg.h +++ b/include/wx/dirdlg.h @@ -20,9 +20,9 @@ // constants // ---------------------------------------------------------------------------- -extern WXDLLEXPORT_DATA(const char) wxDirDialogNameStr[]; -extern WXDLLEXPORT_DATA(const char) wxDirDialogDefaultFolderStr[]; -extern WXDLLEXPORT_DATA(const char) wxDirSelectorPromptStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxDirDialogNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxDirDialogDefaultFolderStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxDirSelectorPromptStr[]; #define wxDD_CHANGE_DIR 0x0100 #define wxDD_DIR_MUST_EXIST 0x0200 @@ -40,7 +40,7 @@ extern WXDLLEXPORT_DATA(const char) wxDirSelectorPromptStr[]; // wxDirDialogBase //------------------------------------------------------------------------- -class WXDLLEXPORT wxDirDialogBase : public wxDialog +class WXDLLIMPEXP_CORE wxDirDialogBase : public wxDialog { public: wxDirDialogBase() {} @@ -96,8 +96,7 @@ protected: #if defined(__WXUNIVERSAL__) #include "wx/generic/dirdlgg.h" #define wxDirDialog wxGenericDirDialog -#elif defined(__WXMSW__) && (defined(__SALFORDC__) || \ - !wxUSE_OLE || \ +#elif defined(__WXMSW__) && (!wxUSE_OLE || \ (defined (__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS)) #include "wx/generic/dirdlgg.h" #define wxDirDialog wxGenericDirDialog @@ -112,12 +111,11 @@ protected: #include "wx/generic/dirdlgg.h" #define wxDirDialog wxGenericDirDialog #elif defined(__WXMAC__) - #include "wx/mac/dirdlg.h" // Native Mac + #include "wx/osx/dirdlg.h" // Native Mac #elif defined(__WXCOCOA__) #include "wx/cocoa/dirdlg.h" // Native Cocoa #elif defined(__WXMOTIF__) || \ defined(__WXX11__) || \ - defined(__WXMGL__) || \ defined(__WXCOCOA__) || \ defined(__WXPM__) #include "wx/generic/dirdlgg.h" // Other ports use generic implementation @@ -128,7 +126,7 @@ protected: // common ::wxDirSelector() function // ---------------------------------------------------------------------------- -WXDLLEXPORT wxString +WXDLLIMPEXP_CORE wxString wxDirSelector(const wxString& message = wxDirSelectorPromptStr, const wxString& defaultPath = wxEmptyString, long style = wxDD_DEFAULT_STYLE,