]> git.saurik.com Git - wxWidgets.git/blobdiff - include/wx/html/helpfrm.h
Applied patch [ 619705 ] Fixes wxApp::GetComCtl32Version
[wxWidgets.git] / include / wx / html / helpfrm.h
index bdfd7503649c2ac451652fc7dbd41739e0e667c3..b2b0432d8e126b6b0d7e2cbc1f4dd1fcb63bebd2 100644 (file)
@@ -12,7 +12,7 @@
 #ifndef _WX_HELPFRM_H_
 #define _WX_HELPFRM_H_
 
 #ifndef _WX_HELPFRM_H_
 #define _WX_HELPFRM_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "helpfrm.h"
 #endif
 
 #pragma interface "helpfrm.h"
 #endif
 
@@ -33,7 +33,9 @@
 #include "wx/stattext.h"
 #include "wx/html/htmlwin.h"
 #include "wx/html/htmprint.h"
 #include "wx/stattext.h"
 #include "wx/html/htmlwin.h"
 #include "wx/html/htmprint.h"
+
 class WXDLLEXPORT wxButton;
 class WXDLLEXPORT wxButton;
+class WXDLLEXPORT wxTextCtrl;
 
 
 // style flags for the Help Frame
 
 
 // style flags for the Help Frame
@@ -164,13 +166,18 @@ protected:
     void OnSearch(wxCommandEvent& event);
     void OnBookmarksSel(wxCommandEvent& event);
     void OnCloseWindow(wxCloseEvent& event);
     void OnSearch(wxCommandEvent& event);
     void OnBookmarksSel(wxCommandEvent& event);
     void OnCloseWindow(wxCloseEvent& event);
+    void OnActivate(wxActivateEvent& event);
+
+#ifdef __WXMAC__
+    void OnClose(wxCommandEvent& event);
+    void OnAbout(wxCommandEvent& event);
+#endif
 
     // Images:
     enum {
         IMG_Book = 0,
         IMG_Folder,
 
     // Images:
     enum {
         IMG_Book = 0,
         IMG_Folder,
-        IMG_Page,
-        IMG_RootFolder
+        IMG_Page
     };
 
 protected:
     };
 
 protected:
@@ -224,6 +231,7 @@ protected:
     int m_hfStyle;
 
     DECLARE_EVENT_TABLE()
     int m_hfStyle;
 
     DECLARE_EVENT_TABLE()
+    DECLARE_NO_COPY_CLASS(wxHtmlHelpFrame)
 };
 
 #endif // wxUSE_WXHTML_HELP
 };
 
 #endif // wxUSE_WXHTML_HELP