some fixes and code regeneration

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5791 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2000-02-01 21:36:20 +00:00
parent 0c3d4bfdcf
commit e02c03a42e
30 changed files with 838 additions and 282 deletions

View File

@@ -90,10 +90,8 @@ public:
wxHtmlLinkInfo(const wxString& href, const wxString& target = wxEmptyString);
wxString GetHref();
wxString GetTarget();
#ifdef POST_2_1_12
wxMouseEvent* GetEvent();
wxHtmlCell* GetHtmlCell();
#endif
};
//---------------------------------------------------------------------------
@@ -412,13 +410,8 @@ public:
const wxString& name = "htmlWindow")
: wxHtmlWindow(parent, id, pos, size, style, name) {};
#ifdef POST_2_1_12
void OnLinkClicked(const wxHtmlLinkInfo& link);
void base_OnLinkClicked(const wxHtmlLinkInfo& link);
#else
void OnLinkClicked(wxHtmlLinkInfo* link);
void base_OnLinkClicked(wxHtmlLinkInfo* link);
#endif
DEC_PYCALLBACK__STRING(OnSetTitle);
PYPRIVATE;
@@ -427,29 +420,17 @@ public:
IMP_PYCALLBACK__STRING(wxPyHtmlWindow, wxHtmlWindow, OnSetTitle);
#ifdef POST_2_1_12
void wxPyHtmlWindow::OnLinkClicked(const wxHtmlLinkInfo& link) {
#else
void wxPyHtmlWindow::OnLinkClicked(wxHtmlLinkInfo* link) {
#endif
bool doSave = wxPyRestoreThread();
if (m_myInst.findCallback("OnLinkClicked")) {
#ifdef POST_2_1_12
PyObject* obj = wxPyConstructObject((void*)&link, "wxHtmlLinkInfo");
#else
PyObject* obj = wxPyConstructObject(link, "wxHtmlLinkInfo");
#endif
m_myInst.callCallback(Py_BuildValue("(O)", obj));
}
else
wxHtmlWindow::OnLinkClicked(link);
wxPySaveThread(doSave);
}
#ifdef POST_2_1_12
void wxPyHtmlWindow::base_OnLinkClicked(const wxHtmlLinkInfo& link) {
#else
void wxPyHtmlWindow::base_OnLinkClicked(wxHtmlLinkInfo* link) {
#endif
wxHtmlWindow::OnLinkClicked(link);
}
%}
@@ -487,11 +468,7 @@ public:
wxHtmlContainerCell* GetInternalRepresentation();
wxHtmlWinParser* GetParser();
#ifdef POST_2_1_12
void base_OnLinkClicked(const wxHtmlLinkInfo& link);
#else
void base_OnLinkClicked(wxHtmlLinkInfo* link);
#endif
void base_OnSetTitle(const char* title);
};