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

wxPython Merge #2 of 2.4 branch --> HEAD (branch tag: wxPy_2_4_merge_2)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21593 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2003-07-02 23:13:10 +00:00
parent e234d4c9b7
commit 1fded56b37
535 changed files with 48899 additions and 20067 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
wxPython/src/html.i
View File

@@ -180,13 +180,14 @@ public:
class wxHtmlWinParser : public wxHtmlParser {
public:
wxHtmlWinParser(wxHtmlWindow *wnd = NULL);
wxHtmlWinParser(wxPyHtmlWindow *wnd = NULL);
void SetDC(wxDC *dc);
wxDC* GetDC();
int GetCharHeight();
int GetCharWidth();
wxHtmlWindow* GetWindow();
wxPyHtmlWindow* GetWindow();
// Sets fonts to be used when displaying HTML page. (if size null then default sizes used).
%addmethods {
void SetFonts(wxString normal_face, wxString fixed_face, PyObject* sizes=NULL) {
int* temp = NULL;
@@ -389,7 +390,7 @@ public:
void DrawInvisible(wxDC& dc, int x, int y);
const wxHtmlCell* Find(int condition, const void* param);
bool AdjustPagebreak(int * pagebreak);
bool AdjustPagebreak(int* INOUT);
void SetCanLiveOnPagebreak(bool can);
};
@@ -650,9 +651,8 @@ public:
// Return value : same as SetPage
bool LoadPage(const wxString& location);
// TODO: (accept a string, convert to filename)
// Loads HTML page from file
// bool LoadFile(const wxFileName& filename);
bool LoadFile(const wxString& filename);
// Append to current page
bool AppendToPage(const wxString& source);
@@ -744,6 +744,7 @@ public:
void SetHtmlText(const wxString& html,
const wxString& basepath = wxPyEmptyString,
bool isdir = TRUE);
// Sets fonts to be used when displaying HTML page. (if size null then default sizes used).
%addmethods {
void SetFonts(wxString normal_face, wxString fixed_face, PyObject* sizes=NULL) {
int* temp = NULL;
@@ -777,6 +778,7 @@ public:
void SetHtmlFile(const wxString &htmlfile);
void SetHeader(const wxString& header, int pg = wxPAGE_ALL);
void SetFooter(const wxString& footer, int pg = wxPAGE_ALL);
// Sets fonts to be used when displaying HTML page. (if size null then default sizes used).
%addmethods {
void SetFonts(wxString normal_face, wxString fixed_face, PyObject* sizes=NULL) {
int* temp = NULL;