X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9d683b445cd7419e523588fc64f768ca0cc8b10a..9c712743cb68109d97927a129818c50e0b8e74c0:/utils/helpview/src/helpview.cpp

diff --git a/utils/helpview/src/helpview.cpp b/utils/helpview/src/helpview.cpp
index 4020230846..22474726a2 100644
--- a/utils/helpview/src/helpview.cpp
+++ b/utils/helpview/src/helpview.cpp
@@ -27,6 +27,7 @@
 #include "wx/wx.h"
 #endif
 
+#include "wx/filename.h"
 #include "wx/image.h"
 #include "wx/wxhtml.h"
 #include "wx/fs_zip.h"
@@ -60,6 +61,11 @@ bool hvApp::OnInit()
 	
     wxArtProvider::PushProvider(new AlternateArtProvider);
 	
+#ifdef __WXMAC__
+    wxApp::s_macAboutMenuItemId = wxID_ABOUT;
+    wxFileName::MacRegisterDefaultTypeAndCreator( "htb" , 'HTBD' , 'HTBA' ) ;
+#endif
+
     int istyle = wxHF_DEFAULT_STYLE;
 	
     wxString service, windowName, book[10], titleFormat, argStr;
@@ -138,7 +144,9 @@ bool hvApp::OnInit()
 		}
     }
 	
-    //no book - query user
+    // No book - query user; but not on Mac, since there
+    // may be an AppleEvent to open a document on the way
+#ifndef __WXMAC__
     if ( bookCount < 1 )
     {
 		wxString s = wxFileSelector( wxT("Open help file"),
@@ -157,7 +165,8 @@ bool hvApp::OnInit()
 			bookCount = 1;
 		}
     } 
-	
+#endif
+    
 #if hvUSE_IPC
 	
     if ( createServer ) {
@@ -267,6 +276,18 @@ bool hvApp::OpenBook(wxHtmlHelpController* controller)
     return FALSE;
 }
 
+#ifdef __WXMAC__
+/// Respond to Apple Event for opening a document
+void hvApp::MacOpenFile(const wxString& filename)
+{
+    wxBusyCursor bcur;
+    wxFileName fileName(filename);
+    m_helpController->AddBook(fileName);
+    m_helpController->DisplayContents();
+}
+#endif
+
+
 /*
 * Art provider class
 */