Make easier to compile with MSVC5.

[wxWidgets.git] / src / univ / winuniv.cpp

diff --git a/src/univ/winuniv.cpp b/src/univ/winuniv.cpp
index 5066ebe080c0344db6d5350f03d9fc0929a670e5..16eb13ae26faacf9867b4c6b061cb1f2bf4962f9 100644 (file)
--- a/src/univ/winuniv.cpp
+++ b/src/univ/winuniv.cpp
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     06.08.00
 // RCS-ID:      $Id$
-// Copyright:   (c) 2000 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
+// Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
 // Licence:     wxWindows license
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -109,12 +109,11 @@ bool wxWindow::Create(wxWindow *parent,
                       long style,
                       const wxString& name)
 {
-    // we add wxCLIP_CHILDREN and wxNO_FULL_REPAINT_ON_RESIZE because without
-    // these styles we can't get rid of flicker on wxMSW
+    // we add wxCLIP_CHILDREN to get the same ("natural") behaviour under MSW
+    // as under the other platforms
     if ( !wxWindowNative::Create(parent, id, pos, size,
-                                 style |
-                                 wxCLIP_CHILDREN |
-                                 wxNO_FULL_REPAINT_ON_RESIZE, name) )
+                                 style | wxCLIP_CHILDREN,
+                                 name) )
     {
         return FALSE;
     }
@@ -482,6 +481,15 @@ wxPoint wxWindow::GetClientAreaOrigin() const
 
 void wxWindow::DoGetClientSize(int *width, int *height) const
 {
+    // if it is a native window, we assume it handles the scrollbars itself
+    // too - and if it doesn't, there is not much we can do
+    if ( !m_renderer )
+    {
+        wxWindowNative::DoGetClientSize(width, height);
+
+        return;
+    }
+
     int w, h;
     wxWindowNative::DoGetClientSize(&w, &h);
 
@@ -720,8 +728,13 @@ void wxWindow::SetScrollPos(int orient, int pos, bool refresh)
     wxCHECK_RET( scrollbar, _T("no scrollbar to set position for") );
 
     scrollbar->SetThumbPosition(pos);
+
+    // VZ: I think we can safely ignore this as we always refresh it
+    //     automatically whenever the value chanegs
+#if 0
     if ( refresh )
         Refresh();
+#endif
 }
 
 int wxWindow::GetScrollPos(int orient) const
@@ -843,7 +856,7 @@ wxRect wxWindow::ScrollNoRefresh(int dx, int dy, const wxRect *rectTotal)
         dcMem.SelectObject(bmp);
 
         dcMem.Blit(wxPoint(0, 0), size, &dc, ptSource
-#if defined(__WXGTK__) && !defined(__WX_DC_BLIT_FIXED__)
+#if defined(__WXGTK__) && !defined(wxHAS_WORKING_GTK_DC_BLIT)
                 + GetClientAreaOrigin()
 #endif // broken wxGTK wxDC::Blit
                   );