Recognize VC12 (a.k.a. MSVS 2013) and define __VISUALC12__ for it.

[wxWidgets.git] / src / propgrid / property.cpp

diff --git a/src/propgrid/property.cpp b/src/propgrid/property.cpp
index 5c789adc78596d73b081b058d88d608caec3675a..ceaba28ae3f92e6da1d96a0d400e365d94c192be 100644 (file)
--- a/src/propgrid/property.cpp
+++ b/src/propgrid/property.cpp
@@ -6,7 +6,7 @@
 // Created:     2008-08-23
 // RCS-ID:      $Id$
 // Copyright:   (c) Jaakko Salli
 // Created:     2008-08-23
 // RCS-ID:      $Id$
 // Copyright:   (c) Jaakko Salli

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx/wx.h".
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx/wx.h".


@@ -24,6 +24,7 @@
     #include "wx/hash.h"
     #include "wx/string.h"
     #include "wx/log.h"
     #include "wx/hash.h"
     #include "wx/string.h"
     #include "wx/log.h"

+    #include "wx/math.h"

     #include "wx/event.h"
     #include "wx/window.h"
     #include "wx/panel.h"
     #include "wx/event.h"
     #include "wx/window.h"
     #include "wx/panel.h"


@@ -35,6 +36,8 @@
     #include "wx/intl.h"
 #endif
 
     #include "wx/intl.h"
 #endif
 

+#include "wx/image.h"
+

 #include "wx/propgrid/propgrid.h"
 
 
 #include "wx/propgrid/propgrid.h"
 
 


@@ -45,7 +48,7 @@
 
 #if wxPG_COMPATIBILITY_1_4
 
 
 #if wxPG_COMPATIBILITY_1_4
 

-// Used to establish backwards compatiblity
+// Used to establish backwards compatibility

 const char* g_invalidStringContent = "@__TOTALLY_INVALID_STRING__@";
 
 #endif
 const char* g_invalidStringContent = "@__TOTALLY_INVALID_STRING__@";
 
 #endif


@@ -135,8 +138,9 @@ int wxPGCellRenderer::PreDrawCell( wxDC& dc, const wxRect& rect, const wxPGCell&
     // If possible, use cell colours
     if ( !(flags & DontUseCellBgCol) )
     {
     // If possible, use cell colours
     if ( !(flags & DontUseCellBgCol) )
     {

-        dc.SetPen(cell.GetBgCol());
-        dc.SetBrush(cell.GetBgCol());
+        const wxColour& bgCol = cell.GetBgCol();
+        dc.SetPen(bgCol);
+        dc.SetBrush(bgCol);

     }
 
     if ( !(flags & DontUseCellFgCol) )
     }
 
     if ( !(flags & DontUseCellFgCol) )


@@ -149,8 +153,13 @@ int wxPGCellRenderer::PreDrawCell( wxDC& dc, const wxRect& rect, const wxPGCell&
     if ( !(flags & (Control|ChoicePopup)) )
         dc.DrawRectangle(rect);
 
     if ( !(flags & (Control|ChoicePopup)) )
         dc.DrawRectangle(rect);
 

+    // Use cell font, if provided
+    const wxFont& font = cell.GetFont();
+    if ( font.IsOk() )
+        dc.SetFont(font);
+

     const wxBitmap& bmp = cell.GetBitmap();
     const wxBitmap& bmp = cell.GetBitmap();

-    if ( bmp.Ok() &&
+    if ( bmp.IsOk() &&

         // Do not draw oversized bitmap outside choice popup
          ((flags & ChoicePopup) || bmp.GetHeight() < rect.height )
         )
         // Do not draw oversized bitmap outside choice popup
          ((flags & ChoicePopup) || bmp.GetHeight() < rect.height )
         )


@@ -165,14 +174,29 @@ int wxPGCellRenderer::PreDrawCell( wxDC& dc, const wxRect& rect, const wxPGCell&
     return imageWidth;
 }
 
     return imageWidth;
 }
 

+void wxPGCellRenderer::PostDrawCell( wxDC& dc,
+                                     const wxPropertyGrid* propGrid,
+                                     const wxPGCell& cell,
+                                     int WXUNUSED(flags) ) const
+{
+    // Revert font
+    const wxFont& font = cell.GetFont();
+    if ( font.IsOk() )
+        dc.SetFont(propGrid->GetFont());
+}
+

 // -----------------------------------------------------------------------
 // wxPGDefaultRenderer
 // -----------------------------------------------------------------------
 
 // -----------------------------------------------------------------------
 // wxPGDefaultRenderer
 // -----------------------------------------------------------------------
 

-void wxPGDefaultRenderer::Render( wxDC& dc, const wxRect& rect,
+bool wxPGDefaultRenderer::Render( wxDC& dc, const wxRect& rect,

                                   const wxPropertyGrid* propertyGrid, wxPGProperty* property,
                                   int column, int item, int flags ) const
 {
                                   const wxPropertyGrid* propertyGrid, wxPGProperty* property,
                                   int column, int item, int flags ) const
 {

+    const wxPGEditor* editor = NULL;
+    const wxPGCell* cell = NULL;
+
+    wxString text;

     bool isUnspecified = property->IsValueUnspecified();
 
     if ( column == 1 && item == -1 )
     bool isUnspecified = property->IsValueUnspecified();
 
     if ( column == 1 && item == -1 )


@@ -182,17 +206,19 @@ void wxPGDefaultRenderer::Render( wxDC& dc, const wxRect& rect,
         {
             // Common Value
             if ( !isUnspecified )
         {
             // Common Value
             if ( !isUnspecified )

-                DrawText( dc, rect, 0, propertyGrid->GetCommonValueLabel(cmnVal) );
-            return;
+            {
+                text = propertyGrid->GetCommonValueLabel(cmnVal);
+                DrawText( dc, rect, 0, text );
+                if ( !text.empty() )
+                    return true;
+            }
+            return false;

         }
     }
 
         }
     }
 

-    const wxPGEditor* editor = NULL;
-    const wxPGCell* cell = NULL;
-
-    wxString text;

     int imageWidth = 0;
     int preDrawFlags = flags;
     int imageWidth = 0;
     int preDrawFlags = flags;

+    bool res = false;

 
     property->GetDisplayInfo(column, item, flags, &text, &cell);
 
 
     property->GetDisplayInfo(column, item, flags, &text, &cell);
 


@@ -200,10 +226,10 @@ void wxPGDefaultRenderer::Render( wxDC& dc, const wxRect& rect,
 
     if ( column == 1 )
     {
 
     if ( column == 1 )
     {

+        editor = property->GetColumnEditor(column);
+

         if ( !isUnspecified )
         {
         if ( !isUnspecified )
         {

-            editor = property->GetColumnEditor(column);
-

             // Regular property value
 
             wxSize imageSize = propertyGrid->GetImageSize(property, item);
             // Regular property value
 
             wxSize imageSize = propertyGrid->GetImageSize(property, item);


@@ -235,21 +261,31 @@ void wxPGDefaultRenderer::Render( wxDC& dc, const wxRect& rect,
             if ( propertyGrid->GetColumnCount() <= 2 )
             {
                 wxString unitsString = property->GetAttribute(wxPGGlobalVars->m_strUnits, wxEmptyString);
             if ( propertyGrid->GetColumnCount() <= 2 )
             {
                 wxString unitsString = property->GetAttribute(wxPGGlobalVars->m_strUnits, wxEmptyString);

-                if ( unitsString.length() )
+                if ( !unitsString.empty() )

                     text = wxString::Format(wxS("%s %s"), text.c_str(), unitsString.c_str() );
             }
         }
 
                     text = wxString::Format(wxS("%s %s"), text.c_str(), unitsString.c_str() );
             }
         }
 

-        if ( text.length() == 0 )
+        if ( text.empty() )

         {
         {

-            // Try to show inline help if no text
-            wxVariant vInlineHelp = property->GetAttribute(wxPGGlobalVars->m_strInlineHelp);
-            if ( !vInlineHelp.IsNull() )
+            text = property->GetHintText();
+            if ( !text.empty() )

             {
             {

-                text = vInlineHelp.GetString();
-                dc.SetTextForeground(propertyGrid->GetCellDisabledTextColour());
+                res = true;
+
+                const wxColour& hCol =
+                    propertyGrid->GetCellDisabledTextColour();
+                dc.SetTextForeground(hCol);
+
+                // Must make the editor NULL to override its own rendering
+                // code.
+                editor = NULL;

             }
         }
             }
         }

+        else
+        {
+            res = true;
+        }

     }
 
     int imageOffset = property->GetImageOffset(imageWidth);
     }
 
     int imageOffset = property->GetImageOffset(imageWidth);


@@ -257,14 +293,14 @@ void wxPGDefaultRenderer::Render( wxDC& dc, const wxRect& rect,
     DrawEditorValue( dc, rect, imageOffset, text, property, editor );
 
     // active caption gets nice dotted rectangle
     DrawEditorValue( dc, rect, imageOffset, text, property, editor );
 
     // active caption gets nice dotted rectangle

-    if ( property->IsCategory() /*&& column == 0*/ )
+    if ( property->IsCategory() && column == 0 )

     {
         if ( flags & Selected )
         {
     {
         if ( flags & Selected )
         {

-            if ( imageWidth > 0 )
+            if ( imageOffset > 0 )

             {
                 imageOffset -= DEFAULT_IMAGE_OFFSET_INCREMENT;
             {
                 imageOffset -= DEFAULT_IMAGE_OFFSET_INCREMENT;

-                imageWidth += wxCC_CUSTOM_IMAGE_MARGIN2 + 4;
+                imageOffset += wxCC_CUSTOM_IMAGE_MARGIN2 + 4;

             }
 
             DrawCaptionSelectionRect( dc,
             }
 
             DrawCaptionSelectionRect( dc,


@@ -276,6 +312,10 @@ void wxPGDefaultRenderer::Render( wxDC& dc, const wxRect& rect,
                                       propertyGrid->GetFontHeight()+(wxPG_CAPRECTYMARGIN*2) );
         }
     }
                                       propertyGrid->GetFontHeight()+(wxPG_CAPRECTYMARGIN*2) );
         }
     }

+
+    PostDrawCell(dc, propertyGrid, *cell, preDrawFlags);
+
+    return res;

 }
 
 wxSize wxPGDefaultRenderer::GetImageSize( const wxPGProperty* property,
 }
 
 wxSize wxPGDefaultRenderer::GetImageSize( const wxPGProperty* property,


@@ -288,7 +328,7 @@ wxSize wxPGDefaultRenderer::GetImageSize( const wxPGProperty* property,
         {
             wxBitmap* bmp = property->GetValueImage();
 
         {
             wxBitmap* bmp = property->GetValueImage();
 

-            if ( bmp && bmp->Ok() )
+            if ( bmp && bmp->IsOk() )

                 return wxSize(bmp->GetWidth(),bmp->GetHeight());
         }
     }
                 return wxSize(bmp->GetWidth(),bmp->GetHeight());
         }
     }


@@ -362,6 +402,13 @@ void wxPGCell::SetFgCol( const wxColour& col )
     GetData()->SetFgCol(col);
 }
 
     GetData()->SetFgCol(col);
 }
 

+void wxPGCell::SetFont( const wxFont& font )
+{
+    AllocExclusive();
+
+    GetData()->SetFont(font);
+}
+

 void wxPGCell::SetBgCol( const wxColour& col )
 {
     AllocExclusive();
 void wxPGCell::SetBgCol( const wxColour& col )
 {
     AllocExclusive();


@@ -388,6 +435,12 @@ void wxPGCell::MergeFrom( const wxPGCell& srcCell )
         data->SetBitmap(srcCell.GetBitmap());
 }
 
         data->SetBitmap(srcCell.GetBitmap());
 }
 

+void wxPGCell::SetEmptyData()
+{
+    AllocExclusive();
+}
+
+

 // -----------------------------------------------------------------------
 // wxPGProperty
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------
 // wxPGProperty
 // -----------------------------------------------------------------------


@@ -447,7 +500,24 @@ void wxPGProperty::InitAfterAdded( wxPropertyGridPageState* pageState,
     // (so propgrid can be NULL, too).
 
     wxPGProperty* parent = m_parent;
     // (so propgrid can be NULL, too).
 
     wxPGProperty* parent = m_parent;

-    bool parentIsRoot = parent->IsKindOf(CLASSINFO(wxPGRootProperty));
+    bool parentIsRoot = parent->IsKindOf(wxCLASSINFO(wxPGRootProperty));
+
+    //
+    // Convert invalid cells to default ones in this grid
+    for ( unsigned int i=0; i<m_cells.size(); i++ )
+    {
+        wxPGCell& cell = m_cells[i];
+        if ( cell.IsInvalid() )
+        {
+            const wxPGCell& propDefCell = propgrid->GetPropertyDefaultCell();
+            const wxPGCell& catDefCell = propgrid->GetCategoryDefaultCell();
+
+            if ( !HasFlag(wxPG_PROP_CATEGORY) )
+                cell = propDefCell;
+            else
+                cell = catDefCell;
+        }
+    }

 
     m_parentState = pageState;
 
 
     m_parentState = pageState;
 


@@ -571,6 +641,27 @@ void wxPGProperty::InitAfterAdded( wxPropertyGridPageState* pageState,
     }
 }
 
     }
 }
 

+void wxPGProperty::OnDetached(wxPropertyGridPageState* WXUNUSED(state),
+                              wxPropertyGrid* propgrid)
+{
+    if ( propgrid )
+    {
+        const wxPGCell& propDefCell = propgrid->GetPropertyDefaultCell();
+        const wxPGCell& catDefCell = propgrid->GetCategoryDefaultCell();
+
+        // Make default cells invalid
+        for ( unsigned int i=0; i<m_cells.size(); i++ )
+        {
+            wxPGCell& cell = m_cells[i];
+            if ( cell.IsSameAs(propDefCell) ||
+                 cell.IsSameAs(catDefCell) )
+            {
+                cell.UnRef();
+            }
+        }
+    }
+}
+

 wxPGProperty::wxPGProperty()
     : wxObject()
 {
 wxPGProperty::wxPGProperty()
     : wxObject()
 {


@@ -627,7 +718,7 @@ wxString wxPGProperty::GetName() const
 {
     wxPGProperty* parent = GetParent();
 
 {
     wxPGProperty* parent = GetParent();
 

-    if ( !m_name.length() || !parent || parent->IsCategory() || parent->IsRoot() )
+    if ( m_name.empty() || !parent || parent->IsCategory() || parent->IsRoot() )

         return m_name;
 
     return m_parent->GetName() + wxS(".") + m_name;
         return m_name;
 
     return m_parent->GetName() + wxS(".") + m_name;


@@ -642,12 +733,7 @@ wxPropertyGrid* wxPGProperty::GetGrid() const
 
 int wxPGProperty::Index( const wxPGProperty* p ) const
 {
 
 int wxPGProperty::Index( const wxPGProperty* p ) const
 {

-    for ( unsigned int i = 0; i<m_children.size(); i++ )
-    {
-        if ( p == m_children[i] )
-            return i;
-    }
-    return wxNOT_FOUND;
+    return wxPGFindInVector(m_children, p);

 }
 
 bool wxPGProperty::ValidateValue( wxVariant& WXUNUSED(value), wxPGValidationInfo& WXUNUSED(validationInfo) ) const
 }
 
 bool wxPGProperty::ValidateValue( wxVariant& WXUNUSED(value), wxPGValidationInfo& WXUNUSED(validationInfo) ) const


@@ -677,8 +763,17 @@ void wxPGProperty::GetDisplayInfo( unsigned int column,
 
     if ( !(flags & wxPGCellRenderer::ChoicePopup) )
     {
 
     if ( !(flags & wxPGCellRenderer::ChoicePopup) )
     {

-        // Not painting listi of choice popups, so get text from property
-        cell = &GetCell(column);
+        // Not painting list of choice popups, so get text from property
+        if ( column != 1 || !IsValueUnspecified() || IsCategory() )
+        {
+            cell = &GetCell(column);
+        }
+        else
+        {
+            // Use special unspecified value cell
+            cell = &GetGrid()->GetUnspecifiedValueAppearance();
+        }
+

         if ( cell->HasText() )
         {
             *pString = cell->GetText();
         if ( cell->HasText() )
         {
             *pString = cell->GetText();


@@ -832,7 +927,7 @@ void wxPGProperty::DoGenerateComposedValue( wxString& text,
             (*childResults)[curChild->GetName()] = s;
 
         bool skip = false;
             (*childResults)[curChild->GetName()] = s;
 
         bool skip = false;

-        if ( (argFlags & wxPG_UNEDITABLE_COMPOSITE_FRAGMENT) && !s.length() )
+        if ( (argFlags & wxPG_UNEDITABLE_COMPOSITE_FRAGMENT) && s.empty() )

             skip = true;
 
         if ( !curChild->GetChildCount() || skip )
             skip = true;
 
         if ( !curChild->GetChildCount() || skip )


@@ -899,8 +994,10 @@ wxString wxPGProperty::GetValueAsString( int argFlags ) const
     }
 #endif
 
     }
 #endif
 

+    wxPropertyGrid* pg = GetGrid();
+

     if ( IsValueUnspecified() )
     if ( IsValueUnspecified() )

-        return wxEmptyString;
+        return pg->GetUnspecifiedValueText(argFlags);

 
     if ( m_commonValue == -1 )
     {
 
     if ( m_commonValue == -1 )
     {


@@ -910,7 +1007,6 @@ wxString wxPGProperty::GetValueAsString( int argFlags ) const
 
     //
     // Return common value's string representation
 
     //
     // Return common value's string representation

-    wxPropertyGrid* pg = GetGrid();

     const wxPGCommonValue* cv = pg->GetCommonValue(m_commonValue);
 
     if ( argFlags & wxPG_FULL_VALUE )
     const wxPGCommonValue* cv = pg->GetCommonValue(m_commonValue);
 
     if ( argFlags & wxPG_FULL_VALUE )


@@ -939,7 +1035,7 @@ bool wxPGProperty::IntToValue( wxVariant& variant, int number, int WXUNUSED(argF
 }
 
 // Convert semicolon delimited tokens into child values.
 }
 
 // Convert semicolon delimited tokens into child values.

-bool wxPGProperty::StringToValue( wxVariant& variant, const wxString& text, int argFlags ) const
+bool wxPGProperty::StringToValue( wxVariant& v, const wxString& text, int argFlags ) const

 {
     if ( !GetChildCount() )
         return false;
 {
     if ( !GetChildCount() )
         return false;


@@ -1007,7 +1103,8 @@ bool wxPGProperty::StringToValue( wxVariant& variant, const wxString& text, int
 
                     // Add only if editable or setting programmatically
                     if ( (argFlags & wxPG_PROGRAMMATIC_VALUE) ||
 
                     // Add only if editable or setting programmatically
                     if ( (argFlags & wxPG_PROGRAMMATIC_VALUE) ||

-                         !child->HasFlag(wxPG_PROP_DISABLED|wxPG_PROP_READONLY) )
+                         (!child->HasFlag(wxPG_PROP_DISABLED) &&
+                          !child->HasFlag(wxPG_PROP_READONLY)) )

                     {
                         if ( len > 0 )
                         {
                     {
                         if ( len > 0 )
                         {


@@ -1078,7 +1175,7 @@ bool wxPGProperty::StringToValue( wxVariant& variant, const wxString& text, int
 
                     token = text.substr(startPos,pos-startPos-1);
 
 
                     token = text.substr(startPos,pos-startPos-1);
 

-                    if ( !token.length() )
+                    if ( token.empty() )

                         break;
 
                     const wxPGProperty* child = Item(curChild);
                         break;
 
                     const wxPGProperty* child = Item(curChild);


@@ -1087,7 +1184,8 @@ bool wxPGProperty::StringToValue( wxVariant& variant, const wxString& text, int
                     wxVariant variant(oldChildValue);
 
                     if ( (argFlags & wxPG_PROGRAMMATIC_VALUE) ||
                     wxVariant variant(oldChildValue);
 
                     if ( (argFlags & wxPG_PROGRAMMATIC_VALUE) ||

-                         !child->HasFlag(wxPG_PROP_DISABLED|wxPG_PROP_READONLY) )
+                         (!child->HasFlag(wxPG_PROP_DISABLED) &&
+                          !child->HasFlag(wxPG_PROP_READONLY)) )

                     {
                         wxString childName = child->GetBaseName();
 
                     {
                         wxString childName = child->GetBaseName();
 


@@ -1142,7 +1240,7 @@ bool wxPGProperty::StringToValue( wxVariant& variant, const wxString& text, int
     }
 
     if ( changed )
     }
 
     if ( changed )

-        variant = list;
+        v = list;

 
     return changed;
 }
 
     return changed;
 }


@@ -1200,7 +1298,7 @@ void wxPGProperty::OnCustomPaint( wxDC& dc,
 {
     wxBitmap* bmp = m_valueBitmap;
 
 {
     wxBitmap* bmp = m_valueBitmap;
 

-    wxCHECK_RET( bmp && bmp->Ok(), wxT("invalid bitmap") );
+    wxCHECK_RET( bmp && bmp->IsOk(), wxT("invalid bitmap") );

 
     wxCHECK_RET( rect.x >= 0, wxT("unexpected measure call") );
 
 
     wxCHECK_RET( rect.x >= 0, wxT("unexpected measure call") );
 


@@ -1302,6 +1400,12 @@ void wxPGProperty::SetValue( wxVariant value, wxVariant* pList, int flags )
                 }
                 i++;
             }
                 }
                 i++;
             }

+
+            // Always call OnSetValue() for a parent property (do not call it
+            // here if the value is non-null because it will then be called
+            // below)
+            if ( value.IsNull() )
+                OnSetValue();

         }
 
         if ( !value.IsNull() )
         }
 
         if ( !value.IsNull() )


@@ -1341,16 +1445,23 @@ void wxPGProperty::SetValue( wxVariant value, wxVariant* pList, int flags )
         UpdateParentValues();
 
     //
         UpdateParentValues();
 
     //

-    // Update editor control
-    //
-
-    // We need to check for these, otherwise GetGrid() may fail.
+    // Update editor control.

     if ( flags & wxPG_SETVAL_REFRESH_EDITOR )
     {
     if ( flags & wxPG_SETVAL_REFRESH_EDITOR )
     {

-        RefreshEditor();

         wxPropertyGrid* pg = GetGridIfDisplayed();
         if ( pg )
         wxPropertyGrid* pg = GetGridIfDisplayed();
         if ( pg )

+        {
+            wxPGProperty* selected = pg->GetSelectedProperty();
+
+            // Only refresh the control if this was selected, or
+            // this was some parent of selected, or vice versa)
+            if ( selected && (selected == this ||
+                              selected->IsSomeParent(this) ||
+                              this->IsSomeParent(selected)) )
+                RefreshEditor();
+

             pg->DrawItemAndValueRelated(this);
             pg->DrawItemAndValueRelated(this);

+        }

     }
 }
 
     }
 }
 


@@ -1360,7 +1471,7 @@ void wxPGProperty::SetValueInEvent( wxVariant value ) const
     GetGrid()->ValueChangeInEvent(value);
 }
 
     GetGrid()->ValueChangeInEvent(value);
 }
 

-void wxPGProperty::SetFlagRecursively( FlagType flag, bool set )
+void wxPGProperty::SetFlagRecursively( wxPGPropertyFlags flag, bool set )

 {
     ChangeFlag(flag, set);
 
 {
     ChangeFlag(flag, set);
 


@@ -1422,6 +1533,31 @@ wxVariant wxPGProperty::GetDefaultValue() const
     return wxVariant();
 }
 
     return wxVariant();
 }
 

+void wxPGProperty::Enable( bool enable )
+{
+    wxPropertyGrid* pg = GetGrid();
+
+    // Preferably call the version in the owning wxPropertyGrid,
+    // since it handles the editor de-activation.
+    if ( pg )
+        pg->EnableProperty(this, enable);
+    else
+        DoEnable(enable);
+}
+
+void wxPGProperty::DoEnable( bool enable )
+{
+    if ( enable )
+        ClearFlag(wxPG_PROP_DISABLED);
+    else
+        SetFlag(wxPG_PROP_DISABLED);
+
+    // Apply same to sub-properties as well
+    unsigned int i;
+    for ( i = 0; i < GetChildCount(); i++ )
+        Item(i)->DoEnable( enable );
+}
+

 void wxPGProperty::EnsureCells( unsigned int column )
 {
     if ( column >= m_cells.size() )
 void wxPGProperty::EnsureCells( unsigned int column )
 {
     if ( column >= m_cells.size() )


@@ -1430,14 +1566,17 @@ void wxPGProperty::EnsureCells( unsigned int column )
         wxPropertyGrid* pg = GetGrid();
         wxPGCell defaultCell;
 
         wxPropertyGrid* pg = GetGrid();
         wxPGCell defaultCell;
 

-        // Work around possible VC6 bug by using intermediate variables
-        const wxPGCell& propDefCell = pg->GetPropertyDefaultCell();
-        const wxPGCell& catDefCell = pg->GetCategoryDefaultCell();
+        if ( pg )
+        {
+            // Work around possible VC6 bug by using intermediate variables
+            const wxPGCell& propDefCell = pg->GetPropertyDefaultCell();
+            const wxPGCell& catDefCell = pg->GetCategoryDefaultCell();

 
 

-        if ( !HasFlag(wxPG_PROP_CATEGORY) )
-            defaultCell = propDefCell;
-        else
-            defaultCell = catDefCell;
+            if ( !HasFlag(wxPG_PROP_CATEGORY) )
+                defaultCell = propDefCell;
+            else
+                defaultCell = catDefCell;
+        }

 
         // TODO: Replace with resize() call
         unsigned int cellCountMax = column+1;
 
         // TODO: Replace with resize() call
         unsigned int cellCountMax = column+1;


@@ -1522,9 +1661,10 @@ wxPGCell& wxPGProperty::GetOrCreateCell( unsigned int column )
 }
 
 void wxPGProperty::SetBackgroundColour( const wxColour& colour,
 }
 
 void wxPGProperty::SetBackgroundColour( const wxColour& colour,

-                                        bool recursively )
+                                        int flags )

 {
     wxPGProperty* firstProp = this;
 {
     wxPGProperty* firstProp = this;

+    bool recursively = flags & wxPG_RECURSE ? true : false;

 
     //
     // If category is tried to set recursively, skip it and only
 
     //
     // If category is tried to set recursively, skip it and only


@@ -1557,9 +1697,10 @@ void wxPGProperty::SetBackgroundColour( const wxColour& colour,
 }
 
 void wxPGProperty::SetTextColour( const wxColour& colour,
 }
 
 void wxPGProperty::SetTextColour( const wxColour& colour,

-                                  bool recursively )
+                                  int flags )

 {
     wxPGProperty* firstProp = this;
 {
     wxPGProperty* firstProp = this;

+    bool recursively = flags & wxPG_RECURSE ? true : false;

 
     //
     // If category is tried to set recursively, skip it and only
 
     //
     // If category is tried to set recursively, skip it and only


@@ -1680,7 +1821,7 @@ wxVariant wxPGProperty::GetAttributesAsList() const
 // Slots of utility flags are NULL
 const unsigned int gs_propFlagToStringSize = 14;
 
 // Slots of utility flags are NULL
 const unsigned int gs_propFlagToStringSize = 14;
 

-static const wxChar* gs_propFlagToString[gs_propFlagToStringSize] = {
+static const wxChar* const gs_propFlagToString[gs_propFlagToStringSize] = {

     NULL,
     wxT("DISABLED"),
     wxT("HIDDEN"),
     NULL,
     wxT("DISABLED"),
     wxT("HIDDEN"),


@@ -1710,7 +1851,7 @@ wxString wxPGProperty::GetFlagsAsString( FlagType flagsMask ) const
         {
             const wxChar* fs = gs_propFlagToString[i];
             wxASSERT(fs);
         {
             const wxChar* fs = gs_propFlagToString[i];
             wxASSERT(fs);

-            if ( s.length() )
+            if ( !s.empty() )

                 s << wxS("|");
             s << fs;
         }
                 s << wxS("|");
             s << fs;
         }


@@ -1840,8 +1981,14 @@ void wxPGProperty::SetChoiceSelection( int newValue )
     }
 }
 
     }
 }
 

-bool wxPGProperty::SetChoices( wxPGChoices& choices )
+bool wxPGProperty::SetChoices( const wxPGChoices& choices )

 {
 {

+    // Property must be de-selected first (otherwise choices in
+    // the control would be de-synced with true choices)
+    wxPropertyGrid* pg = GetGrid();
+    if ( pg && pg->GetSelection() == this )
+        pg->ClearSelection();
+

     m_choices.Assign(choices);
 
     {
     m_choices.Assign(choices);
 
     {


@@ -1874,17 +2021,43 @@ const wxPGEditor* wxPGProperty::GetEditorClass() const
     if ( GetDisplayedCommonValueCount() )
     {
         // TextCtrlAndButton -> ComboBoxAndButton
     if ( GetDisplayedCommonValueCount() )
     {
         // TextCtrlAndButton -> ComboBoxAndButton

-        if ( editor->IsKindOf(CLASSINFO(wxPGTextCtrlAndButtonEditor)) )
+        if ( wxDynamicCast(editor, wxPGTextCtrlAndButtonEditor) )

             editor = wxPGEditor_ChoiceAndButton;
 
         // TextCtrl -> ComboBox
             editor = wxPGEditor_ChoiceAndButton;
 
         // TextCtrl -> ComboBox

-        else if ( editor->IsKindOf(CLASSINFO(wxPGTextCtrlEditor)) )
+        else if ( wxDynamicCast(editor, wxPGTextCtrlEditor) )

             editor = wxPGEditor_ComboBox;
     }
 
     return editor;
 }
 
             editor = wxPGEditor_ComboBox;
     }
 
     return editor;
 }
 

+bool wxPGProperty::Hide( bool hide, int flags )
+{
+    wxPropertyGrid* pg = GetGrid();
+    if ( pg )
+        return pg->HideProperty(this, hide, flags);
+
+    return DoHide( hide, flags );
+}
+
+bool wxPGProperty::DoHide( bool hide, int flags )
+{
+    if ( !hide )
+        ClearFlag( wxPG_PROP_HIDDEN );
+    else
+        SetFlag( wxPG_PROP_HIDDEN );
+
+    if ( flags & wxPG_RECURSE )
+    {
+        unsigned int i;
+        for ( i = 0; i < GetChildCount(); i++ )
+            Item(i)->DoHide(hide, flags | wxPG_RECURSE_STARTS);
+    }
+
+    return true;
+}
+

 bool wxPGProperty::HasVisibleChildren() const
 {
     unsigned int i;
 bool wxPGProperty::HasVisibleChildren() const
 {
     unsigned int i;


@@ -1919,7 +2092,7 @@ void wxPGProperty::SetValueImage( wxBitmap& bmp )
 {
     delete m_valueBitmap;
 
 {
     delete m_valueBitmap;
 

-    if ( &bmp && bmp.Ok() )
+    if ( &bmp && bmp.IsOk() )

     {
         // Resize the image
         wxSize maxSz = GetGrid()->GetImageSize();
     {
         // Resize the image
         wxSize maxSz = GetGrid()->GetImageSize();


@@ -1927,19 +2100,23 @@ void wxPGProperty::SetValueImage( wxBitmap& bmp )
 
         if ( imSz.y != maxSz.y )
         {
 
         if ( imSz.y != maxSz.y )
         {

-            // Create a memory DC
+        #if wxUSE_IMAGE
+            // Here we use high-quality wxImage scaling functions available
+            wxImage img = bmp.ConvertToImage();
+            double scaleY = (double)maxSz.y / (double)imSz.y;
+            img.Rescale(wxRound(bmp.GetWidth()*scaleY),
+                        wxRound(bmp.GetHeight()*scaleY),
+                        wxIMAGE_QUALITY_HIGH);
+            wxBitmap* bmpNew = new wxBitmap(img, 32);
+        #else
+            // This is the old, deprecated method of scaling the image

             wxBitmap* bmpNew = new wxBitmap(maxSz.x,maxSz.y,bmp.GetDepth());
             wxBitmap* bmpNew = new wxBitmap(maxSz.x,maxSz.y,bmp.GetDepth());

-

             wxMemoryDC dc;
             dc.SelectObject(*bmpNew);
             wxMemoryDC dc;
             dc.SelectObject(*bmpNew);

-
-            // Scale
-            // FIXME: This is ugly - use image or wait for scaling patch.

             double scaleY = (double)maxSz.y / (double)imSz.y;
             double scaleY = (double)maxSz.y / (double)imSz.y;

-

             dc.SetUserScale(scaleY, scaleY);
             dc.SetUserScale(scaleY, scaleY);

-

             dc.DrawBitmap(bmp, 0, 0);
             dc.DrawBitmap(bmp, 0, 0);

+        #endif

 
             m_valueBitmap = bmpNew;
         }
 
             m_valueBitmap = bmpNew;
         }


@@ -2156,9 +2333,9 @@ void wxPGProperty::AdaptListToValue( wxVariant& list, wxVariant* value ) const
     else
         allChildrenSpecified = true;
 
     else
         allChildrenSpecified = true;
 

-    wxVariant childValue = list[0];

     unsigned int i;
     unsigned int n = 0;
     unsigned int i;
     unsigned int n = 0;

+    wxVariant childValue = list[n];

 
     //wxLogDebug(wxT(">> %s.AdaptListToValue()"),GetBaseName().c_str());
 
 
     //wxLogDebug(wxT(">> %s.AdaptListToValue()"),GetBaseName().c_str());
 


@@ -2380,11 +2557,36 @@ void wxPGProperty::DeleteChildren()
 {
     wxPropertyGridPageState* state = m_parentState;
 
 {
     wxPropertyGridPageState* state = m_parentState;
 

-    while ( GetChildCount() )
+    if ( !GetChildCount() )
+        return;
+
+    // Because deletion is sometimes deferred, we have to use
+    // this sort of code for enumerating the child properties.
+    unsigned int i = GetChildCount();
+    while ( i > 0 )

     {
     {

-        wxPGProperty* child = Item(GetChildCount()-1);
-        state->DoDelete(child, true);
+        i--;
+        state->DoDelete(Item(i), true);
+    }
+}
+
+bool wxPGProperty::IsChildSelected( bool recursive ) const
+{
+    size_t i;
+    for ( i = 0; i < GetChildCount(); i++ )
+    {
+        wxPGProperty* child = Item(i);
+
+        // Test child
+        if ( m_parentState->DoIsPropertySelected( child ) )
+            return true;
+
+        // Test sub-childs
+        if ( recursive && child->IsChildSelected( recursive ) )
+            return true;

     }
     }

+
+    return false;

 }
 
 wxVariant wxPGProperty::ChildChanged( wxVariant& WXUNUSED(thisValue),
 }
 
 wxVariant wxPGProperty::ChildChanged( wxVariant& WXUNUSED(thisValue),


@@ -2574,9 +2776,31 @@ wxPropertyCategory::~wxPropertyCategory()
 wxString wxPropertyCategory::ValueToString( wxVariant& WXUNUSED(value),
                                             int WXUNUSED(argFlags) ) const
 {
 wxString wxPropertyCategory::ValueToString( wxVariant& WXUNUSED(value),
                                             int WXUNUSED(argFlags) ) const
 {

+    if ( m_value.GetType() == wxPG_VARIANT_TYPE_STRING )
+        return m_value.GetString();

     return wxEmptyString;
 }
 
     return wxEmptyString;
 }
 

+wxString wxPropertyCategory::GetValueAsString( int argFlags ) const
+{
+#if wxPG_COMPATIBILITY_1_4
+    // This is backwards compatibility test
+    // That is, to make sure this function is not overridden
+    // (instead, ValueToString() should be).
+    if ( argFlags == 0xFFFF )
+    {
+        // Do not override! (for backwards compliancy)
+        return g_invalidStringContent;
+    }
+#endif
+
+    // Unspecified value is always empty string
+    if ( IsValueUnspecified() )
+        return wxEmptyString;
+
+    return wxPGProperty::GetValueAsString(argFlags);
+}
+

 int wxPropertyCategory::GetTextExtent( const wxWindow* wnd, const wxFont& font ) const
 {
     if ( m_textExtent > 0 )
 int wxPropertyCategory::GetTextExtent( const wxWindow* wnd, const wxFont& font ) const
 {
     if ( m_textExtent > 0 )


@@ -2657,12 +2881,12 @@ wxPGChoiceEntry& wxPGChoices::AddAsSorted( const wxString& label, int value )
 
 // -----------------------------------------------------------------------
 
 
 // -----------------------------------------------------------------------
 

-void wxPGChoices::Add( const wxChar** labels, const ValArrItem* values )
+void wxPGChoices::Add( const wxChar* const* labels, const ValArrItem* values )

 {
     AllocExclusive();
 
     unsigned int itemcount = 0;
 {
     AllocExclusive();
 
     unsigned int itemcount = 0;

-    const wxChar** p = &labels[0];
+    const wxChar* const* p = &labels[0];

     while ( *p ) { p++; itemcount++; }
 
     unsigned int i;
     while ( *p ) { p++; itemcount++; }
 
     unsigned int i;