Took out somebody's hard coded path (j:\dev\something...) and put back

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

diff --git a/src/html/helpfrm.cpp b/src/html/helpfrm.cpp
index e41032ab9f00a5ff60db63648034cb9bea0ba2f5..573121b725ace06a1725056e1620274980084885 100644 (file)
--- a/src/html/helpfrm.cpp
+++ b/src/html/helpfrm.cpp
@@ -166,7 +166,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,


@@ -182,12 +182,15 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id, const wxString& ti
 
         if (style & wxHF_BOOKMARKS) {
             m_Bookmarks = new wxComboBox(toolBar, wxID_HTML_BOOKMARKSLIST, wxEmptyString, 
 
         if (style & wxHF_BOOKMARKS) {
             m_Bookmarks = new wxComboBox(toolBar, wxID_HTML_BOOKMARKSLIST, wxEmptyString, 

-                                         wxDefaultPosition, wxSize(300,200), 0, NULL, wxCB_READONLY | wxCB_SORT);
+                                         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);
             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_BOOKMARKSADD, wxBITMAP(wbkadd), wxNullBitmap,
                                FALSE, -1, -1, (wxObject *) NULL,
                                _("Add current page to bookmarks"));


@@ -678,11 +681,7 @@ class wxHtmlHelpFrameOptionsDialog : public wxDialog
                 sizer2 -> Add(new wxStaticText(this, -1, _("Normal font:")), 
                               0, wxLEFT | wxTOP, 10);
                 sizer2 -> Add(NormalFont = new wxComboBox(this, -1, wxEmptyString, wxDefaultPosition, 
                 sizer2 -> Add(new wxStaticText(this, -1, _("Normal font:")), 
                               0, wxLEFT | wxTOP, 10);
                 sizer2 -> Add(NormalFont = new wxComboBox(this, -1, wxEmptyString, wxDefaultPosition, 

-//#ifdef __WXMSW__

                               wxSize(200, 200), 
                               wxSize(200, 200), 

-//#else 
-//                              wxSize(200, -1), 
-//#endif // FIXME: temporarily commented by VS to demonstrate the problem

                               0, NULL, wxCB_DROPDOWN | wxCB_READONLY),
                               1, wxEXPAND | wxLEFT | wxRIGHT, 10);
 
                               0, NULL, wxCB_DROPDOWN | wxCB_READONLY),
                               1, wxEXPAND | wxLEFT | wxRIGHT, 10);
 


@@ -699,11 +698,7 @@ class wxHtmlHelpFrameOptionsDialog : public wxDialog
                 sizer2 -> Add(new wxStaticText(this, -1, _("Fixed font:")), 
                               0, wxLEFT | wxTOP, 10);
                 sizer2 -> Add(FixedFont = new wxComboBox(this, -1, wxEmptyString, wxDefaultPosition, 
                 sizer2 -> Add(new wxStaticText(this, -1, _("Fixed font:")), 
                               0, wxLEFT | wxTOP, 10);
                 sizer2 -> Add(FixedFont = new wxComboBox(this, -1, wxEmptyString, wxDefaultPosition, 

-//#ifdef __WXMSW__

                               wxSize(200, 200), 
                               wxSize(200, 200), 

-//#else 
-//                              wxSize(200, -1), 
-//#endif // FIXME: temporarily commented by VS to demonstrate the problem

                               0, NULL, wxCB_DROPDOWN | wxCB_READONLY), 
                               1, wxEXPAND | wxLEFT | wxRIGHT, 10);
 
                               0, NULL, wxCB_DROPDOWN | wxCB_READONLY), 
                               1, wxEXPAND | wxLEFT | wxRIGHT, 10);