X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4e6b6f210d7f149b78201bd767578d2e31b89d74..ccbb33c91bc98f9ace71aff5e7b1cd1356004753:/src/generic/listctrl.cpp diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp index f02f3b99cc..60bc7d5a9d 100644 --- a/src/generic/listctrl.cpp +++ b/src/generic/listctrl.cpp @@ -837,11 +837,7 @@ protected: // get the colour to be used for drawing the rules wxColour GetRuleColour() const { -#ifdef __WXMAC__ - return *wxWHITE; -#else return wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT); -#endif } private: @@ -2147,7 +2143,7 @@ void wxListTextCtrl::OnKeyUp( wxKeyEvent &event ) void wxListTextCtrl::OnKillFocus( wxFocusEvent &event ) { - if ( !m_finished ) + if ( !m_finished && !m_aboutToFinish ) { // We must finish regardless of success, otherwise we'll get // focus problems: