Compile fix (VC++ 6 doesn't like wxString::Format with only 1 arg: gives several...

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

diff --git a/include/wx/msw/dde.h b/include/wx/msw/dde.h
index a662dc3a97ecf8e0da5a2822cf0d380b65e77568..ae94324f63e175c7f6acd01c66bb6d90ad30aaa3 100644 (file)
--- a/include/wx/msw/dde.h
+++ b/include/wx/msw/dde.h
@@ -6,16 +6,12 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DDE_H_
 #define _WX_DDE_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "dde.h"
-#endif
-
 #include "wx/ipcbase.h"
 
 /*
@@ -42,8 +38,8 @@
  *
  */
 
-class WXDLLIMPEXP_BASE wxDDEServer;
-class WXDLLIMPEXP_BASE wxDDEClient;
+class WXDLLIMPEXP_FWD_BASE wxDDEServer;
+class WXDLLIMPEXP_FWD_BASE wxDDEClient;
 
 class WXDLLIMPEXP_BASE wxDDEConnection: public wxConnectionBase
 {
@@ -51,23 +47,26 @@ 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 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, wxChar *data, int size = -1, wxIPCFormat format = wxIPC_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);
 
-  // Default behaviour is to delete connection and return TRUE
+  // Default behaviour is to delete connection and return true
   virtual bool OnDisconnect(void);
 
  public:
@@ -76,9 +75,9 @@ public:
   wxDDEClient*  m_client;
 
   WXHCONV       m_hConv;
-  wxChar*       m_sendingData;
+  const wxChar* m_sendingData;
   int           m_dataSize;
-  wxIPCFormat  m_dataType;
+  wxIPCFormat   m_dataType;
 
     DECLARE_NO_COPY_CLASS(wxDDEConnection)
 };
@@ -89,8 +88,8 @@ class WXDLLIMPEXP_BASE wxDDEServer: public wxServerBase
  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);
 
@@ -117,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.