compilation fix for broken OS/2 compiler

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

diff --git a/src/univ/winuniv.cpp b/src/univ/winuniv.cpp
index 1e6845686318bb56f4f09faa3b08da5f03b532c0..b3d73e3ed4fc7ce57fe30fbe80205608a7cc9ff0 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$
 // 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
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 ///////////////////////////////////////////////////////////////////////////////
 


@@ -36,6 +36,7 @@
     #include "wx/event.h"
     #include "wx/scrolbar.h"
     #include "wx/menu.h"
     #include "wx/event.h"
     #include "wx/scrolbar.h"
     #include "wx/menu.h"

+    #include "wx/frame.h"

 #endif // WX_PRECOMP
 
 #include "wx/univ/colschem.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
         dc.DrawRectangle(rectWin);
 
         // under Unix we use "--sync" X option for this

-        #ifdef __WXMSW__
+        #if defined(__WXMSW__) && !defined(__WXMICROWIN__)

             ::GdiFlush();
             ::Sleep(200);
         #endif // __WXMSW__
             ::GdiFlush();
             ::Sleep(200);
         #endif // __WXMSW__


@@ -481,6 +482,15 @@ wxPoint wxWindow::GetClientAreaOrigin() const
 
 void wxWindow::DoGetClientSize(int *width, int *height) 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);
 
     int w, h;
     wxWindowNative::DoGetClientSize(&w, &h);