X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d9b21c9f47f59f36d73220270002b55a7babfdfc..3f7564f229450a9c036141878ee75cc09078a945:/utils/helpview/src/helpview.h diff --git a/utils/helpview/src/helpview.h b/utils/helpview/src/helpview.h index d4fc4cde2e..7b30b795f5 100644 --- 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.03 - -// 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 +#define hvVERSION 1.04 -#if hvUSE_IPC +#if wxUSE_IPC #include - -class hvConnection; class hvServer; #endif @@ -50,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 @@ -59,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: };