avoid hidden GetImageList

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

diff --git a/include/wx/html/helpdata.h b/include/wx/html/helpdata.h
index ff2feb6ab542b9451957ae15da05a01aab839d93..a330095139db7923c05a85bd850fc02315091c82 100644 (file)
--- a/include/wx/html/helpdata.h
+++ b/include/wx/html/helpdata.h
@@ -12,10 +12,6 @@
 #ifndef _WX_HELPDATA_H_
 #define _WX_HELPDATA_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "helpdata.h"
-#endif
-
 #include "wx/defs.h"
 
 #if wxUSE_HTML
@@ -84,7 +80,7 @@ struct WXDLLIMPEXP_HTML wxHtmlHelpDataItem
 {
     wxHtmlHelpDataItem() : level(0), parent(NULL), id(wxID_ANY), book(NULL) {}
 
-    short int level;
+    int level;
     wxHtmlHelpDataItem *parent;
     int id;
     wxString name;
@@ -110,7 +106,7 @@ struct wxHtmlContentsItem
     wxHtmlContentsItem& operator=(const wxHtmlContentsItem& d);
     ~wxHtmlContentsItem();
 
-    short int m_Level;
+    int m_Level;
     int m_ID;
     wxChar *m_Name;
     wxChar *m_Page;
@@ -153,8 +149,8 @@ private:
 };
 
 
-// State information of a search action. I'd have prefered to make this a nested
-// class inside wxHtmlHelpData, but that's against coding standards :-(
+// State information of a search action. I'd have preferred to make this a
+// nested class inside wxHtmlHelpData, but that's against coding standards :-(
 // Never construct this class yourself, obtain a copy from
 // wxHtmlHelpData::PrepareKeywordSearch(const wxString& key)
 class WXDLLIMPEXP_HTML wxHtmlSearchStatus