Added wxNB_LEFT,RIGHT,BOTTOM styles to alter tab placement

[wxWidgets.git] / include / wx / msw / dde.h

diff --git a/include/wx/msw/dde.h b/include/wx/msw/dde.h
index 5e7ec5e9f9b752d379ccb44daca4ade6e8551a7c..ac926b679fb6d611e274d5c235cc0dc09b466144 100644 (file)
--- a/include/wx/msw/dde.h
+++ b/include/wx/msw/dde.h
@@ -54,15 +54,15 @@ public:
   ~wxDDEConnection(void);
 
   // Calls that CLIENT can make
   ~wxDDEConnection(void);
 
   // Calls that CLIENT can make

-  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 bool Execute(wxChar *data, int size = -1, wxIPCFormat format = wxIPC_TEXT);
+  virtual bool Execute(const wxString& str) { return Execute(WXSTRINGCAST str, -1, wxIPC_TEXT); }

   virtual char *Request(const wxString& item, int *size = NULL, wxIPCFormat format = 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 Poke(const wxString& item, 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 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, wxIPCFormat format = wxIPC_TEXT);
+  virtual bool Advise(const wxString& item, wxChar *data, int size = -1, wxIPCFormat format = wxIPC_TEXT);

 
   // Calls that both can make
   virtual bool Disconnect(void);
 
   // Calls that both can make
   virtual bool Disconnect(void);


@@ -90,7 +90,7 @@ public:
   wxDDEClient*  m_client;
 
   WXHCONV       m_hConv;
   wxDDEClient*  m_client;
 
   WXHCONV       m_hConv;

-  char*         m_sendingData;
+  wxChar*       m_sendingData;

   int           m_dataSize;
   wxIPCFormat  m_dataType;
 };
   int           m_dataSize;
   wxIPCFormat  m_dataType;
 };