X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ecab4dba7d33782458d7cc8b91c981d03d7b9e37..2a31049201e9c1ff9f515eb9d144ae392f4b4e5a:/src/generic/scrolwin.cpp?ds=sidebyside

diff --git a/src/generic/scrolwin.cpp b/src/generic/scrolwin.cpp
index b3646bef6a..a582eb959f 100644
--- a/src/generic/scrolwin.cpp
+++ b/src/generic/scrolwin.cpp
@@ -27,7 +27,6 @@
 #include "wx/generic/scrolwin.h"
 #include "wx/panel.h"
 
-#if !USE_SHARED_LIBRARY
 BEGIN_EVENT_TABLE(wxScrolledWindow, wxPanel)
     EVT_SCROLLWIN(wxScrolledWindow::OnScroll)
     EVT_SIZE(wxScrolledWindow::OnSize)
@@ -35,7 +34,6 @@ BEGIN_EVENT_TABLE(wxScrolledWindow, wxPanel)
 END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxScrolledWindow, wxPanel)
-#endif
 
 #ifdef __WXMSW__
 #include "windows.h"
@@ -43,7 +41,14 @@ IMPLEMENT_DYNAMIC_CLASS(wxScrolledWindow, wxPanel)
 
 #ifdef __WXMOTIF__
 // For wxRETAINED implementation
+#ifdef __VMS__ //VMS's Xm.h is not (yet) compatible with C++
+               //This code switches off the compiler warnings
+# pragma message disable nosimpint
+#endif
 #include <Xm/Xm.h>
+#ifdef __VMS__
+# pragma message enable nosimpint
+#endif
 #endif
 
 wxScrolledWindow::wxScrolledWindow()
@@ -153,7 +158,10 @@ void wxScrolledWindow::SetScrollbars (int pixelsPerUnitX, int pixelsPerUnitY,
    
 #ifdef __WXMSW__
    // Necessary?
-    UpdateWindow ((HWND) GetHWND());
+    UpdateWindow ((HWND) m_targetWindow->GetHWND());
+#endif
+#ifdef __WXMAC__
+		m_targetWindow->MacUpdateImmediately() ;
 #endif
 }
 
@@ -213,6 +221,9 @@ void wxScrolledWindow::OnScroll(wxScrollWinEvent& event)
         else
             m_targetWindow->Refresh();
   }
+#ifdef __WXMAC__
+	m_targetWindow->MacUpdateImmediately() ;
+#endif
 }
 
 int wxScrolledWindow::CalcScrollInc(wxScrollWinEvent& event)
@@ -518,6 +529,9 @@ void wxScrolledWindow::Scroll( int x_pos, int y_pos )
 #else
 //    Refresh();
 #endif
+#ifdef __WXMAC__
+		m_targetWindow->MacUpdateImmediately() ;
+#endif
 }
 
 void wxScrolledWindow::EnableScrolling (bool x_scroll, bool y_scroll)