Added wxMSW wxChoice::GetClassDefaultAttributes(), initially used in wxComboCtrl

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

diff --git a/src/propgrid/property.cpp b/src/propgrid/property.cpp
index 4f38e08d6bb5d6d7d877cda7bae3d2f482bd23eb..1e9f6100bd5995de7dcfafe2f02dd818ade96dc9 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;


@@ -149,6 +149,11 @@ 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();
     if ( bmp.Ok() &&
         // Do not draw oversized bitmap outside choice popup
     const wxBitmap& bmp = cell.GetBitmap();
     if ( bmp.Ok() &&
         // Do not draw oversized bitmap outside choice popup


@@ -165,6 +170,17 @@ 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
 // -----------------------------------------------------------------------


@@ -200,10 +216,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);


@@ -248,6 +264,10 @@ void wxPGDefaultRenderer::Render( wxDC& dc, const wxRect& rect,
             {
                 text = vInlineHelp.GetString();
                 dc.SetTextForeground(propertyGrid->GetCellDisabledTextColour());
             {
                 text = vInlineHelp.GetString();
                 dc.SetTextForeground(propertyGrid->GetCellDisabledTextColour());

+
+                // Must make the editor NULL to override it's own rendering
+                // code.
+                editor = NULL;

             }
         }
     }
             }
         }
     }


@@ -261,10 +281,10 @@ void wxPGDefaultRenderer::Render( wxDC& dc, const wxRect& rect,
     {
         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 +296,8 @@ void wxPGDefaultRenderer::Render( wxDC& dc, const wxRect& rect,
                                       propertyGrid->GetFontHeight()+(wxPG_CAPRECTYMARGIN*2) );
         }
     }
                                       propertyGrid->GetFontHeight()+(wxPG_CAPRECTYMARGIN*2) );
         }
     }

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

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


@@ -362,6 +384,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();


@@ -721,7 +750,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);


@@ -827,7 +856,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;
 


@@ -899,8 +928,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 +941,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 )


@@ -1341,16 +1371,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);

+        }

     }
 }
 
     }
 }
 


@@ -1430,10 +1467,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;


@@ -1511,16 +1552,17 @@ 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];
 }
 
 void wxPGProperty::SetBackgroundColour( const wxColour& colour,
 {
     EnsureCells(column);
     return m_cells[column];
 }
 
 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


@@ -1553,9 +1595,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


@@ -1676,7 +1719,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"),


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

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

             break;
         }
     }
             break;
         }
     }


@@ -2578,14 +2621,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;
 }
 


@@ -2653,12 +2696,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;