No real changes, just minor cleanup in wxGTK wxDVC.

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

diff --git a/src/propgrid/property.cpp b/src/propgrid/property.cpp
index 7f2f5a66ed7785b76ef4e74dd5b437c84af29d66..5c789adc78596d73b081b058d88d608caec3675a 100644 (file)
--- a/src/propgrid/property.cpp
+++ b/src/propgrid/property.cpp
@@ -108,7 +108,7 @@ void wxPGCellRenderer::DrawEditorValue( wxDC& dc, const wxRect& rect,
 
     if ( editor )
     {
 
     if ( editor )
     {

-        wxRect rect2(rect); 
+        wxRect rect2(rect);

         rect2.x += xOffset;
         rect2.y += yOffset;
         rect2.height -= yOffset;
         rect2.x += xOffset;
         rect2.y += yOffset;
         rect2.height -= yOffset;


@@ -613,6 +613,15 @@ bool wxPGProperty::IsSomeParent( wxPGProperty* candidate ) const
     return false;
 }
 
     return false;
 }
 

+void wxPGProperty::SetName( const wxString& newName )
+{
+    wxPropertyGrid* pg = GetGrid();
+
+    if ( pg )
+        pg->SetPropertyName(this, newName);
+    else
+        DoSetName(newName);
+}

 
 wxString wxPGProperty::GetName() const
 {
 
 wxString wxPGProperty::GetName() const
 {


@@ -712,7 +721,7 @@ void wxPGProperty::GetDisplayInfo( unsigned int column,
 /*
 wxString wxPGProperty::GetColumnText( unsigned int col, int choiceIndex ) const
 {
 /*
 wxString wxPGProperty::GetColumnText( unsigned int col, int choiceIndex ) const
 {

-    
+

     if ( col != 1 || choiceIndex == wxNOT_FOUND )
     {
         const wxPGCell& cell = GetCell(col);
     if ( col != 1 || choiceIndex == wxNOT_FOUND )
     {
         const wxPGCell& cell = GetCell(col);


@@ -818,7 +827,7 @@ void wxPGProperty::DoGenerateComposedValue( wxString& text,
                                             argFlags|wxPG_COMPOSITE_FRAGMENT);
             }
         }
                                             argFlags|wxPG_COMPOSITE_FRAGMENT);
             }
         }

- 
+

         if ( childResults && curChild->GetChildCount() )
             (*childResults)[curChild->GetName()] = s;
 
         if ( childResults && curChild->GetChildCount() )
             (*childResults)[curChild->GetName()] = s;
 


@@ -1421,10 +1430,14 @@ 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 ( !HasFlag(wxPG_PROP_CATEGORY) )
         if ( !HasFlag(wxPG_PROP_CATEGORY) )

-            defaultCell = pg->GetPropertyDefaultCell();
+            defaultCell = propDefCell;

         else
         else

-            defaultCell = pg->GetCategoryDefaultCell();
+            defaultCell = catDefCell;

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


@@ -1502,7 +1515,7 @@ const wxPGCell& wxPGProperty::GetCell( unsigned int column ) const
     return pg->GetPropertyDefaultCell();
 }
 
     return pg->GetPropertyDefaultCell();
 }
 

-wxPGCell& wxPGProperty::GetCell( unsigned int column )
+wxPGCell& wxPGProperty::GetOrCreateCell( unsigned int column )

 {
     EnsureCells(column);
     return m_cells[column];
 {
     EnsureCells(column);
     return m_cells[column];


@@ -1634,18 +1647,20 @@ long wxPGProperty::GetAttributeAsLong( const wxString& name, long defVal ) const
 {
     wxVariant variant = m_attributes.FindValue(name);
 
 {
     wxVariant variant = m_attributes.FindValue(name);
 

-    return wxPGVariantToInt(variant, defVal);
+    if ( variant.IsNull() )
+        return defVal;
+
+    return variant.GetLong();

 }
 
 double wxPGProperty::GetAttributeAsDouble( const wxString& name, double defVal ) const
 {
 }
 
 double wxPGProperty::GetAttributeAsDouble( const wxString& name, double defVal ) const
 {

-    double retVal;

     wxVariant variant = m_attributes.FindValue(name);
 
     wxVariant variant = m_attributes.FindValue(name);
 

-    if ( wxPGVariantToDouble(variant, &retVal) )
-        return retVal;
+    if ( variant.IsNull() )
+        return defVal;

 
 

-    return defVal;
+    return variant.GetDouble();

 }
 
 wxVariant wxPGProperty::GetAttributesAsList() const
 }
 
 wxVariant wxPGProperty::GetAttributesAsList() const


@@ -2114,7 +2129,7 @@ void wxPGProperty::RemoveChild( wxPGProperty* p )
     {
         if ( *it == p )
         {
     {
         if ( *it == p )
         {

-            m_children.erase(it);
+            children.erase(it);

             break;
         }
     }
             break;
         }
     }


@@ -2329,9 +2344,13 @@ wxPGProperty* wxPGProperty::GetItemAtY( unsigned int y,
 
     /*
     if ( current )
 
     /*
     if ( current )

+    {

         wxLogDebug(wxT("%s::GetItemAtY(%i) -> %s"),this->GetLabel().c_str(),y,current->GetLabel().c_str());
         wxLogDebug(wxT("%s::GetItemAtY(%i) -> %s"),this->GetLabel().c_str(),y,current->GetLabel().c_str());

+    }

     else
     else

+    {

         wxLogDebug(wxT("%s::GetItemAtY(%i) -> NULL"),this->GetLabel().c_str(),y);
         wxLogDebug(wxT("%s::GetItemAtY(%i) -> NULL"),this->GetLabel().c_str(),y);

+    }

     */
 
     return (wxPGProperty*) result;
     */
 
     return (wxPGProperty*) result;


@@ -2563,14 +2582,14 @@ int wxPropertyCategory::GetTextExtent( const wxWindow* wnd, const wxFont& font )
     if ( m_textExtent > 0 )
         return m_textExtent;
     int x = 0, y = 0;
     if ( m_textExtent > 0 )
         return m_textExtent;
     int x = 0, y = 0;

-       ((wxWindow*)wnd)->GetTextExtent( m_label, &x, &y, 0, 0, &font );
+    ((wxWindow*)wnd)->GetTextExtent( m_label, &x, &y, 0, 0, &font );

     return x;
 }
 
 void wxPropertyCategory::CalculateTextExtent( wxWindow* wnd, const wxFont& font )
 {
     int x = 0, y = 0;
     return x;
 }
 
 void wxPropertyCategory::CalculateTextExtent( wxWindow* wnd, const wxFont& font )
 {
     int x = 0, y = 0;

-       wnd->GetTextExtent( m_label, &x, &y, 0, 0, &font );
+    wnd->GetTextExtent( m_label, &x, &y, 0, 0, &font );

     m_textExtent = x;
 }
 
     m_textExtent = x;
 }