fixed compilation [warning]

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

diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp
index 05ccf01a77b443d725d828481a304a9cb29302bb..526f5227c6e9129640116ef46ba50db81445884e 100644 (file)
--- a/src/gtk/textctrl.cpp
+++ b/src/gtk/textctrl.cpp
@@ -21,6 +21,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <ctype.h>
+#include <math.h>               // for fabs
 
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
@@ -1312,6 +1313,8 @@ void wxTextCtrl::Thaw()
 {
     if ( HasFlag(wxTE_MULTILINE) )
     {
+        GTK_TEXT(m_text)->vadj->value = 0.0;
+
         gtk_text_thaw(GTK_TEXT(m_text));
     }
 }
@@ -1368,6 +1371,6 @@ bool wxTextCtrl::ScrollPages(int pages)
     if ( !adj )
         return FALSE;
 
-    return DoScroll(adj, pages*adj->page_increment);
+    return DoScroll(adj, (int)ceil(pages*adj->page_increment));
 }
 

diff --git a/src/gtk1/textctrl.cpp b/src/gtk1/textctrl.cpp
index 05ccf01a77b443d725d828481a304a9cb29302bb..526f5227c6e9129640116ef46ba50db81445884e 100644 (file)
--- a/src/gtk1/textctrl.cpp
+++ b/src/gtk1/textctrl.cpp
@@ -21,6 +21,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <ctype.h>
+#include <math.h>               // for fabs
 
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
@@ -1312,6 +1313,8 @@ void wxTextCtrl::Thaw()
 {
     if ( HasFlag(wxTE_MULTILINE) )
     {
+        GTK_TEXT(m_text)->vadj->value = 0.0;
+
         gtk_text_thaw(GTK_TEXT(m_text));
     }
 }
@@ -1368,6 +1371,6 @@ bool wxTextCtrl::ScrollPages(int pages)
     if ( !adj )
         return FALSE;
 
-    return DoScroll(adj, pages*adj->page_increment);
+    return DoScroll(adj, (int)ceil(pages*adj->page_increment));
 }