ReDOS-ified project files

Added menubar for wxHTML help viewer on Mac
Added some Mac-specific code for HelpView

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18768 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/html/helpfrm.h b/include/wx/html/helpfrm.h
index 0f6ac5b4e6d03c52fe055e06d2a9a45df167d682..2d8c439e13e6f7994dd51c2b8445008d7b242d20 100644 (file)
--- a/include/wx/html/helpfrm.h
+++ b/include/wx/html/helpfrm.h
@@ -168,6 +168,11 @@ protected:
     void OnCloseWindow(wxCloseEvent& event);
     void OnActivate(wxActivateEvent& event);
 
     void OnCloseWindow(wxCloseEvent& event);
     void OnActivate(wxActivateEvent& event);
 

+#ifdef __WXMAC__
+    void OnQuit(wxCommandEvent& event);
+    void OnAbout(wxCommandEvent& event);
+#endif
+

     // Images:
     enum {
         IMG_Book = 0,
     // Images:
     enum {
         IMG_Book = 0,

diff --git a/src/html/helpfrm.cpp b/src/html/helpfrm.cpp
index 43d9494eec2f2e836d3f5912c9924e2994ae3a71..332129b27366588cd62b5947ab1a27621b23478d 100644 (file)
--- a/src/html/helpfrm.cpp
+++ b/src/html/helpfrm.cpp
@@ -252,6 +252,25 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id,
 
     SetIcon(wxArtProvider::GetIcon(wxART_HELP, wxART_HELP_BROWSER));
 
 
     SetIcon(wxArtProvider::GetIcon(wxART_HELP, wxART_HELP_BROWSER));
 

+    // On the Mac, each modeless frame must have a menubar.
+    // TODO: add more menu items, and perhaps add a style to show
+    // the menubar: compulsory on the Mac, optional elsewhere.
+#ifdef __WXMAC__
+    wxMenuBar* menuBar = new wxMenuBar;
+
+    wxMenu* fileMenu = new wxMenu;
+    fileMenu->Append(wxID_HTML_OPENFILE, _("&Open..."));
+    fileMenu->Append(wxID_ABOUT, _("&About..."));
+    fileMenu->AppendSeparator();
+    fileMenu->Append(wxID_CLOSE, _("&Close"));
+
+//    wxMenu* helpMenu = new wxMenu;
+//    helpMenu->Append(wxID_ABOUT, _("&About..."));
+
+    menuBar->Append(fileMenu);
+    SetMenuBar(menuBar);
+#endif
+

     int notebook_page = 0;
 
     CreateStatusBar();
     int notebook_page = 0;
 
     CreateStatusBar();


@@ -1497,6 +1516,19 @@ void wxHtmlHelpFrame::OnCloseWindow(wxCloseEvent& evt)
     evt.Skip();
 }
 
     evt.Skip();
 }
 

+#ifdef __WXMAC__
+void wxHtmlHelpFrame::OnQuit(wxCommandEvent& event)
+{
+    Close(TRUE);
+}
+
+void wxHtmlHelpFrame::OnAbout(wxCommandEvent& event)
+{
+    wxMessageBox(wxT("wxWindows HTML Help Viewer (c) 1998-2003, Vaclav Slavik et al"), wxT("HelpView"),
+        wxICON_INFORMATION|wxOK, this);
+}
+#endif
+

 BEGIN_EVENT_TABLE(wxHtmlHelpFrame, wxFrame)
     EVT_ACTIVATE(wxHtmlHelpFrame::OnActivate)
     EVT_TOOL_RANGE(wxID_HTML_PANEL, wxID_HTML_OPTIONS, wxHtmlHelpFrame::OnToolbar)
 BEGIN_EVENT_TABLE(wxHtmlHelpFrame, wxFrame)
     EVT_ACTIVATE(wxHtmlHelpFrame::OnActivate)
     EVT_TOOL_RANGE(wxID_HTML_PANEL, wxID_HTML_OPTIONS, wxHtmlHelpFrame::OnToolbar)


@@ -1512,6 +1544,11 @@ BEGIN_EVENT_TABLE(wxHtmlHelpFrame, wxFrame)
     EVT_BUTTON(wxID_HTML_INDEXBUTTONALL, wxHtmlHelpFrame::OnIndexAll)
     EVT_COMBOBOX(wxID_HTML_BOOKMARKSLIST, wxHtmlHelpFrame::OnBookmarksSel)
     EVT_CLOSE(wxHtmlHelpFrame::OnCloseWindow)
     EVT_BUTTON(wxID_HTML_INDEXBUTTONALL, wxHtmlHelpFrame::OnIndexAll)
     EVT_COMBOBOX(wxID_HTML_BOOKMARKSLIST, wxHtmlHelpFrame::OnBookmarksSel)
     EVT_CLOSE(wxHtmlHelpFrame::OnCloseWindow)

+#ifdef __WXMAC__
+    EVT_MENU(wxID_CLOSE, wxHtmlHelpFrame::OnQuit)
+    EVT_MENU(wxID_ABOUT, wxHtmlHelpFrame::OnAbout)
+#endif
+

 END_EVENT_TABLE()
 
 #endif // wxUSE_WXHTML_HELP
 END_EVENT_TABLE()
 
 #endif // wxUSE_WXHTML_HELP

diff --git a/src/jpeg/jpeg.dsp b/src/jpeg/jpeg.dsp
index 8ec7e89f34eda3af824bf00637b6c27de32577ab..6bed87d7299b1404c9916a2d0a1e1e51f4dbc79b 100644 (file)
--- a/src/jpeg/jpeg.dsp
+++ b/src/jpeg/jpeg.dsp
@@ -1,5 +1,5 @@
 # Microsoft Developer Studio Project File - Name="jpeg" - Package Owner=<4>
 # Microsoft Developer Studio Project File - Name="jpeg" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# Microsoft Developer Studio Generated Build File, Format Version 6.00 

 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Static Library" 0x0104
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Static Library" 0x0104

diff --git a/src/jpeg/jpeg.dsw b/src/jpeg/jpeg.dsw
index 31caaf98762eda4ea52468f13d481b4d786adfb6..df7d94f2ca48d1c1a8e678c2cd1104c04e41d1a5 100644 (file)
--- a/src/jpeg/jpeg.dsw
+++ b/src/jpeg/jpeg.dsw
@@ -1,4 +1,4 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
+Microsoft Developer Studio Workspace File, Format Version 6.00 

 # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
 
 ###############################################################################
 # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
 
 ###############################################################################

diff --git a/src/png/png.dsp b/src/png/png.dsp
index b2458bfde430e3fc8ba95ea340b95eea0e1291e8..dafe6c208e844ed10cbe26550369dae90b5000cf 100644 (file)
--- a/src/png/png.dsp
+++ b/src/png/png.dsp
@@ -1,4 +1,4 @@
-# Microsoft Developer Studio Project File - Name="png" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="png" - Package Owner=<4> 

 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 

diff --git a/src/png/png.dsw b/src/png/png.dsw
index 58c98b69e66afdc02a1c79caae180c1bab66ede3..81ddffbbf0546fc8e50b1dabafd63e49104038e8 100644 (file)
--- a/src/png/png.dsw
+++ b/src/png/png.dsw
@@ -1,4 +1,4 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
+Microsoft Developer Studio Workspace File, Format Version 6.00 

 # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
 
 ###############################################################################
 # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
 
 ###############################################################################

diff --git a/src/tiff/tiff.dsp b/src/tiff/tiff.dsp
index e608866278c949675b032e1a44b5331800747e28..e7ab091c47bb5324c4d4b266b85e64dcdb8b748c 100644 (file)
--- a/src/tiff/tiff.dsp
+++ b/src/tiff/tiff.dsp
@@ -1,5 +1,5 @@
 # Microsoft Developer Studio Project File - Name="tiff" - Package Owner=<4>
 # Microsoft Developer Studio Project File - Name="tiff" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# Microsoft Developer Studio Generated Build File, Format Version 6.00 

 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Static Library" 0x0104
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Static Library" 0x0104

diff --git a/src/tiff/tiff.dsw b/src/tiff/tiff.dsw
index 8e9111524cff2f3074fd9a1bc35c912e505c86f2..bec9eea0d94dae2b9f86da18ace448b5020a407d 100644 (file)
--- a/src/tiff/tiff.dsw
+++ b/src/tiff/tiff.dsw
@@ -1,4 +1,4 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
+Microsoft Developer Studio Workspace File, Format Version 6.00 

 # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
 
 ###############################################################################
 # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
 
 ###############################################################################

diff --git a/src/zlib/zlib.dsp b/src/zlib/zlib.dsp
index 73fff52a14711d54383367b90f622995a96df1f5..4d5a7a276f833230a194f47d5ef5ec99d4b44bf3 100644 (file)
--- a/src/zlib/zlib.dsp
+++ b/src/zlib/zlib.dsp
@@ -1,5 +1,5 @@
 # Microsoft Developer Studio Project File - Name="zlib" - Package Owner=<4>
 # Microsoft Developer Studio Project File - Name="zlib" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# Microsoft Developer Studio Generated Build File, Format Version 6.00 

 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Static Library" 0x0104
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Static Library" 0x0104

diff --git a/utils/helpview/src/helpview.cpp b/utils/helpview/src/helpview.cpp
index 40202308466f47c0e67439c3cc062790dd1b5108..b2ed6bb6fdfdac5437850825c52c1473e1060924 100644 (file)
--- a/utils/helpview/src/helpview.cpp
+++ b/utils/helpview/src/helpview.cpp
@@ -27,6 +27,7 @@
 #include "wx/wx.h"
 #endif
 
 #include "wx/wx.h"
 #endif
 

+#include "wx/filename.h"

 #include "wx/image.h"
 #include "wx/wxhtml.h"
 #include "wx/fs_zip.h"
 #include "wx/image.h"
 #include "wx/wxhtml.h"
 #include "wx/fs_zip.h"


@@ -60,6 +61,10 @@ bool hvApp::OnInit()
        
     wxArtProvider::PushProvider(new AlternateArtProvider);
        
        
     wxArtProvider::PushProvider(new AlternateArtProvider);
        

+#ifdef __WXMAC__
+    wxFileName::MacRegisterDefaultTypeAndCreator( "htb" , 'HTBD' , 'HTBA' ) ;
+#endif
+

     int istyle = wxHF_DEFAULT_STYLE;
        
     wxString service, windowName, book[10], titleFormat, argStr;
     int istyle = wxHF_DEFAULT_STYLE;
        
     wxString service, windowName, book[10], titleFormat, argStr;


@@ -138,7 +143,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"),
     if ( bookCount < 1 )
     {
                wxString s = wxFileSelector( wxT("Open help file"),


@@ -157,7 +164,8 @@ bool hvApp::OnInit()
                        bookCount = 1;
                }
     } 
                        bookCount = 1;
                }
     } 

-       
+#endif
+    

 #if hvUSE_IPC
        
     if ( createServer ) {
 #if hvUSE_IPC
        
     if ( createServer ) {


@@ -267,6 +275,18 @@ bool hvApp::OpenBook(wxHtmlHelpController* controller)
     return FALSE;
 }
 
     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
 */
 /*
 * Art provider class
 */

diff --git a/utils/helpview/src/helpview.h b/utils/helpview/src/helpview.h
index e49a93031ae42caa8ee14a1252f29cbb6a1c0486..d4fc4cde2ec147ed0fd4064eab262d03960fe2ae 100644 (file)
--- a/utils/helpview/src/helpview.h
+++ b/utils/helpview/src/helpview.h
@@ -16,7 +16,7 @@
 #pragma interface "help.cpp"
 #endif
 
 #pragma interface "help.cpp"
 #endif
 

-#define hvVERSION 1.02
+#define hvVERSION 1.03

 
 // If 1, start a server to allow this to be used
 // as an external help viewer.
 
 // If 1, start a server to allow this to be used
 // as an external help viewer.


@@ -47,7 +47,12 @@ public:
 
     /// Clean up the application's data.
     virtual int OnExit();
 
     /// 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);
 
     /// Prompt the user for a book to open
     bool OpenBook(wxHtmlHelpController* controller);