From 6d595f3d7abc59d903dba5c8d9e6dd082f7b4671 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Tue, 3 Mar 2009 13:12:52 +0000 Subject: [PATCH] Don't crash if no scrollbar Force wxVSCROLL in wxRTC git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59295 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/scrolwin.cpp | 3 +++ src/richtext/richtextctrl.cpp | 2 ++ 2 files changed, 5 insertions(+) diff --git a/src/gtk/scrolwin.cpp b/src/gtk/scrolwin.cpp index e93f017032..245ecc7200 100644 --- a/src/gtk/scrolwin.cpp +++ b/src/gtk/scrolwin.cpp @@ -44,6 +44,9 @@ void wxScrollHelper::DoAdjustScrollbar(GtkRange* range, int *lines, int *linesPerPage) { + if (!range) + return; + int upper; int page_size; if (pixelsPerLine > 0 && winSize > 0 && winSize < virtSize) diff --git a/src/richtext/richtextctrl.cpp b/src/richtext/richtextctrl.cpp index 68fd792f2c..f3b1d697f3 100644 --- a/src/richtext/richtextctrl.cpp +++ b/src/richtext/richtextctrl.cpp @@ -196,6 +196,8 @@ wxRichTextCtrl::wxRichTextCtrl(wxWindow* parent, bool wxRichTextCtrl::Create( wxWindow* parent, wxWindowID id, const wxString& value, const wxPoint& pos, const wxSize& size, long style, const wxValidator& validator, const wxString& name) { + style |= wxVSCROLL; + if (!wxTextCtrlBase::Create(parent, id, pos, size, style|wxFULL_REPAINT_ON_RESIZE, validator, name)) -- 2.45.2