Copy headers and get MDI and glcanvas fully building for OS X Cocoa port.

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

diff --git a/utils/helpview/src/helpview.h b/utils/helpview/src/helpview.h
index e49a93031ae42caa8ee14a1252f29cbb6a1c0486..bd1de5fd6cb34c4ed065c7937fcf69111af00e48 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_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "help.cpp"
-#endif
-
-#define hvVERSION 1.02
+#define hvVERSION 1.04
 
-// If 1, start a server to allow this to be used
-// as an external help viewer.
-#if defined(__WXMAC__) && !defined(__UNIX__)
-#define hvUSE_IPC 0
-#else
-#define hvUSE_IPC 1
-#endif
-
-#if hvUSE_IPC
+#if wxUSE_IPC
 #include <wx/ipc.h>
-
-class hvConnection;
 class hvServer;
 #endif
 
@@ -47,34 +33,39 @@ public:
 
     /// Clean up the application's data.
     virtual int OnExit();
-    
+
+#ifdef __WXMAC__
+    /// Respond to Apple Event for opening a document
+    virtual void MacOpenFile(const wxString& filename);
+#endif
+
     /// Prompt the user for a book to open
     bool OpenBook(wxHtmlHelpController* controller);
 
     /// 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);