X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..4fc1c0f091f88a7af08db2b7fef6bd3637e1b026:/include/wx/msw/dde.h diff --git a/include/wx/msw/dde.h b/include/wx/msw/dde.h index 2a34b01bc7..d8b0fabebe 100644 --- a/include/wx/msw/dde.h +++ b/include/wx/msw/dde.h @@ -47,11 +47,14 @@ class WXDLLIMPEXP_BASE wxDDEConnection: public wxConnectionBase public: wxDDEConnection(wxChar *buffer, int size); // use external buffer wxDDEConnection(); // use internal buffer - ~wxDDEConnection(void); + virtual ~wxDDEConnection(void); // 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); @@ -85,7 +88,7 @@ class WXDLLIMPEXP_BASE wxDDEServer: public wxServerBase public: wxDDEServer(void); - ~wxDDEServer(void); + virtual ~wxDDEServer(void); bool Create(const wxString& server_name); // Returns false if can't create server (e.g. port // number is already in use) virtual wxConnectionBase *OnAcceptConnection(const wxString& topic); @@ -113,7 +116,7 @@ class WXDLLIMPEXP_BASE wxDDEClient: public wxClientBase DECLARE_DYNAMIC_CLASS(wxDDEClient) public: wxDDEClient(void); - ~wxDDEClient(void); + virtual ~wxDDEClient(void); bool ValidHost(const wxString& host); virtual wxConnectionBase *MakeConnection(const wxString& host, const wxString& server, const wxString& topic); // Call this to make a connection.