added NO_PTR versions of ARRAY macros to suppress warnings (based on patch 770983)

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

diff --git a/include/wx/html/helpfrm.h b/include/wx/html/helpfrm.h
index 42562e92ec5d73473fd19f964f9ece9955a3402c..ed6e6f8e0e1d97cb1a86aa53b429fe2ae4c8396d 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_
 
 #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 WXDLLIMPEXP_CORE wxButton;
+class WXDLLIMPEXP_CORE wxTextCtrl;

 
 
 // style flags for the Help Frame
 
 
 // style flags for the Help Frame


@@ -66,9 +68,9 @@ struct wxHtmlHelpFrameCfg
 };
 
 
 };
 
 

-class WXDLLEXPORT wxHelpControllerBase;
+class WXDLLIMPEXP_CORE wxHelpControllerBase;

 
 

-class WXDLLEXPORT wxHtmlHelpFrame : public wxFrame
+class WXDLLIMPEXP_HTML wxHtmlHelpFrame : public wxFrame

 {
     DECLARE_DYNAMIC_CLASS(wxHtmlHelpFrame)
 
 {
     DECLARE_DYNAMIC_CLASS(wxHtmlHelpFrame)
 


@@ -133,12 +135,12 @@ public:
 
     // call this to let wxHtmlHelpFrame know page changed
     void NotifyPageChanged();
 
     // call this to let wxHtmlHelpFrame know page changed
     void NotifyPageChanged();

-
-protected:
-    void Init(wxHtmlHelpData* data = NULL);
-
+    

     // Refreshes Contents and Index tabs
     void RefreshLists();
     // Refreshes Contents and Index tabs
     void RefreshLists();

+    
+protected:
+    void Init(wxHtmlHelpData* data = NULL);

 
     // Adds items to m_Contents tree control
     void CreateContents();
 
     // Adds items to m_Contents tree control
     void CreateContents();


@@ -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