X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d3c7fc996a73e9f6a83067bc28a3c5581a3fee65..a596eeb93f525c64d374f49e5986c57d1ea124a7:/include/wx/msw/dde.h?ds=sidebyside diff --git a/include/wx/msw/dde.h b/include/wx/msw/dde.h index 51eeb91262..4595599738 100644 --- a/include/wx/msw/dde.h +++ b/include/wx/msw/dde.h @@ -38,8 +38,8 @@ * */ -class WXDLLIMPEXP_BASE wxDDEServer; -class WXDLLIMPEXP_BASE wxDDEClient; +class WXDLLIMPEXP_FWD_BASE wxDDEServer; +class WXDLLIMPEXP_FWD_BASE wxDDEClient; class WXDLLIMPEXP_BASE wxDDEConnection: public wxConnectionBase { @@ -51,7 +51,10 @@ public: // Calls that CLIENT can make virtual bool Execute(const wxChar *data, int size = -1, wxIPCFormat format = wxIPC_TEXT); - virtual bool Execute(const wxString& str) { return Execute(str, -1, wxIPC_TEXT); } + // FIXME-UTF8: change Execute() to DoExecute() to avoid having to do this; + // don't use c_str() below after removing ANSI build + virtual bool Execute(const wxString& str) + { return Execute(str.c_str(), -1, wxIPC_TEXT); } virtual wxChar *Request(const wxString& item, int *size = NULL, wxIPCFormat format = wxIPC_TEXT); virtual bool Poke(const wxString& item, wxChar *data, int size = -1, wxIPCFormat format = wxIPC_TEXT); virtual bool StartAdvise(const wxString& item);