implement button support for pre-XP systems (or with themes disabled); using only...

[wxWidgets.git] / src / html / htmlwin.cpp

diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp
index 929c7bb2703b4d958a8343d597b46fb957ddfd98..82f7c105579ab0396298deb2afc39e0bf550a927 100644 (file)
--- a/src/html/htmlwin.cpp
+++ b/src/html/htmlwin.cpp
@@ -39,9 +39,9 @@
 IMPLEMENT_DYNAMIC_CLASS(wxHtmlLinkEvent, wxCommandEvent)
 IMPLEMENT_DYNAMIC_CLASS(wxHtmlCellEvent, wxCommandEvent)
 
 IMPLEMENT_DYNAMIC_CLASS(wxHtmlLinkEvent, wxCommandEvent)
 IMPLEMENT_DYNAMIC_CLASS(wxHtmlCellEvent, wxCommandEvent)
 

-wxDEFINE_EVENT( wxEVT_COMMAND_HTML_CELL_CLICKED, wxHtmlCellEvent )
-wxDEFINE_EVENT( wxEVT_COMMAND_HTML_CELL_HOVER, wxHtmlCellEvent )
-wxDEFINE_EVENT( wxEVT_COMMAND_HTML_LINK_CLICKED, wxHtmlLinkEvent )
+wxDEFINE_EVENT( wxEVT_COMMAND_HTML_CELL_CLICKED, wxHtmlCellEvent );
+wxDEFINE_EVENT( wxEVT_COMMAND_HTML_CELL_HOVER, wxHtmlCellEvent );
+wxDEFINE_EVENT( wxEVT_COMMAND_HTML_LINK_CLICKED, wxHtmlLinkEvent );

 
 
 #if wxUSE_CLIPBOARD
 
 
 #if wxUSE_CLIPBOARD


@@ -71,7 +71,7 @@ private:
     int m_pos,
         m_orient;
 
     int m_pos,
         m_orient;
 

-    DECLARE_NO_COPY_CLASS(wxHtmlWinAutoScrollTimer)
+    wxDECLARE_NO_COPY_CLASS(wxHtmlWinAutoScrollTimer);

 };
 
 void wxHtmlWinAutoScrollTimer::Notify()
 };
 
 void wxHtmlWinAutoScrollTimer::Notify()


@@ -1103,9 +1103,10 @@ void wxHtmlWindow::OnPaint(wxPaintEvent& WXUNUSED(event))
 
 void wxHtmlWindow::OnSize(wxSizeEvent& event)
 {
 
 void wxHtmlWindow::OnSize(wxSizeEvent& event)
 {

+    event.Skip();
+

     wxDELETE(m_backBuffer);
 
     wxDELETE(m_backBuffer);
 

-    wxScrolledWindow::OnSize(event);

     CreateLayout();
 
     // Recompute selection if necessary:
     CreateLayout();
 
     // Recompute selection if necessary: