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 0f6ac5b4e6d03c52fe055e06d2a9a45df167d682..ed6e6f8e0e1d97cb1a86aa53b429fe2ae4c8396d 100644 (file)
--- a/include/wx/html/helpfrm.h
+++ b/include/wx/html/helpfrm.h
@@ -34,8 +34,8 @@
 #include "wx/html/htmlwin.h"
 #include "wx/html/htmprint.h"
 
 #include "wx/html/htmlwin.h"
 #include "wx/html/htmprint.h"
 

-class WXDLLEXPORT wxButton;
-class WXDLLEXPORT wxTextCtrl;
+class WXDLLIMPEXP_CORE wxButton;
+class WXDLLIMPEXP_CORE wxTextCtrl;

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


@@ -68,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)
 


@@ -168,6 +168,11 @@ protected:
     void OnCloseWindow(wxCloseEvent& event);
     void OnActivate(wxActivateEvent& 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,
     // Images:
     enum {
         IMG_Book = 0,