wxMSW update for CW, wxMac updated

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

diff --git a/src/generic/scrolwin.cpp b/src/generic/scrolwin.cpp
index b3646bef6a281ff495b364863716fdd3b0805e7f..50d44cedd8aaf1deac77fe15be83a39fc67125bb 100644 (file)
--- a/src/generic/scrolwin.cpp
+++ b/src/generic/scrolwin.cpp
@@ -43,7 +43,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 +160,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 +223,9 @@ void wxScrolledWindow::OnScroll(wxScrollWinEvent& event)
         else
             m_targetWindow->Refresh();
   }
+#ifdef __WXMAC__
+       m_targetWindow->MacUpdateImmediately() ;
+#endif
 }
 
 int wxScrolledWindow::CalcScrollInc(wxScrollWinEvent& event)
@@ -518,6 +531,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)