From a374cdc43e89304a9c67d221949e7cb94b5d8c93 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Fri, 10 Jun 2005 08:39:19 +0000 Subject: [PATCH] Need to set background colour for wxListBox, not just wxCheckListBox, to avoid scrolling problem when Windows effects are switched on. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34624 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/checklst.cpp | 20 ++++---------------- src/msw/listbox.cpp | 4 ++++ 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/src/msw/checklst.cpp b/src/msw/checklst.cpp index f9790875b9..7c928d371b 100644 --- a/src/msw/checklst.cpp +++ b/src/msw/checklst.cpp @@ -322,14 +322,8 @@ bool wxCheckListBox::Create(wxWindow *parent, wxWindowID id, long style, const wxValidator& validator, const wxString& name) { - if (wxListBox::Create(parent, id, pos, size, n, choices, - style | wxLB_OWNERDRAW, validator, name)) - { - SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW)); - return true; - } - else - return false; + return wxListBox::Create(parent, id, pos, size, n, choices, + style | wxLB_OWNERDRAW, validator, name); } bool wxCheckListBox::Create(wxWindow *parent, wxWindowID id, @@ -338,14 +332,8 @@ bool wxCheckListBox::Create(wxWindow *parent, wxWindowID id, long style, const wxValidator& validator, const wxString& name) { - if (wxListBox::Create(parent, id, pos, size, choices, - style | wxLB_OWNERDRAW, validator, name)) - { - SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW)); - return true; - } - else - return false; + return wxListBox::Create(parent, id, pos, size, choices, + style | wxLB_OWNERDRAW, validator, name); } // misc overloaded methods diff --git a/src/msw/listbox.cpp b/src/msw/listbox.cpp index c799cf3479..ffe24da141 100644 --- a/src/msw/listbox.cpp +++ b/src/msw/listbox.cpp @@ -174,6 +174,10 @@ bool wxListBox::Create(wxWindow *parent, return false; } + // Necessary to prevent scroll problems within a notebook with Windows + // effects enabled + SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW)); + // initialize the contents for ( int i = 0; i < n; i++ ) { -- 2.45.2