Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix for motif /scintilla bugs

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27136 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Chris Elliott
2004-05-07 16:11:22 +00:00
parent edff75452a
commit 34e8f09728
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/motif/frame.cpp
View File

@@ -355,7 +355,12 @@ void wxFrame::DoGetClientSize(int *x, int *y) const
yy -= tbh; yy -= tbh;
} }
#endif // wxUSE_TOOLBAR #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. // Set the client size (i.e. leave the calculation of borders etc.

9
src/motif/window.cpp
View File

@@ -757,7 +757,9 @@ int wxWindow::GetScrollPos(int orient) const
int wxWindow::GetScrollRange(int orient) const int wxWindow::GetScrollRange(int orient) const
{ {
Widget scrollBar = (Widget)GetScrollbar((wxOrientation)orient); 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; int range = 0;
if (scrollBar) if (scrollBar)
@@ -768,9 +770,10 @@ int wxWindow::GetScrollRange(int orient) const
int wxWindow::GetScrollThumb(int orient) const int wxWindow::GetScrollThumb(int orient) const
{ {
Widget scrollBar = (Widget)GetScrollbar((wxOrientation)orient); Widget scrollBar = (Widget)GetScrollbar((wxOrientation)orient);
wxCHECK_MSG( scrollBar, 0, "no such scrollbar" ); //wxCHECK_MSG( scrollBar, 0, "no such scrollbar" );
int thumb; int thumb = 0;
if (scrollBar)
XtVaGetValues(scrollBar, XmNsliderSize, &thumb, NULL); XtVaGetValues(scrollBar, XmNsliderSize, &thumb, NULL);
return thumb; return thumb;
} }