Small fixes after wxHtmlTagHandler::GetParser() addition.

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

diff --git a/utils/helpview/src/helpview.h b/utils/helpview/src/helpview.h
index ded9b29dbe47ff27dd4c363d1b7c0aec615f1dd7..7b30b795f5af323b77eb7dc99db48d622bcb856b 100644 (file)
--- a/utils/helpview/src/helpview.h
+++ b/utils/helpview/src/helpview.h
@@ -12,24 +12,10 @@
 #ifndef _WX_HELPVIEW_H_
 #define _WX_HELPVIEW_H_
 
 #ifndef _WX_HELPVIEW_H_
 #define _WX_HELPVIEW_H_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "help.cpp"
-#endif
-
-#define hvVERSION 1.03
+#define hvVERSION 1.04

 
 

-// If 1, start a server to allow this to be used
-// as an external help viewer.
-#if ( defined(__WXMAC__) || defined(__WXMGL__) ) && !defined(__UNIX__)
-#define hvUSE_IPC 0
-#else
-#define hvUSE_IPC 1
-#endif
-
-#if hvUSE_IPC
+#if wxUSE_IPC

 #include <wx/ipc.h>
 #include <wx/ipc.h>

-
-class hvConnection;

 class hvServer;
 #endif
 
 class hvServer;
 #endif
 


@@ -50,7 +36,7 @@ public:
 
 #ifdef __WXMAC__
     /// Respond to Apple Event for opening a document
 
 #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
 #endif
 
     /// Prompt the user for a book to open


@@ -59,7 +45,7 @@ public:
     /// Returns the help controller.
     wxHtmlHelpController* GetHelpController() { return m_helpController; }
 
     /// 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
     /// Returns the list of connections.
     wxList& GetConnections() { return m_connections; }
 #endif


@@ -67,24 +53,23 @@ public:
 private:
     wxHtmlHelpController*   m_helpController;
 
 private:
     wxHtmlHelpController*   m_helpController;
 

-#if hvUSE_IPC
+#if wxUSE_IPC

     wxList                  m_connections;
     hvServer*               m_server;
 #endif
 
 };
 
     wxList                  m_connections;
     hvServer*               m_server;
 #endif
 
 };
 

-#if hvUSE_IPC
+#if wxUSE_IPC

 class hvConnection : public wxConnection
 {
 public:
     hvConnection();
 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:
 };
 
 private:
 };