compilation fix for non-threaded compilation (threads are still broken

[wxWidgets.git] / src / html / helpfrm.cpp

diff --git a/src/html/helpfrm.cpp b/src/html/helpfrm.cpp
index 9d86198baec4037743d8d12e4046274e771d4ab5..aa742ebb450288af7d1aa29fe9dfd5b49c29fbe7 100644 (file)
--- a/src/html/helpfrm.cpp
+++ b/src/html/helpfrm.cpp
@@ -52,6 +52,8 @@
 #include "bitmaps/wpage.xpm"
 #include "bitmaps/whelp.xpm"
 #include "bitmaps/whlproot.xpm"
 #include "bitmaps/wpage.xpm"
 #include "bitmaps/whelp.xpm"
 #include "bitmaps/whlproot.xpm"

+#include "bitmaps/wbkadd.xpm"
+#include "bitmaps/wbkdel.xpm"

 #endif
 
 #include "wx/stream.h"
 #endif
 
 #include "wx/stream.h"


@@ -60,8 +62,12 @@
 // is updated.
 #define PROGRESS_STEP 40
 
 // is updated.
 #define PROGRESS_STEP 40
 

+// what is considered "small index"?
+#define INDEX_IS_SMALL 100
+
+

 //--------------------------------------------------------------------------
 //--------------------------------------------------------------------------

-// wxHtmlHelpTreeItemData
+// wxHtmlHelpTreeItemData (private)

 //--------------------------------------------------------------------------
 
 class wxHtmlHelpTreeItemData : public wxTreeItemData
 //--------------------------------------------------------------------------
 
 class wxHtmlHelpTreeItemData : public wxTreeItemData


@@ -71,12 +77,15 @@ class wxHtmlHelpTreeItemData : public wxTreeItemData
 
     public:
         wxHtmlHelpTreeItemData(wxHtmlContentsItem *it) : wxTreeItemData()
 
     public:
         wxHtmlHelpTreeItemData(wxHtmlContentsItem *it) : wxTreeItemData()

-        {
-            m_Page = it -> m_Book -> GetBasePath() + it -> m_Page;
-        }
+            {
+                m_Page = it -> m_Book -> GetBasePath() + it -> m_Page;
+            }

         const wxString& GetPage() { return m_Page; }
 };
 
         const wxString& GetPage() { return m_Page; }
 };
 

+
+
+

 //---------------------------------------------------------------------------
 // wxHtmlHelpFrame
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
 // wxHtmlHelpFrame
 //---------------------------------------------------------------------------


@@ -107,7 +116,10 @@ void wxHtmlHelpFrame::Init(wxHtmlHelpData* data)
     m_ContentsImageList -> Add(wxICON(whlproot));
 
     m_ContentsBox = NULL;
     m_ContentsImageList -> Add(wxICON(whlproot));
 
     m_ContentsBox = NULL;

-    m_IndexBox = NULL;
+    m_IndexList = NULL;
+    m_IndexButton = NULL;
+    m_IndexButtonAll = NULL;
+    m_IndexText = NULL;

     m_SearchList = NULL;
     m_SearchButton = NULL;
     m_SearchText = NULL;
     m_SearchList = NULL;
     m_SearchButton = NULL;
     m_SearchText = NULL;


@@ -115,6 +127,7 @@ void wxHtmlHelpFrame::Init(wxHtmlHelpData* data)
     m_Splitter = NULL;
     m_NavigPan = NULL;
     m_HtmlWin = NULL;
     m_Splitter = NULL;
     m_NavigPan = NULL;
     m_HtmlWin = NULL;

+    m_Bookmarks = NULL;

     m_Config = NULL;
     m_ConfigRoot = wxEmptyString;
 
     m_Config = NULL;
     m_ConfigRoot = wxEmptyString;
 


@@ -127,14 +140,13 @@ void wxHtmlHelpFrame::Init(wxHtmlHelpData* data)
     m_NormalFonts = m_FixedFonts = NULL;
     m_FontSize = 1;
     m_NormalFace = m_FixedFace = wxEmptyString;
     m_NormalFonts = m_FixedFonts = NULL;
     m_FontSize = 1;
     m_NormalFace = m_FixedFace = wxEmptyString;

-    m_NormalItalic =  m_FixedItalic = wxSLANT;

 }
 
 // Create: builds the GUI components.
 // with the style flag it's possible to toggle the toolbar, contents, index and search
 // controls.
 // m_HtmlWin will *always* be created, but it's important to realize that
 }
 
 // Create: builds the GUI components.
 // with the style flag it's possible to toggle the toolbar, contents, index and search
 // controls.
 // m_HtmlWin will *always* be created, but it's important to realize that

-// m_ContentsBox, m_IndexBox, m_SearchList, m_SearchButton, m_SearchText and
+// m_ContentsBox, m_IndexList, m_SearchList, m_SearchButton, m_SearchText and

 // m_SearchButton may be NULL.
 // moreover, if no contents, index or searchpage is needed, m_Splitter and
 // m_NavigPan will be NULL too (with m_HtmlWin directly connected to the frame)
 // m_SearchButton may be NULL.
 // moreover, if no contents, index or searchpage is needed, m_Splitter and
 // m_NavigPan will be NULL too (with m_HtmlWin directly connected to the frame)


@@ -147,7 +159,7 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id, const wxString& ti
     if (m_Config)
         ReadCustomization(m_Config, m_ConfigRoot);
 
     if (m_Config)
         ReadCustomization(m_Config, m_ConfigRoot);
 

-    wxFrame::Create(parent, id, _("Help"), wxPoint(m_Cfg.x, m_Cfg.y), wxSize(m_Cfg.w, m_Cfg.h));
+    wxFrame::Create(parent, id, _("Help"), wxPoint(m_Cfg.x, m_Cfg.y), wxSize(m_Cfg.w, m_Cfg.h), wxDEFAULT_FRAME_STYLE, "wxHtmlHelp");

 
     GetPosition(&m_Cfg.x, &m_Cfg.y);
 
 
     GetPosition(&m_Cfg.x, &m_Cfg.y);
 


@@ -160,7 +172,7 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id, const wxString& ti
     // toolbar?
     if (style & wxHF_TOOLBAR) {
         wxToolBar *toolBar = CreateToolBar(wxNO_BORDER | wxTB_HORIZONTAL | wxTB_DOCKABLE);
     // toolbar?
     if (style & wxHF_TOOLBAR) {
         wxToolBar *toolBar = CreateToolBar(wxNO_BORDER | wxTB_HORIZONTAL | wxTB_DOCKABLE);

-        toolBar -> SetMargins(2, 2);
+        toolBar->SetMargins( 2, 2 );

 
         toolBar -> AddTool(wxID_HTML_PANEL, wxBITMAP(wpanel), wxNullBitmap,
                            FALSE, -1, -1, (wxObject *) NULL,
 
         toolBar -> AddTool(wxID_HTML_PANEL, wxBITMAP(wpanel), wxNullBitmap,
                            FALSE, -1, -1, (wxObject *) NULL,


@@ -172,6 +184,26 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id, const wxString& ti
         toolBar -> AddTool(wxID_HTML_FORWARD, wxBITMAP(wforward), wxNullBitmap,
                            FALSE, -1, -1, (wxObject *) NULL,
                            _("Go forward to the next HTML page"));
         toolBar -> AddTool(wxID_HTML_FORWARD, wxBITMAP(wforward), wxNullBitmap,
                            FALSE, -1, -1, (wxObject *) NULL,
                            _("Go forward to the next HTML page"));

+        toolBar -> AddSeparator();
+
+        if (style & wxHF_BOOKMARKS) {
+            m_Bookmarks = new wxComboBox(toolBar, wxID_HTML_BOOKMARKSLIST, wxEmptyString, 
+                                         wxDefaultPosition, wxSize(300,-1), 0, NULL, wxCB_READONLY | wxCB_SORT);
+            m_Bookmarks -> Append(_("<bookmarks>"));
+            for (unsigned i = 0; i < m_BookmarksNames.GetCount(); i++)
+                m_Bookmarks -> Append(m_BookmarksNames[i]);
+            m_Bookmarks -> SetSelection(0);
+            toolBar -> AddControl(m_Bookmarks);
+#ifdef __WXGTK__
+            toolBar -> AddSeparator();
+#endif
+            toolBar -> AddTool(wxID_HTML_BOOKMARKSADD, wxBITMAP(wbkadd), wxNullBitmap,
+                               FALSE, -1, -1, (wxObject *) NULL,
+                               _("Add current page to bookmarks"));
+            toolBar -> AddTool(wxID_HTML_BOOKMARKSREMOVE, wxBITMAP(wbkdel), wxNullBitmap,
+                               FALSE, -1, -1, (wxObject *) NULL,
+                               _("Remove current page from bookmarks"));
+        }

 
         toolBar -> AddSeparator();
         toolBar -> AddTool(wxID_HTML_OPTIONS, wxBITMAP(woptions), wxNullBitmap,
 
         toolBar -> AddSeparator();
         toolBar -> AddTool(wxID_HTML_OPTIONS, wxBITMAP(woptions), wxNullBitmap,


@@ -211,15 +243,48 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id, const wxString& ti
     // index listbox panel?
     if (style & wxHF_INDEX) {
         wxWindow *dummy = new wxPanel(m_NavigPan, wxID_HTML_INDEXPAGE);
     // index listbox panel?
     if (style & wxHF_INDEX) {
         wxWindow *dummy = new wxPanel(m_NavigPan, wxID_HTML_INDEXPAGE);

+

         wxLayoutConstraints *b1 = new wxLayoutConstraints;
         wxLayoutConstraints *b1 = new wxLayoutConstraints;

-        b1 -> top.SameAs (dummy, wxTop, 0);
-        b1 -> left.SameAs (dummy, wxLeft, 0);
-        b1 -> width.PercentOf (dummy, wxWidth, 100);
-        b1 -> bottom.SameAs (dummy, wxBottom, 0);
-        m_IndexBox = new wxListBox(dummy, wxID_HTML_INDEXLIST, wxDefaultPosition,
-                                   wxDefaultSize, 0, NULL, wxLB_SINGLE | wxLB_ALWAYS_SB);
-        m_IndexBox -> SetConstraints(b1);
+        m_IndexText = new wxTextCtrl(dummy, wxID_HTML_INDEXTEXT, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER);
+        b1 -> top.SameAs (dummy, wxTop, 10);
+        b1 -> left.SameAs (dummy, wxLeft, 10);
+        b1 -> right.SameAs (dummy, wxRight, 10);
+        b1 -> height.AsIs();
+        m_IndexText -> SetConstraints(b1);
+
+        wxLayoutConstraints *b4 = new wxLayoutConstraints;
+        m_IndexButtonAll = new wxButton(dummy, wxID_HTML_INDEXBUTTONALL, _("Show all"));
+
+        b4 -> top.Below (m_IndexText, 10);
+        b4 -> right.SameAs (dummy, wxRight, 10);
+        b4 -> width.AsIs();
+        b4 -> height.AsIs();
+        m_IndexButtonAll -> SetConstraints(b4);
+
+        wxLayoutConstraints *b2 = new wxLayoutConstraints;
+        m_IndexButton = new wxButton(dummy, wxID_HTML_INDEXBUTTON, _("Find"));
+        b2 -> top.Below (m_IndexText, 10);
+        b2 -> right.LeftOf (m_IndexButtonAll, 10);
+        b2 -> width.AsIs();
+        b2 -> height.AsIs();
+        m_IndexButton -> SetConstraints(b2);
+
+        wxLayoutConstraints *b3 = new wxLayoutConstraints;
+        m_IndexList = new wxListBox(dummy, wxID_HTML_INDEXLIST, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_SINGLE | wxLB_ALWAYS_SB);
+        b3 -> top.Below (m_IndexButton, 10);
+        b3 -> left.SameAs (dummy, wxLeft, 0);
+        b3 -> right.SameAs (dummy, wxRight, 0);
+        b3 -> bottom.SameAs (dummy, wxBottom, 0);
+        m_IndexList -> SetConstraints(b3);
+
+#if wxUSE_TOOLTIPS
+        m_IndexButtonAll -> SetToolTip(_("Show all items in index"));
+        m_IndexButton -> SetToolTip(_("Display all index items that contain given substring. Note that this is case sensitive, so 'window' and 'Window' is something else!"));
+#endif //wxUSE_TOOLTIPS
+

         dummy -> SetAutoLayout(TRUE);
         dummy -> SetAutoLayout(TRUE);

+        dummy -> Layout();
+

         m_NavigPan -> AddPage(dummy, _("Index"));
         m_IndexPage = notebook_page++;
     }
         m_NavigPan -> AddPage(dummy, _("Index"));
         m_IndexPage = notebook_page++;
     }


@@ -229,7 +294,7 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id, const wxString& ti
         wxWindow *dummy = new wxPanel(m_NavigPan, wxID_HTML_SEARCHPAGE);
 
         wxLayoutConstraints *b1 = new wxLayoutConstraints;
         wxWindow *dummy = new wxPanel(m_NavigPan, wxID_HTML_SEARCHPAGE);
 
         wxLayoutConstraints *b1 = new wxLayoutConstraints;

-        m_SearchText = new wxTextCtrl(dummy, wxID_HTML_SEARCHTEXT);
+        m_SearchText = new wxTextCtrl(dummy, wxID_HTML_SEARCHTEXT, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER);

         b1 -> top.SameAs (dummy, wxTop, 10);
         b1 -> left.SameAs (dummy, wxLeft, 10);
         b1 -> right.SameAs (dummy, wxRight, 10);
         b1 -> top.SameAs (dummy, wxTop, 10);
         b1 -> left.SameAs (dummy, wxLeft, 10);
         b1 -> right.SameAs (dummy, wxRight, 10);


@@ -238,6 +303,9 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id, const wxString& ti
 
         wxLayoutConstraints *b2 = new wxLayoutConstraints;
         m_SearchButton = new wxButton(dummy, wxID_HTML_SEARCHBUTTON, _("Search"));
 
         wxLayoutConstraints *b2 = new wxLayoutConstraints;
         m_SearchButton = new wxButton(dummy, wxID_HTML_SEARCHBUTTON, _("Search"));

+#if wxUSE_TOOLTIPS
+        m_SearchButton -> SetToolTip(_("Search contents of help book(s) for all occurences of the text you typed above"));
+#endif //wxUSE_TOOLTIPS

         b2 -> top.Below (m_SearchText, 10);
         b2 -> left.SameAs (dummy, wxLeft, 10);
         b2 -> width.AsIs();
         b2 -> top.Below (m_SearchText, 10);
         b2 -> left.SameAs (dummy, wxLeft, 10);
         b2 -> width.AsIs();


@@ -254,7 +322,7 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id, const wxString& ti
         m_SearchChoice -> SetConstraints(b4);
 
         wxLayoutConstraints *b3 = new wxLayoutConstraints;
         m_SearchChoice -> SetConstraints(b4);
 
         wxLayoutConstraints *b3 = new wxLayoutConstraints;

-        m_SearchList = new wxListBox(dummy, wxID_HTML_SEARCHLIST, wxDefaultPosition, wxDefaultSize, 0);
+        m_SearchList = new wxListBox(dummy, wxID_HTML_SEARCHLIST, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_SINGLE | wxLB_ALWAYS_SB);

         b3 -> top.Below (m_SearchButton, 10);
         b3 -> left.SameAs (dummy, wxLeft, 0);
         b3 -> right.SameAs (dummy, wxRight, 0);
         b3 -> top.Below (m_SearchButton, 10);
         b3 -> left.SameAs (dummy, wxLeft, 0);
         b3 -> right.SameAs (dummy, wxRight, 0);


@@ -340,7 +408,7 @@ bool wxHtmlHelpFrame::DisplayContents()
 
 bool wxHtmlHelpFrame::DisplayIndex()
 {
 
 bool wxHtmlHelpFrame::DisplayIndex()
 {

-    if (! m_IndexBox)
+    if (! m_IndexList)

         return FALSE;
     if (!m_Splitter -> IsSplit()) {
         m_NavigPan -> Show(TRUE);
         return FALSE;
     if (!m_Splitter -> IsSplit()) {
         m_NavigPan -> Show(TRUE);


@@ -439,7 +507,7 @@ void wxHtmlHelpFrame::CreateContents(bool show_progress)
                 break;
             wxYield();
         }
                 break;
             wxYield();
         }

-        roots[it -> m_Level + 1] = m_ContentsBox -> AppendItem(
+        roots[it -> m_Level + 1] =  m_ContentsBox -> AppendItem(

                                        roots[it -> m_Level], it -> m_Name, IMG_Page, -1,
                                        new wxHtmlHelpTreeItemData(it));
 
                                        roots[it -> m_Level], it -> m_Name, IMG_Page, -1,
                                        new wxHtmlHelpTreeItemData(it));
 


@@ -464,15 +532,18 @@ void wxHtmlHelpFrame::CreateContents(bool show_progress)
 
 void wxHtmlHelpFrame::CreateIndex(bool show_progress)
 {
 
 void wxHtmlHelpFrame::CreateIndex(bool show_progress)
 {

-    if (! m_IndexBox)
+    if (! m_IndexList)

         return ;
 
     wxProgressDialog *progress = NULL;
     wxString proginfo;
 
         return ;
 
     wxProgressDialog *progress = NULL;
     wxString proginfo;
 

-    m_IndexBox->Clear();
+    m_IndexList->Clear();

 
     int cnt = m_Data->GetIndexCnt();
 
     int cnt = m_Data->GetIndexCnt();

+    
+    if (cnt > INDEX_IS_SMALL) return;
+    

     int div = (cnt / PROGRESS_STEP) + 1;
 
     wxHtmlContentsItem* index = m_Data->GetIndex();
     int div = (cnt / PROGRESS_STEP) + 1;
 
     wxHtmlContentsItem* index = m_Data->GetIndex();


@@ -488,7 +559,7 @@ void wxHtmlHelpFrame::CreateIndex(bool show_progress)
                 break;
             wxYield();
         }
                 break;
             wxYield();
         }

-        m_IndexBox -> Append(index[i].m_Name, (char*)(index + i));
+        m_IndexList -> Append(index[i].m_Name, (char*)(index + i));

     }
 
     if (show_progress)
     }
 
     if (show_progress)


@@ -537,8 +608,32 @@ void wxHtmlHelpFrame::ReadCustomization(wxConfigBase *cfg, const wxString& path)
     m_FixedFace = cfg -> Read("hcFixedFace", m_FixedFace);
     m_NormalFace = cfg -> Read("hcNormalFace", m_NormalFace);
     m_FontSize = cfg -> Read("hcFontSize", m_FontSize);
     m_FixedFace = cfg -> Read("hcFixedFace", m_FixedFace);
     m_NormalFace = cfg -> Read("hcNormalFace", m_NormalFace);
     m_FontSize = cfg -> Read("hcFontSize", m_FontSize);

-    m_NormalItalic = cfg -> Read("hcNormalItalic", m_NormalItalic);
-    m_FixedItalic = cfg -> Read("hcFixedItalic", m_FixedItalic);
+
+    {
+        int i;
+        int cnt;
+        wxString val, s;
+        
+        cnt = cfg -> Read("hcBookmarksCnt", 0L);
+        if (cnt != 0) {
+            m_BookmarksNames.Clear();
+            m_BookmarksPages.Clear();
+            if (m_Bookmarks) {
+                m_Bookmarks -> Clear();
+                m_Bookmarks -> Append(_("<bookmarks>"));
+            }
+                    
+            for (i = 0; i < cnt; i++) {
+                val.Printf(wxT("hcBookmark_%i"), i);
+                s = cfg -> Read(val);
+                m_BookmarksNames.Add(s);
+                if (m_Bookmarks) m_Bookmarks -> Append(s);
+                val.Printf(wxT("hcBookmark_%i_url"), i);
+                s = cfg -> Read(val);
+                m_BookmarksPages.Add(s);
+            }
+        }
+    }

 
     if (m_HtmlWin)
         m_HtmlWin->ReadCustomization(cfg, path);
 
     if (m_HtmlWin)
         m_HtmlWin->ReadCustomization(cfg, path);


@@ -566,8 +661,20 @@ void wxHtmlHelpFrame::WriteCustomization(wxConfigBase *cfg, const wxString& path
     cfg -> Write("hcFixedFace", m_FixedFace);
     cfg -> Write("hcNormalFace", m_NormalFace);
     cfg -> Write("hcFontSize", (long)m_FontSize);
     cfg -> Write("hcFixedFace", m_FixedFace);
     cfg -> Write("hcNormalFace", m_NormalFace);
     cfg -> Write("hcFontSize", (long)m_FontSize);

-    cfg -> Write("hcNormalItalic", (long)m_NormalItalic);
-    cfg -> Write("hcFixedItalic", (long)m_FixedItalic);
+    
+    if (m_Bookmarks) {
+        int i;
+        int cnt = m_BookmarksNames.GetCount();
+        wxString val;
+        
+        cfg -> Write("hcBookmarksCnt", (long)cnt);
+        for (i = 0; i < cnt; i++) {
+            val.Printf(wxT("hcBookmark_%i"), i);
+            cfg -> Write(val, m_BookmarksNames[i]);
+            val.Printf(wxT("hcBookmark_%i_url"), i);
+            cfg -> Write(val, m_BookmarksPages[i]);
+        }
+    }

 
     if (m_HtmlWin)
         m_HtmlWin->WriteCustomization(cfg, path);
 
     if (m_HtmlWin)
         m_HtmlWin->WriteCustomization(cfg, path);


@@ -580,7 +687,7 @@ void wxHtmlHelpFrame::WriteCustomization(wxConfigBase *cfg, const wxString& path
 
 
 
 
 
 

-static void SetFontsToHtmlWin(wxHtmlWindow *win, wxString scalf, int scalit, wxString fixf, int fixit, int size)
+static void SetFontsToHtmlWin(wxHtmlWindow *win, wxString scalf, wxString fixf, int size)

 {
     static int f_sizes[3][7] = 
         {
 {
     static int f_sizes[3][7] = 
         {


@@ -589,7 +696,7 @@ static void SetFontsToHtmlWin(wxHtmlWindow *win, wxString scalf, int scalit, wxS
             {14, 16, 18, 24, 32, 38, 45}
         };
 
             {14, 16, 18, 24, 32, 38, 45}
         };
 

-    win -> SetFonts(scalf, scalit, fixf, fixit, f_sizes[size]);
+    win -> SetFonts(scalf, fixf, f_sizes[size]);

 }
 
 
 }
 
 


@@ -597,60 +704,44 @@ class wxHtmlHelpFrameOptionsDialog : public wxDialog
 {
     public:
         wxComboBox *NormalFont, *FixedFont;
 {
     public:
         wxComboBox *NormalFont, *FixedFont;

-        wxRadioButton *SFI_i, *SFI_s, *FFI_i, *FFI_s;

         wxRadioBox *RadioBox;
         wxHtmlWindow *TestWin;
 
         wxHtmlHelpFrameOptionsDialog(wxWindow *parent) : wxDialog(parent, -1, wxString(_("Help Browser Options")))
             {
                 wxString choices[3] = {_("small"), _("medium"), _("large")};
         wxRadioBox *RadioBox;
         wxHtmlWindow *TestWin;
 
         wxHtmlHelpFrameOptionsDialog(wxWindow *parent) : wxDialog(parent, -1, wxString(_("Help Browser Options")))
             {
                 wxString choices[3] = {_("small"), _("medium"), _("large")};

-                wxString choices2[2] = {_("italic"), _("slant")};
-                wxBoxSizer *topsizer, *sizer, *sizer2, *sizer3;
+                wxBoxSizer *topsizer, *sizer, *sizer2;

 
                 topsizer = new wxBoxSizer(wxVERTICAL);
 
                 sizer = new wxBoxSizer(wxHORIZONTAL);
 
 
                 topsizer = new wxBoxSizer(wxVERTICAL);
 
                 sizer = new wxBoxSizer(wxHORIZONTAL);
 

-                sizer2 = new wxBoxSizer(wxVERTICAL);
-                sizer2 -> Add(new wxStaticText(this, -1, _("Normal font:")), 
-                              0, wxLEFT | wxTOP, 10);
-                sizer2 -> Add(NormalFont = new wxComboBox(this, -1, wxEmptyString, wxDefaultPosition, wxSize(200, -1), 0, NULL, wxCB_DROPDOWN | wxCB_READONLY),
+                sizer2 = new wxStaticBoxSizer( new wxStaticBox(this, -1, _("Normal font:")), wxVERTICAL);
+                sizer2 -> Add(NormalFont = new wxComboBox(this, -1, wxEmptyString, wxDefaultPosition, 
+                              wxSize(200, 200), 
+                              0, NULL, wxCB_DROPDOWN | wxCB_READONLY),

                               1, wxEXPAND | wxLEFT | wxRIGHT, 10);
 
                               1, wxEXPAND | wxLEFT | wxRIGHT, 10);
 

-                sizer3 = new wxBoxSizer(wxHORIZONTAL);
-                sizer3 -> Add(SFI_i = new wxRadioButton(this, -1, _("use italic"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP), 
-                              1, wxEXPAND, 0);
-                sizer3 -> Add(SFI_s = new wxRadioButton(this, -1, _("use slant"), wxDefaultPosition, wxDefaultSize, 0), 
-                              1, wxEXPAND, 0);
-                sizer2 -> Add(sizer3, 0, wxEXPAND | wxLEFT | wxRIGHT, 10);
+                sizer -> Add(sizer2, 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10);

 
 

-                sizer -> Add(sizer2, 0, wxEXPAND | wxLEFT | wxRIGHT, 10);
-
-                sizer2 = new wxBoxSizer(wxVERTICAL);
-                sizer2 -> Add(new wxStaticText(this, -1, _("Fixed font:")), 
-                              0, wxLEFT | wxTOP, 10);
-                sizer2 -> Add(FixedFont = new wxComboBox(this, -1, wxEmptyString, wxDefaultPosition, wxSize(200, -1), 0, NULL, wxCB_DROPDOWN | wxCB_READONLY), 
+                sizer2 = new wxStaticBoxSizer( new wxStaticBox(this, -1, _("Fixed font:")), wxVERTICAL);
+                sizer2 -> Add(FixedFont = new wxComboBox(this, -1, wxEmptyString, wxDefaultPosition, 
+                              wxSize(200, 200), 
+                              0, NULL, wxCB_DROPDOWN | wxCB_READONLY), 

                               1, wxEXPAND | wxLEFT | wxRIGHT, 10);
 
                               1, wxEXPAND | wxLEFT | wxRIGHT, 10);
 

-                sizer3 = new wxBoxSizer(wxHORIZONTAL);
-                sizer3 -> Add(FFI_i = new wxRadioButton(this, -1, _("use italic"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP), 
-                              1, wxEXPAND, 0);
-                sizer3 -> Add(FFI_s = new wxRadioButton(this, -1, _("use slant"), wxDefaultPosition, wxDefaultSize, 0), 
-                              1, wxEXPAND, 0);
-                sizer2 -> Add(sizer3, 0, wxEXPAND | wxLEFT | wxRIGHT, 10);
-
-                sizer -> Add(sizer2, 0, wxEXPAND | wxLEFT | wxRIGHT, 10);
+                sizer -> Add(sizer2, 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10);

 
                 topsizer -> Add(sizer);
 
                 topsizer -> Add(RadioBox = new wxRadioBox(this, -1, _("Font size:"), 
                                                           wxDefaultPosition, wxDefaultSize, 3, choices, 3), 
 
                 topsizer -> Add(sizer);
 
                 topsizer -> Add(RadioBox = new wxRadioBox(this, -1, _("Font size:"), 
                                                           wxDefaultPosition, wxDefaultSize, 3, choices, 3), 

-                                0, wxEXPAND | wxLEFT | wxRIGHT, 10);
+                                0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10);

                                 
                 topsizer -> Add(new wxStaticText(this, -1, _("Preview:")), 
                                 0, wxLEFT | wxTOP, 10);
                 topsizer -> Add(TestWin = new wxHtmlWindow(this, -1, wxDefaultPosition, wxSize(-1, 150)), 
                                 
                 topsizer -> Add(new wxStaticText(this, -1, _("Preview:")), 
                                 0, wxLEFT | wxTOP, 10);
                 topsizer -> Add(TestWin = new wxHtmlWindow(this, -1, wxDefaultPosition, wxSize(-1, 150)), 

-                                1, wxEXPAND | wxLEFT | wxTOP, 10);
+                                1, wxEXPAND | wxLEFT|wxTOP|wxRIGHT, 10);

 
                 sizer = new wxBoxSizer(wxHORIZONTAL);
                 sizer -> Add(new wxButton(this, wxID_OK, _("OK")), 0, wxALL, 10);
 
                 sizer = new wxBoxSizer(wxHORIZONTAL);
                 sizer -> Add(new wxButton(this, wxID_OK, _("OK")), 0, wxALL, 10);


@@ -668,8 +759,8 @@ class wxHtmlHelpFrameOptionsDialog : public wxDialog
             {
                 wxBusyCursor bcur;
                 SetFontsToHtmlWin(TestWin, 
             {
                 wxBusyCursor bcur;
                 SetFontsToHtmlWin(TestWin, 

-                                  NormalFont -> GetStringSelection(), SFI_i -> GetValue() ? wxITALIC : wxSLANT,
-                                  FixedFont -> GetStringSelection(), FFI_i -> GetValue() ? wxITALIC : wxSLANT,
+                                  NormalFont -> GetStringSelection(),
+                                  FixedFont -> GetStringSelection(),

                                   RadioBox -> GetSelection());
                 TestWin -> SetPage(_("<html><body>"
                                    "Normal face<br>(and <u>underlined</u>. <i>Italic face.</i> "
                                   RadioBox -> GetSelection());
                 TestWin -> SetPage(_("<html><body>"
                                    "Normal face<br>(and <u>underlined</u>. <i>Italic face.</i> "


@@ -683,14 +774,14 @@ class wxHtmlHelpFrameOptionsDialog : public wxDialog
                                    "<font size=+4>font size +4</font><br>"
 
                                    "<p><tt>Fixed size face.<br> <b>bold</b> <i>italic</i> "
                                    "<font size=+4>font size +4</font><br>"
 
                                    "<p><tt>Fixed size face.<br> <b>bold</b> <i>italic</i> "

-                                   "<b><i>bold italic <u>underlined</u></i></b></tt><br>"
+                                   "<b><i>bold italic <u>underlined</u></i></b><br>"

                                    "<font size=-2>font size -2</font><br>"
                                    "<font size=-1>font size -1</font><br>"
                                    "<font size=+0>font size +0</font><br>"
                                    "<font size=+1>font size +1</font><br>"
                                    "<font size=+2>font size +2</font><br>"
                                    "<font size=+3>font size +3</font><br>"
                                    "<font size=-2>font size -2</font><br>"
                                    "<font size=-1>font size -1</font><br>"
                                    "<font size=+0>font size +0</font><br>"
                                    "<font size=+1>font size +1</font><br>"
                                    "<font size=+2>font size +2</font><br>"
                                    "<font size=+3>font size +3</font><br>"

-                                   "<font size=+4>font size +4</font>"
+                                   "<font size=+4>font size +4</font></tt>"

                                    "</body></html>"));
             }
 
                                    "</body></html>"));
             }
 


@@ -705,7 +796,6 @@ class wxHtmlHelpFrameOptionsDialog : public wxDialog
 BEGIN_EVENT_TABLE(wxHtmlHelpFrameOptionsDialog, wxDialog)
     EVT_COMBOBOX(-1, wxHtmlHelpFrameOptionsDialog::OnUpdate)
     EVT_RADIOBOX(-1, wxHtmlHelpFrameOptionsDialog::OnUpdate)
 BEGIN_EVENT_TABLE(wxHtmlHelpFrameOptionsDialog, wxDialog)
     EVT_COMBOBOX(-1, wxHtmlHelpFrameOptionsDialog::OnUpdate)
     EVT_RADIOBOX(-1, wxHtmlHelpFrameOptionsDialog::OnUpdate)

-    EVT_RADIOBUTTON(-1, wxHtmlHelpFrameOptionsDialog::OnUpdate)

 END_EVENT_TABLE()
 
 
 END_EVENT_TABLE()
 
 


@@ -738,19 +828,13 @@ void wxHtmlHelpFrame::OptionsDialog()
     if (!m_FixedFace.IsEmpty()) dlg.FixedFont -> SetStringSelection(m_FixedFace);
     else dlg.FixedFont -> SetSelection(0);
     dlg.RadioBox -> SetSelection(m_FontSize);
     if (!m_FixedFace.IsEmpty()) dlg.FixedFont -> SetStringSelection(m_FixedFace);
     else dlg.FixedFont -> SetSelection(0);
     dlg.RadioBox -> SetSelection(m_FontSize);

-    dlg.SFI_i -> SetValue(m_NormalItalic == wxITALIC);
-    dlg.SFI_s -> SetValue(m_NormalItalic == wxSLANT);
-    dlg.FFI_i -> SetValue(m_FixedItalic == wxITALIC);
-    dlg.FFI_s -> SetValue(m_FixedItalic == wxSLANT);

     dlg.UpdateTestWin();
     
     if (dlg.ShowModal() == wxID_OK) {
         m_NormalFace = dlg.NormalFont -> GetStringSelection();
         m_FixedFace = dlg.FixedFont -> GetStringSelection();
         m_FontSize = dlg.RadioBox -> GetSelection();
     dlg.UpdateTestWin();
     
     if (dlg.ShowModal() == wxID_OK) {
         m_NormalFace = dlg.NormalFont -> GetStringSelection();
         m_FixedFace = dlg.FixedFont -> GetStringSelection();
         m_FontSize = dlg.RadioBox -> GetSelection();

-        m_NormalItalic = dlg.SFI_i -> GetValue() ? wxITALIC : wxSLANT;
-        m_FixedItalic = dlg.FFI_i -> GetValue() ? wxITALIC : wxSLANT;
-        SetFontsToHtmlWin(m_HtmlWin, m_NormalFace, m_NormalItalic, m_FixedFace, m_FixedItalic, m_FontSize);
+        SetFontsToHtmlWin(m_HtmlWin, m_NormalFace, m_FixedFace, m_FontSize);

     }
 }
 
     }
 }
 


@@ -766,12 +850,15 @@ EVENT HANDLING :
 void wxHtmlHelpFrame::OnToolbar(wxCommandEvent& event)
 {
     switch (event.GetId()) {
 void wxHtmlHelpFrame::OnToolbar(wxCommandEvent& event)
 {
     switch (event.GetId()) {

+

         case wxID_HTML_BACK :
             m_HtmlWin -> HistoryBack();
             break;
         case wxID_HTML_BACK :
             m_HtmlWin -> HistoryBack();
             break;

+

         case wxID_HTML_FORWARD :
             m_HtmlWin -> HistoryForward();
             break;
         case wxID_HTML_FORWARD :
             m_HtmlWin -> HistoryForward();
             break;

+

         case wxID_HTML_PANEL :
             if (! (m_Splitter && m_NavigPan))
                 return ;
         case wxID_HTML_PANEL :
             if (! (m_Splitter && m_NavigPan))
                 return ;


@@ -786,9 +873,41 @@ void wxHtmlHelpFrame::OnToolbar(wxCommandEvent& event)
                 m_Cfg.navig_on = TRUE;
             }
             break;
                 m_Cfg.navig_on = TRUE;
             }
             break;

+

         case wxID_HTML_OPTIONS :
             OptionsDialog();
             break;
         case wxID_HTML_OPTIONS :
             OptionsDialog();
             break;

+            
+        case wxID_HTML_BOOKMARKSADD : 
+            {
+                wxString item;
+                wxString url;
+                
+                item = m_HtmlWin -> GetOpenedPageTitle();
+                url = m_HtmlWin -> GetOpenedPage();
+                if (item == wxEmptyString) item = url.AfterLast(wxT('/'));
+                if (m_BookmarksPages.Index(url) == wxNOT_FOUND) {
+                    m_Bookmarks -> Append(item);
+                    m_BookmarksNames.Add(item);
+                    m_BookmarksPages.Add(url);
+                }
+            }
+            break;
+            
+        case wxID_HTML_BOOKMARKSREMOVE : 
+            {
+                wxString item;
+                int pos;
+                
+                item = m_Bookmarks -> GetStringSelection();
+                pos = m_BookmarksNames.Index(item);
+                if (pos != wxNOT_FOUND) {
+                    m_BookmarksNames.Remove(pos);
+                    m_BookmarksPages.Remove(pos);
+                    m_Bookmarks -> Delete(m_Bookmarks -> GetSelection());
+                }
+            }
+            break;

     }
 }
 
     }
 }
 


@@ -806,11 +925,58 @@ void wxHtmlHelpFrame::OnContentsSel(wxTreeEvent& event)
 
 void wxHtmlHelpFrame::OnIndexSel(wxCommandEvent& WXUNUSED(event))
 {
 
 void wxHtmlHelpFrame::OnIndexSel(wxCommandEvent& WXUNUSED(event))
 {

-    wxHtmlContentsItem *it = (wxHtmlContentsItem*) m_IndexBox -> GetClientData(m_IndexBox -> GetSelection());
+    wxHtmlContentsItem *it = (wxHtmlContentsItem*) m_IndexList -> GetClientData(m_IndexList -> GetSelection());

     m_HtmlWin -> LoadPage(it -> m_Book -> GetBasePath() + it -> m_Page);
 }
 
 
     m_HtmlWin -> LoadPage(it -> m_Book -> GetBasePath() + it -> m_Page);
 }
 
 

+void wxHtmlHelpFrame::OnIndexFind(wxCommandEvent& event)
+{
+    wxString sr = m_IndexText -> GetLineText(0);
+    if (sr == wxEmptyString) 
+        OnIndexAll(event);
+
+    else {
+        wxBusyCursor bcur;
+        const wxChar *cstr = sr.c_str();
+        bool first = TRUE;
+    
+        m_IndexList->Clear();
+        int cnt = m_Data->GetIndexCnt();
+        wxHtmlContentsItem* index = m_Data->GetIndex();
+
+        for (int i = 0; i < cnt; i++)
+            if (wxStrstr(index[i].m_Name, cstr) != NULL) {
+                m_IndexList -> Append(index[i].m_Name, (char*)(index + i));
+                if (first) {
+                    m_HtmlWin -> LoadPage(index[i].m_Book -> GetBasePath() + index[i].m_Page);
+                    first = FALSE;
+                }
+            }
+
+        m_IndexText -> SetSelection(0, sr.Length());
+        m_IndexText -> SetFocus();
+    }
+}
+
+void wxHtmlHelpFrame::OnIndexAll(wxCommandEvent& WXUNUSED(event))
+{
+    wxBusyCursor bcur;
+    
+    m_IndexList->Clear();
+    int cnt = m_Data->GetIndexCnt();
+    bool first = TRUE;
+    wxHtmlContentsItem* index = m_Data->GetIndex();
+
+    for (int i = 0; i < cnt; i++) {
+        m_IndexList -> Append(index[i].m_Name, (char*)(index + i));
+        if (first) {
+            m_HtmlWin -> LoadPage(index[i].m_Book -> GetBasePath() + index[i].m_Page);
+            first = FALSE;
+        }
+    }
+}
+

 
 void wxHtmlHelpFrame::OnSearchSel(wxCommandEvent& WXUNUSED(event))
 {
 
 void wxHtmlHelpFrame::OnSearchSel(wxCommandEvent& WXUNUSED(event))
 {


@@ -825,6 +991,14 @@ void wxHtmlHelpFrame::OnSearch(wxCommandEvent& WXUNUSED(event))
     if (sr != wxEmptyString) KeywordSearch(sr);
 }
 
     if (sr != wxEmptyString) KeywordSearch(sr);
 }
 

+void wxHtmlHelpFrame::OnBookmarksSel(wxCommandEvent& WXUNUSED(event))
+{
+    wxString sr = m_Bookmarks -> GetStringSelection();
+
+    if (sr != wxEmptyString && sr != _("<bookmarks>"))
+        m_HtmlWin -> LoadPage(m_BookmarksPages[m_BookmarksNames.Index(sr)]);
+}
+

 void wxHtmlHelpFrame::OnCloseWindow(wxCloseEvent& evt)
 {
     GetSize(&m_Cfg.w, &m_Cfg.h);
 void wxHtmlHelpFrame::OnCloseWindow(wxCloseEvent& evt)
 {
     GetSize(&m_Cfg.w, &m_Cfg.h);


@@ -839,13 +1013,17 @@ void wxHtmlHelpFrame::OnCloseWindow(wxCloseEvent& evt)
 }
 
 BEGIN_EVENT_TABLE(wxHtmlHelpFrame, wxFrame)
 }
 
 BEGIN_EVENT_TABLE(wxHtmlHelpFrame, wxFrame)

-    EVT_TOOL_RANGE(wxID_HTML_PANEL, wxID_HTML_OPTIONS, wxHtmlHelpFrame::OnToolbar)
+    EVT_TOOL_RANGE(wxID_HTML_PANEL, wxID_HTML_BOOKMARKSREMOVE, wxHtmlHelpFrame::OnToolbar)

     EVT_TREE_SEL_CHANGED(wxID_HTML_TREECTRL, wxHtmlHelpFrame::OnContentsSel)
     EVT_LISTBOX(wxID_HTML_INDEXLIST, wxHtmlHelpFrame::OnIndexSel)
     EVT_LISTBOX(wxID_HTML_SEARCHLIST, wxHtmlHelpFrame::OnSearchSel)
     EVT_BUTTON(wxID_HTML_SEARCHBUTTON, wxHtmlHelpFrame::OnSearch)
     EVT_TEXT_ENTER(wxID_HTML_SEARCHTEXT, wxHtmlHelpFrame::OnSearch)
     EVT_TREE_SEL_CHANGED(wxID_HTML_TREECTRL, wxHtmlHelpFrame::OnContentsSel)
     EVT_LISTBOX(wxID_HTML_INDEXLIST, wxHtmlHelpFrame::OnIndexSel)
     EVT_LISTBOX(wxID_HTML_SEARCHLIST, wxHtmlHelpFrame::OnSearchSel)
     EVT_BUTTON(wxID_HTML_SEARCHBUTTON, wxHtmlHelpFrame::OnSearch)
     EVT_TEXT_ENTER(wxID_HTML_SEARCHTEXT, wxHtmlHelpFrame::OnSearch)

-    EVT_CLOSE(wxHtmlHelpFrame::OnCloseWindow)
+    EVT_BUTTON(wxID_HTML_INDEXBUTTON, wxHtmlHelpFrame::OnIndexFind)
+    EVT_TEXT_ENTER(wxID_HTML_INDEXTEXT, wxHtmlHelpFrame::OnIndexFind)
+    EVT_BUTTON(wxID_HTML_INDEXBUTTONALL, wxHtmlHelpFrame::OnIndexAll)
+    EVT_COMBOBOX(wxID_HTML_BOOKMARKSLIST, wxHtmlHelpFrame::OnBookmarksSel)
+    EVT_CLOSE(wxHtmlHelpFrame::OnCloseWindow)    

 END_EVENT_TABLE()
 
 #endif
 END_EVENT_TABLE()
 
 #endif