X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bddd7a8d8953cf4c09e56c13e1bfcc594ba0267e..52f2f7b2c15e10eec1607bee683e575e898bf0d8:/include/wx/msw/dde.h diff --git a/include/wx/msw/dde.h b/include/wx/msw/dde.h index 75f75ca524..407039b784 100644 --- a/include/wx/msw/dde.h +++ b/include/wx/msw/dde.h @@ -12,7 +12,7 @@ #ifndef _WX_DDE_H_ #define _WX_DDE_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "dde.h" #endif @@ -55,6 +55,7 @@ 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); } 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); @@ -66,7 +67,7 @@ public: // Calls that both can make virtual bool Disconnect(void); - // Default behaviour is to delete connection and return TRUE + // Default behaviour is to delete connection and return true virtual bool OnDisconnect(void); public: @@ -89,7 +90,7 @@ class WXDLLIMPEXP_BASE wxDDEServer: public wxServerBase wxDDEServer(void); ~wxDDEServer(void); - bool Create(const wxString& server_name); // Returns FALSE if can't create server (e.g. port + 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);