Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use wxRTTI to construct the right class of wxHtmlCell

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37456 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2006-02-10 18:38:43 +00:00
parent b15ce82158
commit f0879a0a8f
3 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
wxPython/src/html.i
View File

@@ -384,6 +384,10 @@ private:
//---------------------------------------------------------------------------
%typemap(out) wxHtmlCell* { $result = wxPyMake_wxObject($1, $owner); }
%typemap(out) const wxHtmlCell* { $result = wxPyMake_wxObject($1, $owner); }
//---------------------------------------------------------------------------
%newgroup
@@ -499,8 +503,13 @@ enum
class wxHtmlCell : public wxObject {
public:
%typemap(out) wxHtmlCell*; // turn off this typemap
wxHtmlCell();
// Turn it back on again
%typemap(out) wxHtmlCell* { $result = wxPyMake_wxObject($1, $owner); }
int GetPosX();
int GetPosY();
int GetWidth();
@@ -582,6 +591,9 @@ class wxHtmlWordCell : public wxHtmlCell
{
public:
wxHtmlWordCell(const wxString& word, wxDC& dc);
wxString ConvertToText(wxHtmlSelection *sel) const;
bool IsLinebreakAllowed() const;
void SetPreviousWord(wxHtmlWordCell *cell);
};
@@ -1138,10 +1150,6 @@ public:
int GetCurIndex();
int GetMaxIndex();
const wxString& GetName();
// WXWIN_COMPATIBILITY_2_4
#if 0
wxHtmlContentsItem* GetContentsItem();
#endif
};
//---------------------------------------------------------------------------
@@ -1164,13 +1172,6 @@ public:
// TODO: this one needs fixed...
const wxHtmlBookRecArray& GetBookRecArray();
// WXWIN_COMPATIBILITY_2_4
#if 0
wxHtmlContentsItem* GetContents();
int GetContentsCnt();
wxHtmlContentsItem* GetIndex();
int GetIndexCnt();
#endif
};
//---------------------------------------------------------------------------