]> git.saurik.com Git - wxWidgets.git/blobdiff - samples/html/helpview/helpview.cpp
Add wxArchiveFSHandler.
[wxWidgets.git] / samples / html / helpview / helpview.cpp
index 2b2a2758596b0c06fc690ceec9ad8247a53b8289..ba4c62925decc493e010b3605e01d6f20ba1a9b3 100644 (file)
@@ -1,14 +1,10 @@
-
 /////////////////////////////////////////////////////////////////////////////
 // Name:        helpview.cpp
 // Purpose:     wxHtml help browser
+// Please note: see utils/helpview for a more fully-featured
+// standalone help browser.
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "help.cpp"
-#pragma interface "help.cpp"
-#endif
-
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
@@ -17,7 +13,7 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers
+// need because it includes almost all "standard" wxWidgets headers
 #ifndef WX_PRECOMP
 #include "wx/wx.h"
 #endif
 #include "wx/wxhtml.h"
 #include "wx/fs_zip.h"
 #include "wx/log.h"
-#include "wx/artprov.h"
 #include "wx/filedlg.h"
 
-// Set to 1 to:
-//
-// - provide different icons.
-// - add an open file icon for the toolbar.
-// - use a flat toolbar style.
-// - show a file selector if no file was given on the command line.
-// - remove 'Help:' from the title bar.
-//
-// Set to 0 to revert to previous behaviour.
-
-#define USE_ALTERNATE_UI 0
-
-#if USE_ALTERNATE_UI
-class AlternateArtProvider : public wxArtProvider
-{
-protected:
-    virtual wxBitmap CreateBitmap(const wxArtID& id, const wxArtClient& client,
-                                  const wxSize& size);
-};
-#endif
-
 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------
@@ -69,9 +43,6 @@ class MyApp : public wxApp
         virtual bool OnInit();
         virtual int OnExit();
 
-        // Prompt the user for a book to open
-        bool OpenBook(wxHtmlHelpController* controller);
-
     private:
         wxHtmlHelpController *help;
 };
@@ -86,39 +57,23 @@ bool MyApp::OnInit()
     delete wxLog::SetActiveTarget(new wxLogStderr); // So dialog boxes aren't used
 #endif
 
-#if USE_ALTERNATE_UI
-    wxArtProvider::PushProvider(new AlternateArtProvider);
-#endif
-  
     wxInitAllImageHandlers();
     wxFileSystem::AddHandler(new wxZipFSHandler);
 
-    SetVendorName("wxWindows");
-    SetAppName("wxHTMLHelp"); 
+    SetVendorName(wxT("wxWidgets"));
+    SetAppName(wxT("wxHTMLHelp")); 
     wxConfig::Get(); // create an instance
 
-    help = new wxHtmlHelpController(
-#if USE_ALTERNATE_UI
-        wxHF_DEFAULT_STYLE|wxHF_FLAT_TOOLBAR|wxHF_OPEN_FILES
-#endif
-        );
-    
-#if USE_ALTERNATE_UI
-    help->SetTitleFormat(wxT("%s"));
-    if (argc < 2) {
-        if (!OpenBook(help))
-            return FALSE;
-    }
-#else
+    help = new wxHtmlHelpController;
+
     if (argc < 2) {
         wxLogError(wxT("Usage : helpview <helpfile> [<more helpfiles>]"));
         wxLogError(wxT("  helpfile may be .hhp, .zip or .htb"));
-        return FALSE;
+        return false;
     }
-#endif
 
     for (int i = 1; i < argc; i++)
-        help -> AddBook(argv[i]);
+        help->AddBook(wxFileName(argv[i]));
 
 #ifdef __WXMOTIF__
     delete wxLog::SetActiveTarget(new wxLogGui);
@@ -126,7 +81,7 @@ bool MyApp::OnInit()
 
     help -> DisplayContents();
 
-    return TRUE;
+    return true;
 }
 
 
@@ -138,138 +93,3 @@ int MyApp::OnExit()
     return 0;
 }
 
-bool MyApp::OpenBook(wxHtmlHelpController* controller)
-{
-    wxString s = wxFileSelector(_("Open help file"),
-        wxGetCwd(),
-        wxEmptyString,
-        wxEmptyString,
-        _(
-"Help books (*.htb)|*.htb|Help books (*.zip)|*.zip|\
-HTML Help Project (*.hhp)|*.hhp"),
-    wxOPEN | wxFILE_MUST_EXIST,
-    NULL);
-
-    if (!s.IsEmpty())
-    {
-        wxString ext = s.Right(4).Lower();
-        if (ext == _T(".zip") || ext == _T(".htb") || ext == _T(".hhp"))
-        {
-            wxBusyCursor bcur;
-            controller->AddBook(s);
-            return TRUE;
-        }
-    }
-    return FALSE;
-}
-
-#if USE_ALTERNATE_UI
-
-/*
- * Art provider class
- */
-
-// ---------------------------------------------------------------------
-// helper macros
-// ---------------------------------------------------------------------
-
-// Standard macro for getting a resource from XPM file:
-#define ART(artId, xpmRc) \
-    if ( id == artId ) return wxBitmap(xpmRc##_xpm);
-
-// Compatibility hack to use wxApp::GetStdIcon of overriden by the user
-#if WXWIN_COMPATIBILITY_2_2
-    #define GET_STD_ICON_FROM_APP(iconId) \
-        if ( client == wxART_MESSAGE_BOX ) \
-        { \
-            wxIcon icon = wxTheApp->GetStdIcon(iconId); \
-            if ( icon.Ok() ) \
-            { \
-                wxBitmap bmp; \
-                bmp.CopyFromIcon(icon); \
-                return bmp; \
-            } \
-        }
-#else
-    #define GET_STD_ICON_FROM_APP(iconId)
-#endif
-
-// There are two ways of getting the standard icon: either via XPMs or via
-// wxIcon ctor. This depends on the platform:
-#if defined(__WXUNIVERSAL__)
-    #define CREATE_STD_ICON(iconId, xpmRc) return wxNullBitmap;
-#elif defined(__WXGTK__) || defined(__WXMOTIF__)
-    #define CREATE_STD_ICON(iconId, xpmRc) return wxBitmap(xpmRc##_xpm);
-#else
-    #define CREATE_STD_ICON(iconId, xpmRc) \
-        { \
-            wxIcon icon(_T(iconId)); \
-            wxBitmap bmp; \
-            bmp.CopyFromIcon(icon); \
-            return bmp; \
-        }
-#endif
-
-// Macro used in CreateBitmap to get wxICON_FOO icons:
-#define ART_MSGBOX(artId, iconId, xpmRc) \
-    if ( id == artId ) \
-    { \
-        GET_STD_ICON_FROM_APP(iconId) \
-        CREATE_STD_ICON(#iconId, xpmRc) \
-    }
-
-// ---------------------------------------------------------------------
-// XPMs with the art
-// ---------------------------------------------------------------------
-
-// XPM hack: make the arrays const
-//#define static static const
-
-#include "bitmaps/helpback.xpm"
-#include "bitmaps/helpbook.xpm"
-#include "bitmaps/helpdown.xpm"
-#include "bitmaps/helpforward.xpm"
-#include "bitmaps/helpoptions.xpm"
-#include "bitmaps/helppage.xpm"
-#include "bitmaps/helpsidepanel.xpm"
-#include "bitmaps/helpup.xpm"
-#include "bitmaps/helpuplevel.xpm"
-#include "bitmaps/helpicon.xpm"
-#include "bitmaps/helpopen.xpm"
-
-//#undef static
-
-// ---------------------------------------------------------------------
-// CreateBitmap routine
-// ---------------------------------------------------------------------
-
-wxBitmap AlternateArtProvider::CreateBitmap(const wxArtID& id,
-                                            const wxArtClient& client,
-                                            const wxSize& WXUNUSED(size))
-{
-    ART(wxART_HELP_SIDE_PANEL,                     helpsidepanel)
-    ART(wxART_HELP_SETTINGS,                       helpoptions)
-    ART(wxART_HELP_BOOK,                           helpbook)
-    ART(wxART_HELP_FOLDER,                         helpbook)
-    ART(wxART_HELP_PAGE,                           helppage)
-    //ART(wxART_ADD_BOOKMARK,                        addbookm)
-    //ART(wxART_DEL_BOOKMARK,                        delbookm)
-    ART(wxART_GO_BACK,                             helpback)
-    ART(wxART_GO_FORWARD,                          helpforward)
-    ART(wxART_GO_UP,                               helpup)
-    ART(wxART_GO_DOWN,                             helpdown)
-    ART(wxART_GO_TO_PARENT,                        helpuplevel)
-    ART(wxART_FILE_OPEN,                           helpopen)
-    if (client == wxART_HELP_BROWSER)
-    {
-        ART(wxART_FRAME_ICON,                          helpicon)
-    }
-
-    //ART(wxART_GO_HOME,                             home)
-
-    // Any wxWindows icons not implemented here
-    // will be provided by the default art provider.
-    return wxNullBitmap;
-}
-
-#endif
\ No newline at end of file