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 92327bf462dc7ec8da5e429d64d3056a42ac286c..bd1de5fd6cb34c4ed065c7937fcf69111af00e48 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_
 
 #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>
 #include <wx/ipc.h>

-
-class hvConnection;

 class hvServer;
 #endif
 
 class hvServer;
 #endif
 


@@ -63,27 +45,27 @@ 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
 
 private:
     wxHtmlHelpController*   m_helpController;
     /// 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
     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 OnExecute(const wxString& topic, wxChar*data, int size, wxIPCFormat format);
     wxChar *OnRequest(const wxString& topic, const wxString& item, int *size, wxIPCFormat format);