Move wxGetOSFHandle to include/wx/msw/private.h since it needs HANDLE anyway

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

diff --git a/include/wx/msw/dde.h b/include/wx/msw/dde.h
index 1c9627d55a55b1ca387623ca8b98e0562afa09a1..407039b7849c05e6543717ecf623fb3eb8d75dba 100644 (file)
--- a/include/wx/msw/dde.h
+++ b/include/wx/msw/dde.h
@@ -12,7 +12,7 @@
 #ifndef _WX_DDE_H_
 #define _WX_DDE_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "dde.h"
 #endif
 
@@ -42,10 +42,10 @@
  *
  */
 
-class WXDLLEXPORT wxDDEServer;
-class WXDLLEXPORT wxDDEClient;
+class WXDLLIMPEXP_BASE wxDDEServer;
+class WXDLLIMPEXP_BASE wxDDEClient;
 
-class WXDLLEXPORT wxDDEConnection: public wxConnectionBase
+class WXDLLIMPEXP_BASE wxDDEConnection: public wxConnectionBase
 {
   DECLARE_DYNAMIC_CLASS(wxDDEConnection)
 public:
@@ -55,6 +55,7 @@ public:
 
   // 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); }
   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 StartAdvise(const wxString& item);
@@ -66,7 +67,7 @@ public:
   // 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:
@@ -82,14 +83,14 @@ public:
     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
+  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);
 
@@ -111,7 +112,7 @@ protected:
     wxDDEConnectionList m_connections;
 };
 
-class WXDLLEXPORT wxDDEClient: public wxClientBase
+class WXDLLIMPEXP_BASE wxDDEClient: public wxClientBase
 {
   DECLARE_DYNAMIC_CLASS(wxDDEClient)
  public:
@@ -140,8 +141,8 @@ protected:
     wxDDEConnectionList m_connections;
 };
 
-void WXDLLEXPORT wxDDEInitialize();
-void WXDLLEXPORT wxDDECleanUp();
+void WXDLLIMPEXP_BASE wxDDEInitialize();
+void WXDLLIMPEXP_BASE wxDDECleanUp();
 
 #endif
     // _WX_DDE_H_