X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/63e819f2981585279fe8a06629f69b7002eee9dc..8913c40c32bf45df97280c5b1e5a542bfc764ca8:/src/html/htmlwin.cpp diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp index 19bc93a9da..431b30b32c 100644 --- a/src/html/htmlwin.cpp +++ b/src/html/htmlwin.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