Added wxPropertyGrid::WasValueChangedInEvent(), added code to avoid showing colour picker dialog twice when 'Custom' colour was picked from drop-down list

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61404 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-07-11 07:59:59 +00:00
parent 858102d740
commit eddcc4b442
3 changed files with 28 additions and 1 deletions
--- a/src/propgrid/advprops.cpp
+++ b/src/propgrid/advprops.cpp
@@ -1259,7 +1259,7 @@ bool wxSystemColourProperty::OnEvent( wxPropertyGrid* propgrid,
            askColour = true;
    }

-    if ( askColour )
+    if ( askColour && !propgrid->WasValueChangedInEvent() )
    {
        // We need to handle button click in case editor has been
        // switched to one that has wxButton as well.