recognize 646 charset as US-ASCII (this is how it is used by Solaris)

[wxWidgets.git] / src / gtk / scrolwin.cpp

diff --git a/src/gtk/scrolwin.cpp b/src/gtk/scrolwin.cpp
index 46cefd3e0fcfd4b45e366791b2684dbcec3c1a9f..1ed216acf6b85255d4a7b4e659bff35c28b9f0c7 100644 (file)
--- a/src/gtk/scrolwin.cpp
+++ b/src/gtk/scrolwin.cpp
@@ -298,6 +298,8 @@ bool wxScrolledWindow::Create(wxWindow *parent,
 
     if (m_parent)
         m_parent->DoAddChild( this );
+        
+    m_focusWidget = m_wxwindow;
 
     PostCreation();
 
@@ -377,7 +379,7 @@ void wxScrolledWindow::AdjustScrollbars()
 // target window handling
 // ----------------------------------------------------------------------------
 
-void wxScrolledWindow::SetTargetWindow( wxWindow *target )
+void wxScrolledWindow::SetTargetWindow( wxWindow *target, bool WXUNUSED(pushEventHandler) )
 {
     wxASSERT_MSG( target, wxT("target window must not be NULL") );
     m_targetWindow = target;