ambiguous ctor call resolved

[wxWidgets.git] / src / html / htmlwin.cpp

diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp
index b3afd179dc62762beca4adc53ff9f6ed3087c0c5..7c08bbbd3f6b54a104974b871013e7c7788ee93b 100644 (file)
--- a/src/html/htmlwin.cpp
+++ b/src/html/htmlwin.cpp
@@ -249,26 +249,30 @@ void wxHtmlWindow::CreateLayout()
     if (!m_Cell) return;
 
     if (m_Style == wxHW_SCROLLBAR_NEVER) {
+        SetScrollbars(1, 1, 0, 0); // always off
         GetClientSize(&ClientWidth, &ClientHeight);
         m_Cell -> Layout(ClientWidth);
     }
 
     else {
         GetClientSize(&ClientWidth, &ClientHeight);
+#ifndef __WXMSW__
+        // VS : this looks extremely ugly under windoze, better fix needed!
         SetScrollbars(1, 1, 0, ClientHeight * 2); // always on          
+#endif
         GetClientSize(&ClientWidth, &ClientHeight);
         m_Cell -> Layout(ClientWidth);
-        GetClientSize(&ClientWidth, &ClientHeight);
-       if (ClientHeight < m_Cell -> GetHeight()) {
+       if (ClientHeight < m_Cell -> GetHeight()) {
             SetScrollbars(HTML_SCROLL_STEP, HTML_SCROLL_STEP,
                           m_Cell -> GetWidth() / HTML_SCROLL_STEP,
                           m_Cell -> GetHeight() / HTML_SCROLL_STEP
                           /*cheat: top-level frag is always container*/);
         }
-       else { /* we fit into window, no need for scrollbars */
-           SetScrollbars(1, 1, 0, 0); // disable...
-           m_Cell -> Layout(ClientWidth); // ...and relayout
-       }
+           else { /* we fit into window, no need for scrollbars */
+               SetScrollbars(1, 1, 0, 0); // disable...
+                GetClientSize(&ClientWidth, &ClientHeight);
+               m_Cell -> Layout(ClientWidth); // ...and relayout
+           }
     }
 }