X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d80096a2dd44ba751402a22dcc2f4a500cb55d9c..461fe6e2559a3096d4985a50ba106f26ed890a1d:/src/html/htmlwin.cpp diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp index c51d80c296..21db98eba5 100644 --- a/src/html/htmlwin.cpp +++ b/src/html/htmlwin.cpp @@ -8,7 +8,7 @@ ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "htmlwin.h" #pragma implementation "htmlproc.h" #endif @@ -805,7 +805,7 @@ void wxHtmlWindow::OnCellMouseHover(wxHtmlCell * WXUNUSED(cell), // do nothing here } -void wxHtmlWindow::OnEraseBackground(wxEraseEvent& event) +void wxHtmlWindow::OnEraseBackground(wxEraseEvent& WXUNUSED(event)) { } @@ -897,7 +897,7 @@ void wxHtmlWindow::OnSize(wxSizeEvent& event) } -void wxHtmlWindow::OnMouseMove(wxMouseEvent& event) +void wxHtmlWindow::OnMouseMove(wxMouseEvent& WXUNUSED(event)) { m_tmpMouseMoved = true; } @@ -1218,7 +1218,7 @@ void wxHtmlWindow::OnKeyUp(wxKeyEvent& event) } } -void wxHtmlWindow::OnCopy(wxCommandEvent& event) +void wxHtmlWindow::OnCopy(wxCommandEvent& WXUNUSED(event)) { if ( m_selection ) CopySelection(); @@ -1310,7 +1310,26 @@ void wxHtmlWindow::SelectLine(const wxPoint& pos) IMPLEMENT_ABSTRACT_CLASS(wxHtmlProcessor,wxObject) +#if wxUSE_EXTENDED_RTTI +IMPLEMENT_DYNAMIC_CLASS_XTI(wxHtmlWindow, wxScrolledWindow,"wx/html/htmlwin.h") + +wxBEGIN_PROPERTIES_TABLE(wxHtmlWindow) +/* + TODO PROPERTIES + style , wxHW_SCROLLBAR_AUTO + borders , (dimension) + url , string + htmlcode , string +*/ +wxEND_PROPERTIES_TABLE() + +wxBEGIN_HANDLERS_TABLE(wxHtmlWindow) +wxEND_HANDLERS_TABLE() + +wxCONSTRUCTOR_5( wxHtmlWindow , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle ) +#else IMPLEMENT_DYNAMIC_CLASS(wxHtmlWindow,wxScrolledWindow) +#endif BEGIN_EVENT_TABLE(wxHtmlWindow, wxScrolledWindow) EVT_SIZE(wxHtmlWindow::OnSize)