Updated to new PyCrust

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

diff --git a/src/univ/winuniv.cpp b/src/univ/winuniv.cpp
index 5066ebe080c0344db6d5350f03d9fc0929a670e5..4ce63facfe380c72be8b4ba6a0058b2ad75168ef 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
 ///////////////////////////////////////////////////////////////////////////////
 


@@ -54,6 +54,10 @@
     #undef WXDEBUG_REFRESH
 #endif
 
     #undef WXDEBUG_REFRESH
 #endif
 

+#if defined(WXDEBUG_REFRESH) && defined(__WXMSW__) && !defined(__WXMICROWIN__)
+#include "wx/msw/private.h"
+#endif
+

 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================


@@ -69,6 +73,8 @@
     IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowGTK)
 #elif defined(__WXMGL__)
     IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowMGL)
     IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowGTK)
 #elif defined(__WXMGL__)
     IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowMGL)

+#elif defined(__WXPM__)
+    IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowOS2)

 #endif
 
 BEGIN_EVENT_TABLE(wxWindow, wxWindowNative)
 #endif
 
 BEGIN_EVENT_TABLE(wxWindow, wxWindowNative)


@@ -109,12 +115,11 @@ bool wxWindow::Create(wxWindow *parent,
                       long style,
                       const wxString& name)
 {
                       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,
     if ( !wxWindowNative::Create(parent, id, pos, size,

-                                 style |
-                                 wxCLIP_CHILDREN |
-                                 wxNO_FULL_REPAINT_ON_RESIZE, name) )
+                                 style | wxCLIP_CHILDREN,
+                                 name) )

     {
         return FALSE;
     }
     {
         return FALSE;
     }


@@ -482,6 +487,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);
 


@@ -720,8 +734,13 @@ void wxWindow::SetScrollPos(int orient, int pos, bool refresh)
     wxCHECK_RET( scrollbar, _T("no scrollbar to set position for") );
 
     scrollbar->SetThumbPosition(pos);
     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();
     if ( refresh )
         Refresh();

+#endif

 }
 
 int wxWindow::GetScrollPos(int orient) const
 }
 
 int wxWindow::GetScrollPos(int orient) const


@@ -843,7 +862,7 @@ wxRect wxWindow::ScrollNoRefresh(int dx, int dy, const wxRect *rectTotal)
         dcMem.SelectObject(bmp);
 
         dcMem.Blit(wxPoint(0, 0), size, &dc, ptSource
         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
                   );
                 + GetClientAreaOrigin()
 #endif // broken wxGTK wxDC::Blit
                   );


@@ -962,6 +981,8 @@ struct WXDLLEXPORT wxWindowNext
 
 void wxWindow::CaptureMouse()
 {
 
 void wxWindow::CaptureMouse()
 {

+    wxLogTrace(_T("mousecapture"), _T("CaptureMouse(0x%08x)"), this);
+

     wxWindow *winOld = GetCapture();
     if ( winOld )
     {
     wxWindow *winOld = GetCapture();
     if ( winOld )
     {


@@ -989,6 +1010,10 @@ void wxWindow::ReleaseMouse()
         delete item;
     }
     //else: stack is empty, no previous capture
         delete item;
     }
     //else: stack is empty, no previous capture

+
+    wxLogTrace(_T("mousecapture"),
+               _T("After ReleaseMouse() mouse is captured by 0x%08x"),
+               GetCapture());

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------