X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b3324be240257cb1a97c439616a1d58cb3b437cc..f196316400fd247a760b2ef77d5064b4e10e5471:/include/wx/msw/dde.h?ds=sidebyside diff --git a/include/wx/msw/dde.h b/include/wx/msw/dde.h index 31aaa334a8..ae94324f63 100644 --- a/include/wx/msw/dde.h +++ b/include/wx/msw/dde.h @@ -5,16 +5,12 @@ // Modified by: // Created: 01/02/97 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows license +// Copyright: (c) Julian Smart +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef __DDEH__ -#define __DDEH__ - -#ifdef __GNUG__ -#pragma interface "dde.h" -#endif +#ifndef _WX_DDE_H_ +#define _WX_DDE_H_ #include "wx/ipcbase.h" @@ -42,67 +38,58 @@ * */ -class WXDLLEXPORT wxDDEServer; -class WXDLLEXPORT wxDDEClient; +class WXDLLIMPEXP_FWD_BASE wxDDEServer; +class WXDLLIMPEXP_FWD_BASE wxDDEClient; -class WXDLLEXPORT wxDDEConnection: public wxConnectionBase +class WXDLLIMPEXP_BASE wxDDEConnection: public wxConnectionBase { DECLARE_DYNAMIC_CLASS(wxDDEConnection) public: - wxDDEConnection(char *buffer, int size); - wxDDEConnection(void); - ~wxDDEConnection(void); + wxDDEConnection(wxChar *buffer, int size); // use external buffer + wxDDEConnection(); // use internal buffer + virtual ~wxDDEConnection(void); // Calls that CLIENT can make - virtual bool Execute(char *data, int size = -1, wxDataFormat format = wxDF_TEXT); - virtual bool Execute(const wxString& str) { return Execute((char *)(const char *)str, -1, wxDF_TEXT); } - virtual char *Request(const wxString& item, int *size = NULL, wxDataFormat format = wxDF_TEXT); - virtual bool Poke(const wxString& item, char *data, int size = -1, wxDataFormat format = wxDF_TEXT); + virtual bool Execute(const wxChar *data, int size = -1, wxIPCFormat format = 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, const wxChar *data, int size = -1, wxIPCFormat format = wxIPC_TEXT); virtual bool StartAdvise(const wxString& item); virtual bool StopAdvise(const wxString& item); // Calls that SERVER can make - virtual bool Advise(const wxString& item, char *data, int size = -1, wxDataFormat format = wxDF_TEXT); + virtual bool Advise(const wxString& item, const wxChar *data, int size = -1, wxIPCFormat format = wxIPC_TEXT); // Calls that both can make virtual bool Disconnect(void); - // Callbacks to SERVER - override at will - virtual bool OnExecute(const wxString& topic, char *data, int size, wxDataFormat format) { return FALSE; }; - virtual char *OnRequest(const wxString& topic, const wxString& item, int *size, wxDataFormat format) { return NULL; }; - virtual bool OnPoke(const wxString& topic, const wxString& item, char *data, int size, wxDataFormat format) { return FALSE; }; - virtual bool OnStartAdvise(const wxString& topic, const wxString& item) { return FALSE; }; - virtual bool OnStopAdvise(const wxString& topic, const wxString& item) { return FALSE; }; - - // Callbacks to CLIENT - override at will - virtual bool OnAdvise(const wxString& topic, const wxString& item, char *data, int size, wxDataFormat format) { return FALSE; }; - - // Callbacks to BOTH - - // Default behaviour is to delete connection and return TRUE + // Default behaviour is to delete connection and return true virtual bool OnDisconnect(void); public: - char* m_bufPtr; wxString m_topicName; - int m_bufSize; wxDDEServer* m_server; wxDDEClient* m_client; WXHCONV m_hConv; - char* m_sendingData; + const wxChar* m_sendingData; int m_dataSize; - wxDataFormat m_dataType; + wxIPCFormat m_dataType; + + DECLARE_NO_COPY_CLASS(wxDDEConnection) }; -class WXDLLEXPORT wxDDEServer: public wxServerBase +class WXDLLIMPEXP_BASE wxDDEServer: public wxServerBase { DECLARE_DYNAMIC_CLASS(wxDDEServer) public: wxDDEServer(void); - ~wxDDEServer(void); - bool Create(const wxString& server_name); // Returns FALSE if can't create server (e.g. port + 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,20 +100,23 @@ class WXDLLEXPORT wxDDEServer: public wxServerBase wxDDEConnection *FindConnection(WXHCONV conv); bool DeleteConnection(WXHCONV conv); inline wxString& GetServiceName(void) const { return (wxString&) m_serviceName; } - inline wxList& GetConnections(void) const { return (wxList&) m_connections; } - - protected: - int m_lastError; - wxString m_serviceName; - wxList m_connections; + inline wxDDEConnectionList& GetConnections(void) const + { + return (wxDDEConnectionList&) m_connections; + } + +protected: + int m_lastError; + wxString m_serviceName; + wxDDEConnectionList m_connections; }; -class WXDLLEXPORT wxDDEClient: public wxClientBase +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. @@ -139,24 +129,19 @@ class WXDLLEXPORT wxDDEClient: public wxClientBase // Find/delete wxDDEConnection corresponding to the HCONV wxDDEConnection *FindConnection(WXHCONV conv); bool DeleteConnection(WXHCONV conv); - inline wxList& GetConnections(void) const { return (wxList&) m_connections; } - protected: - int m_lastError; - wxList m_connections; -}; + inline wxDDEConnectionList& GetConnections(void) const + { + return (wxDDEConnectionList&) m_connections; + } -void WXDLLEXPORT wxDDEInitialize(); -void WXDLLEXPORT wxDDECleanUp(); +protected: + int m_lastError; + wxDDEConnectionList m_connections; +}; -// Compatibility -#if WXWIN_COMPATIBILITY -#define wxServer wxDDEServer -#define wxClient wxDDEClient -#define wxConnection wxDDEConnection -#define wxIPCInitialize wxDDEInitialize -#define wxIPCCleanUp wxDDECleanUp -#endif +void WXDLLIMPEXP_BASE wxDDEInitialize(); +void WXDLLIMPEXP_BASE wxDDECleanUp(); #endif - // __DDEH__ + // _WX_DDE_H_