]> git.saurik.com Git - wxWidgets.git/commitdiff
projects / wxWidgets.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f242653)
removed wxHtmlWindow::m_Style which duplicated wxWindow::m_windowStyle and prevented...
authorVadim Zeitlin <vadim@wxwidgets.org>
Thu, 10 Aug 2006 15:46:49 +0000 (15:46 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Thu, 10 Aug 2006 15:46:49 +0000 (15:46 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40553 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/html/htmlwin.h patch | blob | blame | history
src/html/htmlwin.cpp patch | blob | blame | history

diff --git a/include/wx/html/htmlwin.h b/include/wx/html/htmlwin.h
index c79131c587b1ac73c9aa57bdbc858608438449c2..1930ade24fda95dc53059edd68497ad0f357c364 100644 (file)
--- a/include/wx/html/htmlwin.h
+++ b/include/wx/html/htmlwin.h
@@ -488,8 +488,6 @@ protected:
     // defaults to 10 pixels.
     int m_Borders;
 
-    int m_Style;
-
     // current text selection or NULL
     wxHtmlSelection *m_selection;
 
diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp
index 19bc93a9dad37ace8f6720a72328654963e984f1..431b30b32cce1b7a5877c13caba355806218c031 100644 (file)
--- 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("<html><body></body></html>"));
     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
wxWidgets (Impactor)