X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3aa8e4ea6db0478d3bc862f59f100408bdc8732f..b04237742c51e022af8ca8fe8933437734f392a3:/include/wx/dialog.h diff --git a/include/wx/dialog.h b/include/wx/dialog.h index 62bfb79265..36bcb643db 100644 --- a/include/wx/dialog.h +++ b/include/wx/dialog.h @@ -53,9 +53,9 @@ enum wxDialogLayoutAdaptationMode wxDIALOG_ADAPTATION_MODE_DISABLED = 2 // disable this dialog overriding global status }; -extern WXDLLEXPORT_DATA(const char) wxDialogNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxDialogNameStr[]; -class WXDLLEXPORT wxDialogBase : public wxTopLevelWindow +class WXDLLIMPEXP_CORE wxDialogBase : public wxTopLevelWindow { public: enum @@ -224,7 +224,7 @@ private: void OnSysColourChanged(wxSysColourChangedEvent& event); - DECLARE_NO_COPY_CLASS(wxDialogBase) + wxDECLARE_NO_COPY_CLASS(wxDialogBase); DECLARE_EVENT_TABLE() }; @@ -235,7 +235,7 @@ private: * a help mechanism. */ -class WXDLLEXPORT wxDialogLayoutAdapter: public wxObject +class WXDLLIMPEXP_CORE wxDialogLayoutAdapter: public wxObject { DECLARE_CLASS(wxDialogLayoutAdapter) public: @@ -253,7 +253,7 @@ public: * */ -class WXDLLEXPORT wxStandardDialogLayoutAdapter: public wxDialogLayoutAdapter +class WXDLLIMPEXP_CORE wxStandardDialogLayoutAdapter: public wxDialogLayoutAdapter { DECLARE_CLASS(wxStandardDialogLayoutAdapter) public: @@ -314,7 +314,7 @@ public: #elif defined(__WXGTK__) #include "wx/gtk1/dialog.h" #elif defined(__WXMAC__) - #include "wx/mac/dialog.h" + #include "wx/osx/dialog.h" #elif defined(__WXCOCOA__) #include "wx/cocoa/dialog.h" #elif defined(__WXPM__)