X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f38924e863cd44e2abd49d20d201d72aa773c51e..3903f408241aedc3b2f5e24349d0ac939ba9164c:/src/html/htmlwin.cpp

diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp
index 26a6420d9d..826db3742d 100644
--- a/src/html/htmlwin.cpp
+++ b/src/html/htmlwin.cpp
@@ -22,14 +22,14 @@
     #include "wx/dcclient.h"
     #include "wx/frame.h"
     #include "wx/dcmemory.h"
+    #include "wx/timer.h"
+    #include "wx/settings.h"
 #endif
 
 #include "wx/html/htmlwin.h"
 #include "wx/html/htmlproc.h"
 #include "wx/clipbrd.h"
 #include "wx/dataobj.h"
-#include "wx/timer.h"
-#include "wx/settings.h"
 
 #include "wx/arrimpl.cpp"
 #include "wx/listimpl.cpp"
@@ -640,7 +640,7 @@ void wxHtmlWindow::CreateLayout()
 
     if (m_Style & wxHW_SCROLLBAR_NEVER)
     {
-        SetScrollbars(wxHTML_SCROLL_STEP, 1, m_Cell->GetWidth() / wxHTML_SCROLL_STEP, 0); // always off
+        SetScrollbars(1, 1, 0, 0); // always off
         GetClientSize(&ClientWidth, &ClientHeight);
         m_Cell->Layout(ClientWidth);
     }
@@ -1556,6 +1556,8 @@ void wxHtmlWindow::SetHTMLStatusText(const wxString& text)
 #if wxUSE_STATUSBAR
     if (m_RelatedStatusBar != -1)
         m_RelatedFrame->SetStatusText(text, m_RelatedStatusBar);
+#else
+    wxUnusedVar(text);
 #endif // wxUSE_STATUSBAR
 }