mark wxImage's wxBitmap functions as deprecated

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

diff --git a/include/wx/html/helpfrm.h b/include/wx/html/helpfrm.h
index 0eb200c8a0f0d64e40440d96ba845da68c3b7cb9..3e0e6e92648a643d6df8d94afcb293a81df76891 100644 (file)
--- a/include/wx/html/helpfrm.h
+++ b/include/wx/html/helpfrm.h
@@ -12,7 +12,7 @@
 #ifndef _WX_HELPFRM_H_
 #define _WX_HELPFRM_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "helpfrm.h"
 #endif
 
@@ -34,6 +34,9 @@
 #include "wx/html/htmlwin.h"
 #include "wx/html/htmprint.h"
 
+class WXDLLEXPORT wxButton;
+class WXDLLEXPORT wxTextCtrl;
+
 
 // style flags for the Help Frame
 #define wxHF_TOOLBAR                0x0001
@@ -132,12 +135,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();
@@ -163,13 +166,13 @@ protected:
     void OnSearch(wxCommandEvent& event);
     void OnBookmarksSel(wxCommandEvent& event);
     void OnCloseWindow(wxCloseEvent& event);
+    void OnActivate(wxActivateEvent& event);
 
     // Images:
     enum {
         IMG_Book = 0,
         IMG_Folder,
-        IMG_Page,
-        IMG_RootFolder
+        IMG_Page
     };
 
 protected:
@@ -179,7 +182,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;