New DnD and Clipboard code
Rearranged wxApp to do the same in the same order upon program start-up on wxGTK and wxMSW ODBC tweaks exchanged wxDataFormat for wxIPCFormat git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1427 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -54,28 +54,28 @@ public:
|
||||
~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(char *data, int size = -1, wxIPCFormat format = wxIPC_TEXT);
|
||||
virtual bool Execute(const wxString& str) { return Execute((char *)(const char *)str, -1, wxIPC_TEXT); }
|
||||
virtual char *Request(const wxString& item, int *size = NULL, wxIPCFormat format = wxIPC_TEXT);
|
||||
virtual bool Poke(const wxString& item, char *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, char *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 OnExecute(const wxString& topic, char *data, int size, wxIPCFormat format) { return FALSE; };
|
||||
virtual char *OnRequest(const wxString& topic, const wxString& item, int *size, wxIPCFormat format) { return NULL; };
|
||||
virtual bool OnPoke(const wxString& topic, const wxString& item, char *data, int size, wxIPCFormat 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; };
|
||||
virtual bool OnAdvise(const wxString& topic, const wxString& item, char *data, int size, wxIPCFormat format) { return FALSE; };
|
||||
|
||||
// Callbacks to BOTH
|
||||
|
||||
@@ -92,7 +92,7 @@ public:
|
||||
WXHCONV m_hConv;
|
||||
char* m_sendingData;
|
||||
int m_dataSize;
|
||||
wxDataFormat m_dataType;
|
||||
wxIPCFormat m_dataType;
|
||||
};
|
||||
|
||||
class WXDLLEXPORT wxDDEServer: public wxServerBase
|
||||
|
Reference in New Issue
Block a user