(hopefully) fixed wxGTK wxScrolledWindow::GetClientSize bug

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

diff --git a/src/gtk/scrolwin.cpp b/src/gtk/scrolwin.cpp
index 7e38b4c7b2fa722bea86fdd15c5e5b0bd653078f..bf6a8921e8cc62a7b48c857f053302fd4fa7e07c 100644 (file)
--- a/src/gtk/scrolwin.cpp
+++ b/src/gtk/scrolwin.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        generic/scrolwin.cpp
+// Name:        gtk/scrolwin.cpp
 // Purpose:     wxScrolledWindow implementation
 // Author:      Julian Smart
 // Modified by:
@@ -137,6 +137,7 @@ void wxScrolledWindow::Init()
     m_targetWindow = (wxWindow*) NULL;
     m_scaleX = 1.0;
     m_scaleY = 1.0;
+    m_hasScrolling = TRUE;
 }
 
 bool wxScrolledWindow::Create(wxWindow *parent,

diff --git a/src/gtk1/scrolwin.cpp b/src/gtk1/scrolwin.cpp
index 7e38b4c7b2fa722bea86fdd15c5e5b0bd653078f..bf6a8921e8cc62a7b48c857f053302fd4fa7e07c 100644 (file)
--- a/src/gtk1/scrolwin.cpp
+++ b/src/gtk1/scrolwin.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        generic/scrolwin.cpp
+// Name:        gtk/scrolwin.cpp
 // Purpose:     wxScrolledWindow implementation
 // Author:      Julian Smart
 // Modified by:
@@ -137,6 +137,7 @@ void wxScrolledWindow::Init()
     m_targetWindow = (wxWindow*) NULL;
     m_scaleX = 1.0;
     m_scaleY = 1.0;
+    m_hasScrolling = TRUE;
 }
 
 bool wxScrolledWindow::Create(wxWindow *parent,