another segfault fix

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

diff --git a/src/univ/winuniv.cpp b/src/univ/winuniv.cpp
index b7b018abb0a83bbc3058de750e0e46ff4e00a6e4..dbb420c484c78fcf24e4b33ff5d96105654a78fd 100644 (file)
--- a/src/univ/winuniv.cpp
+++ b/src/univ/winuniv.cpp
@@ -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;
     }


@@ -130,11 +135,6 @@ bool wxWindow::Create(wxWindow *parent,
         PositionScrollbars();
     }
 
         PositionScrollbars();
     }
 

-    // the colours/fonts are default
-    m_hasBgCol =
-    m_hasFgCol =
-    m_hasFont = FALSE;
-

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -366,7 +366,7 @@ bool wxWindow::Enable(bool enable)
         return FALSE;
 
     // disabled window can't keep focus
         return FALSE;
 
     // disabled window can't keep focus

-    if ( FindFocus() == this )
+    if ( FindFocus() == this && GetParent() != NULL )

     {
         GetParent()->SetFocus();
     }
     {
         GetParent()->SetFocus();
     }


@@ -654,9 +654,12 @@ void wxWindow::SetScrollbar(int orient,
                             int range,
                             bool refresh)
 {
                             int range,
                             bool refresh)
 {

+    wxASSERT_MSG( pageSize <= range,
+                    _T("page size can't be greater than range") );
+

     bool hasClientSizeChanged = FALSE;
     wxScrollBar *scrollbar = GetScrollbar(orient);
     bool hasClientSizeChanged = FALSE;
     wxScrollBar *scrollbar = GetScrollbar(orient);

-    if ( range )
+    if ( range && (pageSize < range) )

     {
         if ( !scrollbar )
         {
     {
         if ( !scrollbar )
         {


@@ -930,40 +933,6 @@ wxRect wxWindow::ScrollNoRefresh(int dx, int dy, const wxRect *rectTotal)
     return rect;
 }
 
     return rect;
 }
 

-// ----------------------------------------------------------------------------
-// colours/fonts
-// ----------------------------------------------------------------------------
-
-bool wxWindow::SetBackgroundColour(const wxColour& colour)
-{
-    if ( !wxWindowNative::SetBackgroundColour(colour) )
-        return FALSE;
-
-    m_hasBgCol = TRUE;
-
-    return TRUE;
-}
-
-bool wxWindow::SetForegroundColour(const wxColour& colour)
-{
-    if ( !wxWindowNative::SetForegroundColour(colour) )
-        return FALSE;
-
-    m_hasFgCol = TRUE;
-
-    return TRUE;
-}
-
-bool wxWindow::SetFont(const wxFont& font)
-{
-    if ( !wxWindowNative::SetFont(font) )
-        return FALSE;
-
-    m_hasFont = TRUE;
-
-    return TRUE;
-}
-

 // ----------------------------------------------------------------------------
 // mouse capture
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // mouse capture
 // ----------------------------------------------------------------------------


@@ -976,6 +945,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 )
     {


@@ -1003,6 +974,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());

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