Fixes so that wxPython builds on 2.7. Mostly removing references to all functions that require WXWIN_2_4_COMPATIBILITY to be defined.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36527 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1111,7 +1111,8 @@ public:
|
||||
};
|
||||
|
||||
//---------------------------------------------------------------------------
|
||||
|
||||
// WXWIN_COMPATIBILITY_2_4
|
||||
#if 0
|
||||
struct wxHtmlContentsItem
|
||||
{
|
||||
%extend {
|
||||
@@ -1122,7 +1123,7 @@ struct wxHtmlContentsItem
|
||||
wxHtmlBookRecord* GetBook() { return self->m_Book; }
|
||||
}
|
||||
};
|
||||
|
||||
#endif
|
||||
//---------------------------------------------------------------------------
|
||||
|
||||
class wxHtmlSearchStatus
|
||||
@@ -1135,7 +1136,10 @@ public:
|
||||
int GetCurIndex();
|
||||
int GetMaxIndex();
|
||||
const wxString& GetName();
|
||||
// WXWIN_COMPATIBILITY_2_4
|
||||
#if 0
|
||||
wxHtmlContentsItem* GetContentsItem();
|
||||
#endif
|
||||
};
|
||||
|
||||
//---------------------------------------------------------------------------
|
||||
@@ -1158,10 +1162,13 @@ public:
|
||||
// TODO: this one needs fixed...
|
||||
const wxHtmlBookRecArray& GetBookRecArray();
|
||||
|
||||
// WXWIN_COMPATIBILITY_2_4
|
||||
#if 0
|
||||
wxHtmlContentsItem* GetContents();
|
||||
int GetContentsCnt();
|
||||
wxHtmlContentsItem* GetIndex();
|
||||
int GetIndexCnt();
|
||||
#endif
|
||||
};
|
||||
|
||||
//---------------------------------------------------------------------------
|
||||
|
||||
Reference in New Issue
Block a user