X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6953da00886c52a9e1d9183e1f1f27e75843cfa4..813b6b3f88310608cb3ca37b0f29f64330f7558f:/include/wx/html/helpdata.h?ds=sidebyside diff --git a/include/wx/html/helpdata.h b/include/wx/html/helpdata.h index ff2feb6ab5..a330095139 100644 --- 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