MacReopenApp implementation for restoring top-level window

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

diff --git a/include/wx/html/helpdata.h b/include/wx/html/helpdata.h
index 0c110f0a2020aeed47e74a268d5ceb6624f5b9dd..f03914cc18f9b1ca1e228d550f5306777980c540 100644 (file)
--- a/include/wx/html/helpdata.h
+++ b/include/wx/html/helpdata.h
@@ -12,7 +12,7 @@
 #ifndef _WX_HELPDATA_H_
 #define _WX_HELPDATA_H_
 
 #ifndef _WX_HELPDATA_H_
 #define _WX_HELPDATA_H_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "helpdata.h"
 #endif
 
 #pragma interface "helpdata.h"
 #endif
 


@@ -26,13 +26,13 @@
 #include "wx/dynarray.h"
 #include "wx/font.h"
 
 #include "wx/dynarray.h"
 #include "wx/font.h"
 

-class WXDLLEXPORT wxHtmlHelpData;
+class WXDLLIMPEXP_HTML wxHtmlHelpData;

 
 //--------------------------------------------------------------------------------
 // helper classes & structs
 //--------------------------------------------------------------------------------
 
 
 //--------------------------------------------------------------------------------
 // helper classes & structs
 //--------------------------------------------------------------------------------
 

-class WXDLLEXPORT wxHtmlBookRecord
+class WXDLLIMPEXP_HTML wxHtmlBookRecord

 {
 public:
     wxHtmlBookRecord(const wxString& bookfile, const wxString& basepath, 
 {
 public:
     wxHtmlBookRecord(const wxString& bookfile, const wxString& basepath, 


@@ -77,7 +77,8 @@ protected:
 };
 
 
 };
 
 

-WX_DECLARE_EXPORTED_OBJARRAY(wxHtmlBookRecord, wxHtmlBookRecArray);
+WX_DECLARE_USER_EXPORTED_OBJARRAY(wxHtmlBookRecord, wxHtmlBookRecArray,
+                                  WXDLLIMPEXP_HTML);

 
 
 struct wxHtmlContentsItem
 
 
 struct wxHtmlContentsItem


@@ -98,7 +99,7 @@ struct wxHtmlContentsItem
 //                  of keyword(s)
 //------------------------------------------------------------------------------
 
 //                  of keyword(s)
 //------------------------------------------------------------------------------
 

-class WXDLLEXPORT wxHtmlSearchEngine : public wxObject
+class WXDLLIMPEXP_HTML wxHtmlSearchEngine : public wxObject

 {
 public:
     wxHtmlSearchEngine() : wxObject() {m_Keyword = NULL; }
 {
 public:
     wxHtmlSearchEngine() : wxObject() {m_Keyword = NULL; }


@@ -124,7 +125,7 @@ private:
 // class inside wxHtmlHelpData, but that's against coding standards :-(
 // Never construct this class yourself, obtain a copy from
 // wxHtmlHelpData::PrepareKeywordSearch(const wxString& key)
 // class inside wxHtmlHelpData, but that's against coding standards :-(
 // Never construct this class yourself, obtain a copy from
 // wxHtmlHelpData::PrepareKeywordSearch(const wxString& key)

-class WXDLLEXPORT wxHtmlSearchStatus
+class WXDLLIMPEXP_HTML wxHtmlSearchStatus

 {
 public:
     // constructor; supply wxHtmlHelpData ptr, the keyword and (optionally) the
 {
 public:
     // constructor; supply wxHtmlHelpData ptr, the keyword and (optionally) the


@@ -153,7 +154,7 @@ private:
     DECLARE_NO_COPY_CLASS(wxHtmlSearchStatus)
 };
 
     DECLARE_NO_COPY_CLASS(wxHtmlSearchStatus)
 };
 

-class WXDLLEXPORT wxHtmlHelpData : public wxObject
+class WXDLLIMPEXP_HTML wxHtmlHelpData : public wxObject

 {
     DECLARE_DYNAMIC_CLASS(wxHtmlHelpData)
     friend class wxHtmlSearchStatus;
 {
     DECLARE_DYNAMIC_CLASS(wxHtmlHelpData)
     friend class wxHtmlSearchStatus;