Implement SetShape() for wxPopupWindow in wxGTK.

[wxWidgets.git] / utils / helpview / src / helpview.h

diff --git a/utils/helpview/src/helpview.h b/utils/helpview/src/helpview.h
index 92327bf462dc7ec8da5e429d64d3056a42ac286c..7b30b795f5af323b77eb7dc99db48d622bcb856b 100644 (file)
--- a/utils/helpview/src/helpview.h
+++ b/utils/helpview/src/helpview.h
@@ -12,28 +12,10 @@
 #ifndef _WX_HELPVIEW_H_
 #define _WX_HELPVIEW_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "help.cpp"
-#endif
-
-#define hvVERSION 1.03
-
-// If 1, start a server to allow this to be used
-// as an external help viewer.
-<<<<<<< helpview.h
-#define hvUSE_IPC 0
-=======
-#if defined(__WXMAC__) && !defined(__UNIX__)
-#define hvUSE_IPC 0
-#else
-#define hvUSE_IPC 1
-#endif
->>>>>>> 1.5
+#define hvVERSION 1.04
 
-#if hvUSE_IPC
+#if wxUSE_IPC
 #include <wx/ipc.h>
-
-class hvConnection;
 class hvServer;
 #endif
 
@@ -54,7 +36,7 @@ public:
 
 #ifdef __WXMAC__
     /// Respond to Apple Event for opening a document
-    virtual void MacOpenFile(const wxString& filename);
+    virtual void MacOpenFiles(const wxArrayString& fileNames);
 #endif
 
     /// Prompt the user for a book to open
@@ -63,32 +45,31 @@ public:
     /// Returns the help controller.
     wxHtmlHelpController* GetHelpController() { return m_helpController; }
 
-#if hvUSE_IPC
+#if wxUSE_IPC
     /// Returns the list of connections.
     wxList& GetConnections() { return m_connections; }
 #endif
 
 private:
     wxHtmlHelpController*   m_helpController;
-    
-#if hvUSE_IPC
+
+#if wxUSE_IPC
     wxList                  m_connections;
     hvServer*               m_server;
 #endif
-    
+
 };
 
-#if hvUSE_IPC
+#if wxUSE_IPC
 class hvConnection : public wxConnection
 {
 public:
     hvConnection();
-    ~hvConnection();
+    virtual ~hvConnection();
 
-    bool OnExecute(const wxString& topic, wxChar*data, int size, wxIPCFormat format);
-    wxChar *OnRequest(const wxString& topic, const wxString& item, int *size, wxIPCFormat format);
-    bool OnPoke(const wxString& topic, const wxString& item, wxChar *data, int size, wxIPCFormat format);
-    bool OnStartAdvise(const wxString& topic, const wxString& item);
+    bool OnExec(const wxString& topic, const wxString& data);
+    bool OnPoke(const wxString& topic, const wxString& item,
+                const void *data, size_t size, wxIPCFormat format);
 
 private:
 };