AddBook ignores wxMac paths (still won't work)

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

diff --git a/src/univ/winuniv.cpp b/src/univ/winuniv.cpp
index 1e6845686318bb56f4f09faa3b08da5f03b532c0..b7b018abb0a83bbc3058de750e0e46ff4e00a6e4 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
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -36,6 +36,7 @@
     #include "wx/event.h"
     #include "wx/scrolbar.h"
     #include "wx/menu.h"
+    #include "wx/frame.h"
 #endif // WX_PRECOMP
 
 #include "wx/univ/colschem.h"
@@ -345,7 +346,7 @@ void wxWindow::Refresh(bool eraseBackground, const wxRect *rectClient)
         dc.DrawRectangle(rectWin);
 
         // under Unix we use "--sync" X option for this
-        #ifdef __WXMSW__
+        #if defined(__WXMSW__) && !defined(__WXMICROWIN__)
             ::GdiFlush();
             ::Sleep(200);
         #endif // __WXMSW__
@@ -481,6 +482,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);
 
@@ -719,8 +729,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
@@ -842,7 +857,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
                   );