X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9eddec696f06d65a80e7339b2fae14fcb55f8383..22a35096a0a9c3fe4d3d32b8d68a361126ef9677:/src/html/htmlwin.cpp diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp index 4d2327bd49..431b30b32c 100644 --- a/src/html/htmlwin.cpp +++ b/src/html/htmlwin.cpp @@ -24,12 +24,12 @@ #include "wx/dcmemory.h" #include "wx/timer.h" #include "wx/settings.h" + #include "wx/dataobj.h" #endif #include "wx/html/htmlwin.h" #include "wx/html/htmlproc.h" #include "wx/clipbrd.h" -#include "wx/dataobj.h" #include "wx/arrimpl.cpp" #include "wx/listimpl.cpp" @@ -277,7 +277,6 @@ void wxHtmlWindow::Init() m_HistoryOn = true; m_History = new wxHtmlHistoryArray; m_Processors = NULL; - m_Style = 0; SetBorders(10); m_selection = NULL; m_makingSelection = false; @@ -299,7 +298,6 @@ bool wxHtmlWindow::Create(wxWindow *parent, wxWindowID id, name)) return false; - m_Style = style; SetPage(wxT("")); return true; } @@ -638,14 +636,14 @@ void wxHtmlWindow::CreateLayout() if (!m_Cell) return; - if (m_Style & wxHW_SCROLLBAR_NEVER) + if ( HasFlag(wxHW_SCROLLBAR_NEVER) ) { SetScrollbars(1, 1, 0, 0); // always off GetClientSize(&ClientWidth, &ClientHeight); m_Cell->Layout(ClientWidth); } - - else { + else // !wxHW_SCROLLBAR_NEVER + { GetClientSize(&ClientWidth, &ClientHeight); m_Cell->Layout(ClientWidth); if (ClientHeight < m_Cell->GetHeight() + GetCharHeight()) @@ -842,7 +840,7 @@ void wxHtmlWindow::AddFilter(wxHtmlFilter *filter) bool wxHtmlWindow::IsSelectionEnabled() const { #if wxUSE_CLIPBOARD - return !(m_Style & wxHW_NO_SELECTION); + return !HasFlag(wxHW_NO_SELECTION); #else return false; #endif @@ -1135,6 +1133,19 @@ void wxHtmlWindow::OnMouseUp(wxMouseEvent& event) wxHtmlWindowMouseHelper::HandleMouseClick(m_Cell, pos, event); } +#if wxUSE_CLIPBOARD +void wxHtmlWindow::OnMouseCaptureLost(wxMouseCaptureLostEvent& WXUNUSED(event)) +{ + if ( !m_makingSelection ) + return; + + // discard the selecting operation + m_makingSelection = false; + wxDELETE(m_selection); + m_tmpSelFromCell = NULL; + Refresh(); +} +#endif // wxUSE_CLIPBOARD void wxHtmlWindow::OnInternalIdle() @@ -1499,6 +1510,7 @@ BEGIN_EVENT_TABLE(wxHtmlWindow, wxScrolledWindow) EVT_LEFT_DCLICK(wxHtmlWindow::OnDoubleClick) EVT_ENTER_WINDOW(wxHtmlWindow::OnMouseEnter) EVT_LEAVE_WINDOW(wxHtmlWindow::OnMouseLeave) + EVT_MOUSE_CAPTURE_LOST(wxHtmlWindow::OnMouseCaptureLost) EVT_KEY_UP(wxHtmlWindow::OnKeyUp) EVT_MENU(wxID_COPY, wxHtmlWindow::OnCopy) #endif // wxUSE_CLIPBOARD @@ -1556,6 +1568,8 @@ void wxHtmlWindow::SetHTMLStatusText(const wxString& text) #if wxUSE_STATUSBAR if (m_RelatedStatusBar != -1) m_RelatedFrame->SetStatusText(text, m_RelatedStatusBar); +#else + wxUnusedVar(text); #endif // wxUSE_STATUSBAR }