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 7193ee45e6a063bc0080b879bcffe82ecba31bff..ae94324f63e175c7f6acd01c66bb6d90ad30aaa3 100644 (file)
--- a/include/wx/msw/dde.h
+++ b/include/wx/msw/dde.h
@@ -12,10 +12,6 @@
 #ifndef _WX_DDE_H_
 #define _WX_DDE_H_
 
 #ifndef _WX_DDE_H_
 #define _WX_DDE_H_
 

-#ifdef __GNUG__
-#pragma interface "dde.h"
-#endif
-

 #include "wx/ipcbase.h"
 
 /*
 #include "wx/ipcbase.h"
 
 /*


@@ -42,31 +38,35 @@
  *
  */
 
  *
  */
 

-class WXDLLEXPORT_BASE wxDDEServer;
-class WXDLLEXPORT_BASE wxDDEClient;
+class WXDLLIMPEXP_FWD_BASE wxDDEServer;
+class WXDLLIMPEXP_FWD_BASE wxDDEClient;

 
 

-class WXDLLEXPORT_BASE wxDDEConnection: public wxConnectionBase
+class WXDLLIMPEXP_BASE wxDDEConnection: public wxConnectionBase

 {
   DECLARE_DYNAMIC_CLASS(wxDDEConnection)
 public:
   wxDDEConnection(wxChar *buffer, int size); // use external buffer
   wxDDEConnection(); // use internal buffer
 {
   DECLARE_DYNAMIC_CLASS(wxDDEConnection)
 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);
 
   // Calls that CLIENT can make
   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 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 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);
 
 
   // 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:
   virtual bool OnDisconnect(void);
 
  public:


@@ -75,21 +75,21 @@ public:
   wxDDEClient*  m_client;
 
   WXHCONV       m_hConv;
   wxDDEClient*  m_client;
 
   WXHCONV       m_hConv;

-  wxChar*       m_sendingData;
+  const wxChar* m_sendingData;

   int           m_dataSize;
   int           m_dataSize;

-  wxIPCFormat  m_dataType;
+  wxIPCFormat   m_dataType;

 
     DECLARE_NO_COPY_CLASS(wxDDEConnection)
 };
 
 
     DECLARE_NO_COPY_CLASS(wxDDEConnection)
 };
 

-class WXDLLEXPORT_BASE wxDDEServer: public wxServerBase
+class WXDLLIMPEXP_BASE wxDDEServer: public wxServerBase

 {
   DECLARE_DYNAMIC_CLASS(wxDDEServer)
  public:
 
   wxDDEServer(void);
 {
   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);
 
                                   // number is already in use)
   virtual wxConnectionBase *OnAcceptConnection(const wxString& topic);
 


@@ -111,12 +111,12 @@ protected:
     wxDDEConnectionList m_connections;
 };
 
     wxDDEConnectionList m_connections;
 };
 

-class WXDLLEXPORT_BASE wxDDEClient: public wxClientBase
+class WXDLLIMPEXP_BASE wxDDEClient: public wxClientBase

 {
   DECLARE_DYNAMIC_CLASS(wxDDEClient)
  public:
   wxDDEClient(void);
 {
   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.
   bool ValidHost(const wxString& host);
   virtual wxConnectionBase *MakeConnection(const wxString& host, const wxString& server, const wxString& topic);
                                                 // Call this to make a connection.


@@ -140,8 +140,8 @@ protected:
     wxDDEConnectionList m_connections;
 };
 
     wxDDEConnectionList m_connections;
 };
 

-void WXDLLEXPORT_BASE wxDDEInitialize();
-void WXDLLEXPORT_BASE wxDDECleanUp();
+void WXDLLIMPEXP_BASE wxDDEInitialize();
+void WXDLLIMPEXP_BASE wxDDECleanUp();

 
 #endif
     // _WX_DDE_H_
 
 #endif
     // _WX_DDE_H_