A few tweaks and cleanups

[wxWidgets.git] / include / wx / html / helpfrm.h

diff --git a/include/wx/html/helpfrm.h b/include/wx/html/helpfrm.h
index d8c4e83b1330e2d865b98d19210b0ad1b1b882a9..33b9ed2598baf685bb7d1860886127e6319a6942 100644 (file)
--- a/include/wx/html/helpfrm.h
+++ b/include/wx/html/helpfrm.h
@@ -18,7 +18,7 @@
 
 #include "wx/defs.h"
 
-#if wxUSE_HTML
+#if wxUSE_WXHTML_HELP
 
 #include "wx/html/helpdata.h"
 #include "wx/window.h"
@@ -33,6 +33,7 @@
 #include "wx/stattext.h"
 #include "wx/html/htmlwin.h"
 #include "wx/html/htmprint.h"
+class WXDLLEXPORT wxButton;
 
 
 // style flags for the Help Frame
@@ -132,12 +133,12 @@ public:
 
     // call this to let wxHtmlHelpFrame know page changed
     void NotifyPageChanged();
-
-protected:
-    void Init(wxHtmlHelpData* data = NULL);
-
+    
     // Refreshes Contents and Index tabs
     void RefreshLists();
+    
+protected:
+    void Init(wxHtmlHelpData* data = NULL);
 
     // Adds items to m_Contents tree control
     void CreateContents();
@@ -168,8 +169,7 @@ protected:
     enum {
         IMG_Book = 0,
         IMG_Folder,
-        IMG_Page,
-        IMG_RootFolder
+        IMG_Page
     };
 
 protected:
@@ -179,7 +179,8 @@ protected:
     // below are various pointers to GUI components
     wxHtmlWindow *m_HtmlWin;
     wxSplitterWindow *m_Splitter;
-    wxNotebook *m_NavigPan;
+    wxPanel *m_NavigPan;
+    wxNotebook *m_NavigNotebook;
     wxTreeCtrl *m_ContentsBox;
     wxTextCtrl *m_IndexText;
     wxButton *m_IndexButton;
@@ -218,12 +219,12 @@ protected:
 #endif
     wxHashTable *m_PagesHash;
     wxHelpControllerBase* m_helpController;
-    
+
     int m_hfStyle;
 
     DECLARE_EVENT_TABLE()
 };
 
-#endif // wxUSE_HTML
+#endif // wxUSE_WXHTML_HELP
 
 #endif