From 34e8f09728ccbc0929cc4da77a9e47d13634eb14 Mon Sep 17 00:00:00 2001 From: Chris Elliott Date: Fri, 7 May 2004 16:11:22 +0000 Subject: [PATCH] fix for motif /scintilla bugs git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27136 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/motif/frame.cpp | 7 ++++++- src/motif/window.cpp | 11 +++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/motif/frame.cpp b/src/motif/frame.cpp index 29cc119131..7b325f41da 100644 --- a/src/motif/frame.cpp +++ b/src/motif/frame.cpp @@ -355,7 +355,12 @@ void wxFrame::DoGetClientSize(int *x, int *y) const yy -= tbh; } #endif // wxUSE_TOOLBAR - *x = xx; *y = yy; + +//CE found a call here with NULL y pointer + if (x) + *x = xx; + if (y) + *y = yy; } // Set the client size (i.e. leave the calculation of borders etc. diff --git a/src/motif/window.cpp b/src/motif/window.cpp index f6fa06cdba..fb6a636e1a 100644 --- a/src/motif/window.cpp +++ b/src/motif/window.cpp @@ -757,7 +757,9 @@ int wxWindow::GetScrollPos(int orient) const int wxWindow::GetScrollRange(int orient) const { Widget scrollBar = (Widget)GetScrollbar((wxOrientation)orient); - wxCHECK_MSG( scrollBar, 0, "no such scrollbar" ); + // CE scintilla windows don't always have these scrollbars + // and it tends to pile up a whole bunch of asserts + //wxCHECK_MSG( scrollBar, 0, "no such scrollbar" ); int range = 0; if (scrollBar) @@ -768,10 +770,11 @@ int wxWindow::GetScrollRange(int orient) const int wxWindow::GetScrollThumb(int orient) const { Widget scrollBar = (Widget)GetScrollbar((wxOrientation)orient); - wxCHECK_MSG( scrollBar, 0, "no such scrollbar" ); + //wxCHECK_MSG( scrollBar, 0, "no such scrollbar" ); - int thumb; - XtVaGetValues(scrollBar, XmNsliderSize, &thumb, NULL); + int thumb = 0; + if (scrollBar) + XtVaGetValues(scrollBar, XmNsliderSize, &thumb, NULL); return thumb; } -- 2.47.2