Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed wxHtmlWindow::m_Style which duplicated wxWindow::m_windowStyle and prevented changeing wxHW_XXX window style after Create() from working

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40553 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-08-10 15:46:49 +00:00
parent f242653114
commit cc87fbed40
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/html/htmlwin.h
View File

@@ -488,8 +488,6 @@ protected:
// defaults to 10 pixels. // defaults to 10 pixels.
int m_Borders; int m_Borders;
int m_Style;
// current text selection or NULL // current text selection or NULL
wxHtmlSelection *m_selection; wxHtmlSelection *m_selection;

10
src/html/htmlwin.cpp
View File

@@ -277,7 +277,6 @@ void wxHtmlWindow::Init()
m_HistoryOn = true; m_HistoryOn = true;
m_History = new wxHtmlHistoryArray; m_History = new wxHtmlHistoryArray;
m_Processors = NULL; m_Processors = NULL;
m_Style = 0;
SetBorders(10); SetBorders(10);
m_selection = NULL; m_selection = NULL;
m_makingSelection = false; m_makingSelection = false;
@@ -299,7 +298,6 @@ bool wxHtmlWindow::Create(wxWindow *parent, wxWindowID id,
name)) name))
return false; return false;
m_Style = style;
SetPage(wxT("<html><body></body></html>")); SetPage(wxT("<html><body></body></html>"));
return true; return true;
} }
@@ -638,14 +636,14 @@ void wxHtmlWindow::CreateLayout()
if (!m_Cell) return; if (!m_Cell) return;
if (m_Style & wxHW_SCROLLBAR_NEVER) if ( HasFlag(wxHW_SCROLLBAR_NEVER) )
{ {
SetScrollbars(1, 1, 0, 0); // always off SetScrollbars(1, 1, 0, 0); // always off
GetClientSize(&ClientWidth, &ClientHeight); GetClientSize(&ClientWidth, &ClientHeight);
m_Cell->Layout(ClientWidth); m_Cell->Layout(ClientWidth);
} }
else // !wxHW_SCROLLBAR_NEVER
else { {
GetClientSize(&ClientWidth, &ClientHeight); GetClientSize(&ClientWidth, &ClientHeight);
m_Cell->Layout(ClientWidth); m_Cell->Layout(ClientWidth);
if (ClientHeight < m_Cell->GetHeight() + GetCharHeight()) if (ClientHeight < m_Cell->GetHeight() + GetCharHeight())
@@ -842,7 +840,7 @@ void wxHtmlWindow::AddFilter(wxHtmlFilter *filter)
bool wxHtmlWindow::IsSelectionEnabled() const bool wxHtmlWindow::IsSelectionEnabled() const
{ {
#if wxUSE_CLIPBOARD #if wxUSE_CLIPBOARD
return !(m_Style & wxHW_NO_SELECTION); return !HasFlag(wxHW_NO_SELECTION);
#else #else
return false; return false;
#endif #endif