m_Style was bool by mistake, fixed

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3317 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/html/htmlwin.h b/include/wx/html/htmlwin.h
index 657ee2348de65fee51ea38701a36bb1bbc963605..89117cec8c563d4f857f17d603b2bc51dd530e0f 100644 (file)
--- a/include/wx/html/htmlwin.h
+++ b/include/wx/html/htmlwin.h
@@ -93,7 +93,7 @@ class WXDLLEXPORT wxHtmlWindow : public wxScrolledWindow
                 // borders (free space between text and window borders)
                 // defaults to 10 pixels.
 
                 // borders (free space between text and window borders)
                 // defaults to 10 pixels.
 

-        bool m_Style;
+        int m_Style;

 
 
     private:
 
 
     private:

diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp
index b3afd179dc62762beca4adc53ff9f6ed3087c0c5..a149ca56cbf83c359d7855d57760d3a05d551989 100644 (file)
--- a/src/html/htmlwin.cpp
+++ b/src/html/htmlwin.cpp
@@ -249,6 +249,7 @@ void wxHtmlWindow::CreateLayout()
     if (!m_Cell) return;
 
     if (m_Style == wxHW_SCROLLBAR_NEVER) {
     if (!m_Cell) return;
 
     if (m_Style == wxHW_SCROLLBAR_NEVER) {

+        SetScrollbars(1, 1, 0, 0); // always off

         GetClientSize(&ClientWidth, &ClientHeight);
         m_Cell -> Layout(ClientWidth);
     }
         GetClientSize(&ClientWidth, &ClientHeight);
         m_Cell -> Layout(ClientWidth);
     }