X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/141d782d567f92933f6fe868fff5bace77e8ecd2..58ce18f2fdadecffb21e27555115af708325cf18:/include/wx/generic/dirdlgg.h diff --git a/include/wx/generic/dirdlgg.h b/include/wx/generic/dirdlgg.h index 1c48740479..79c15b278d 100644 --- a/include/wx/generic/dirdlgg.h +++ b/include/wx/generic/dirdlgg.h @@ -15,21 +15,19 @@ #ifndef _WX_DIRDLGG_H_ #define _WX_DIRDLGG_H_ -class WXDLLEXPORT wxGenericDirCtrl; -class WXDLLEXPORT wxTextCtrl; -class WXDLLEXPORT wxTreeEvent; +class WXDLLIMPEXP_FWD_CORE wxGenericDirCtrl; +class WXDLLIMPEXP_FWD_CORE wxTextCtrl; +class WXDLLIMPEXP_FWD_CORE wxTreeEvent; // we may be included directly as well as from wx/dirdlg.h (FIXME) -extern WXDLLEXPORT_DATA(const wxChar) wxDirDialogNameStr[]; -extern WXDLLEXPORT_DATA(const wxChar) wxDirSelectorPromptStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxDirDialogNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxDirSelectorPromptStr[]; #ifndef wxDD_DEFAULT_STYLE #ifdef __WXWINCE__ - #define wxDD_DEFAULT_STYLE \ - (wxDEFAULT_DIALOG_STYLE | wxDD_NEW_DIR_BUTTON) + #define wxDD_DEFAULT_STYLE wxDEFAULT_DIALOG_STYLE #else - #define wxDD_DEFAULT_STYLE \ - (wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxDD_NEW_DIR_BUTTON) + #define wxDD_DEFAULT_STYLE (wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER) #endif #endif @@ -39,7 +37,7 @@ extern WXDLLEXPORT_DATA(const wxChar) wxDirSelectorPromptStr[]; // wxGenericDirDialog //----------------------------------------------------------------------------- -class WXDLLEXPORT wxGenericDirDialog : public wxDirDialogBase +class WXDLLIMPEXP_CORE wxGenericDirDialog : public wxDirDialogBase { public: wxGenericDirDialog() : wxDirDialogBase() { }