X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/311ccb86e4e31c7c257d9efd3435fb2724101b10..aa154cb1578ba9d44c7e24c5e76d8238bf8809d0:/src/html/helpfrm.cpp?ds=inline

diff --git a/src/html/helpfrm.cpp b/src/html/helpfrm.cpp
index de616e06d1..488c31c45b 100644
--- a/src/html/helpfrm.cpp
+++ b/src/html/helpfrm.cpp
@@ -282,6 +282,7 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id,
 
     CreateStatusBar();
 
+#if wxUSE_TOOLBAR
     // toolbar?
     if (style & (wxHF_TOOLBAR | wxHF_FLAT_TOOLBAR))
     {
@@ -292,6 +293,7 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id,
         AddToolbarButtons(toolBar, style);
         toolBar->Realize();
     }
+#endif //wxUSE_TOOLBAR
 
     wxSizer *navigSizer = NULL;
 
@@ -463,7 +465,11 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id,
 
     if ( navigSizer )
     {
-        navigSizer->SetSizeHints(m_NavigPan);
+        // We don't really want to set the nav panel min size to
+        // the current overall window size (which may be large).
+        // But leaving this code commented in case there's
+        // some variation that makes sense.
+//        navigSizer->SetSizeHints(m_NavigPan);
         m_NavigPan->Layout();
     }
 
@@ -507,6 +513,7 @@ wxHtmlHelpFrame::~wxHtmlHelpFrame()
 }
 
 
+#if wxUSE_TOOLBAR
 void wxHtmlHelpFrame::AddToolbarButtons(wxToolBar *toolBar, int style)
 {
     wxBitmap wpanelBitmap = 
@@ -579,6 +586,7 @@ void wxHtmlHelpFrame::AddToolbarButtons(wxToolBar *toolBar, int style)
                        FALSE, -1, -1, (wxObject *) NULL,
                        _("Display options dialog"));
 }
+#endif //wxUSE_TOOLBAR
 
 
 void wxHtmlHelpFrame::SetTitleFormat(const wxString& format)