*** empty log message ***

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

diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp
index ebc7e3f2eb71742ede8ff1fcdd8489e17c5448c8..7c08bbbd3f6b54a104974b871013e7c7788ee93b 100644 (file)
--- a/src/html/htmlwin.cpp
+++ b/src/html/htmlwin.cpp
@@ -256,7 +256,10 @@ void wxHtmlWindow::CreateLayout()
 
     else {
         GetClientSize(&ClientWidth, &ClientHeight);
 
     else {
         GetClientSize(&ClientWidth, &ClientHeight);

+#ifndef __WXMSW__
+        // VS : this looks extremely ugly under windoze, better fix needed!

         SetScrollbars(1, 1, 0, ClientHeight * 2); // always on          
         SetScrollbars(1, 1, 0, ClientHeight * 2); // always on          

+#endif

         GetClientSize(&ClientWidth, &ClientHeight);
         m_Cell -> Layout(ClientWidth);
        if (ClientHeight < m_Cell -> GetHeight()) {
         GetClientSize(&ClientWidth, &ClientHeight);
         m_Cell -> Layout(ClientWidth);
        if (ClientHeight < m_Cell -> GetHeight()) {


@@ -267,6 +270,7 @@ void wxHtmlWindow::CreateLayout()
         }
            else { /* we fit into window, no need for scrollbars */
                SetScrollbars(1, 1, 0, 0); // disable...
         }
            else { /* we fit into window, no need for scrollbars */
                SetScrollbars(1, 1, 0, 0); // disable...

+                GetClientSize(&ClientWidth, &ClientHeight);

                m_Cell -> Layout(ClientWidth); // ...and relayout
            }
     }
                m_Cell -> Layout(ClientWidth); // ...and relayout
            }
     }