first stab at supporting custom renderers

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

diff --git a/src/propgrid/advprops.cpp b/src/propgrid/advprops.cpp
index 72e1fcfb14867262920d0a33e3827cb96383b03c..d0187762dee9fa644d69553028b3809847ed79a9 100644 (file)
--- a/src/propgrid/advprops.cpp
+++ b/src/propgrid/advprops.cpp
@@ -449,6 +449,7 @@ WX_PG_IMPLEMENT_INTERNAL_EDITOR_CLASS(DatePickerCtrl,
 
 wxPGDatePickerCtrlEditor::~wxPGDatePickerCtrlEditor()
 {
 
 wxPGDatePickerCtrlEditor::~wxPGDatePickerCtrlEditor()
 {

+    wxPG_EDITOR(DatePickerCtrl) = NULL;

 }
 
 wxPGWindowList wxPGDatePickerCtrlEditor::CreateControls( wxPropertyGrid* propgrid,
 }
 
 wxPGWindowList wxPGDatePickerCtrlEditor::CreateControls( wxPropertyGrid* propgrid,


@@ -633,7 +634,7 @@ wxFontProperty::wxFontProperty( const wxString& label, const wxString& name,
 
     wxString faceName = font.GetFaceName();
     // If font was not in there, add it now
 
     wxString faceName = font.GetFaceName();
     // If font was not in there, add it now

-    if ( faceName.length() &&
+    if ( !faceName.empty() &&

          wxPGGlobalVars->m_fontFamilyChoices->Index(faceName) == wxNOT_FOUND )
         wxPGGlobalVars->m_fontFamilyChoices->AddAsSorted(faceName);
 
          wxPGGlobalVars->m_fontFamilyChoices->Index(faceName) == wxNOT_FOUND )
         wxPGGlobalVars->m_fontFamilyChoices->AddAsSorted(faceName);
 


@@ -667,7 +668,7 @@ void wxFontProperty::OnSetValue()
     wxFont font;
     font << m_value;
 
     wxFont font;
     font << m_value;
 

-    if ( !font.Ok() )
+    if ( !font.IsOk() )

     {
         m_value << *wxNORMAL_FONT;
     }
     {
         m_value << *wxNORMAL_FONT;
     }


@@ -796,7 +797,7 @@ void wxFontProperty::OnCustomPaint(wxDC& dc,
     else
         drawFace = m_value_wxFont.GetFaceName();
 
     else
         drawFace = m_value_wxFont.GetFaceName();
 

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

     {
         // Draw the background
         dc.SetBrush( wxColour(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE)) );
     {
         // Draw the background
         dc.SetBrush( wxColour(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE)) );


@@ -905,7 +906,7 @@ void wxSystemColourProperty::Init( int type, const wxColour& colour )
 {
     wxColourPropertyValue cpv;
 
 {
     wxColourPropertyValue cpv;
 

-    if ( colour.Ok() )
+    if ( colour.IsOk() )

         cpv.Init( type, colour );
     else
         cpv.Init( type, *wxWHITE );
         cpv.Init( type, colour );
     else
         cpv.Init( type, *wxWHITE );


@@ -1096,7 +1097,7 @@ void wxSystemColourProperty::OnSetValue()
         cpv << m_value;
         wxColour col = cpv.m_colour;
 
         cpv << m_value;
         wxColour col = cpv.m_colour;
 

-        if ( !col.Ok() )
+        if ( !col.IsOk() )

         {
             SetValueToUnspecified();
             SetIndex(wxNOT_FOUND);
         {
             SetValueToUnspecified();
             SetIndex(wxNOT_FOUND);


@@ -1119,7 +1120,7 @@ void wxSystemColourProperty::OnSetValue()
         wxColour col;
         col << m_value;
 
         wxColour col;
         col << m_value;
 

-        if ( !col.Ok() )
+        if ( !col.IsOk() )

         {
             SetValueToUnspecified();
             SetIndex(wxNOT_FOUND);
         {
             SetValueToUnspecified();
             SetIndex(wxNOT_FOUND);


@@ -1142,15 +1143,35 @@ wxColour wxSystemColourProperty::GetColour( int index ) const
     return wxSystemSettings::GetColour( (wxSystemColour)index );
 }
 
     return wxSystemSettings::GetColour( (wxSystemColour)index );
 }
 

-wxString wxSystemColourProperty::ColourToString( const wxColour& col, int index ) const
+wxString wxSystemColourProperty::ColourToString( const wxColour& col,
+                                                 int index,
+                                                 int argFlags ) const

 {
 {

+

     if ( index == wxNOT_FOUND )
     if ( index == wxNOT_FOUND )

-        return wxString::Format(wxT("(%i,%i,%i)"),
-                                (int)col.Red(),
-                                (int)col.Green(),
-                                (int)col.Blue());
+    {
+
+        if ( (argFlags & wxPG_FULL_VALUE) ||
+             GetAttributeAsLong(wxPG_COLOUR_HAS_ALPHA, 0) )
+        {
+            return wxString::Format(wxS("(%i,%i,%i,%i)"),
+                                    (int)col.Red(),
+                                    (int)col.Green(),
+                                    (int)col.Blue(),
+                                    (int)col.Alpha());
+        }
+        else
+        {
+            return wxString::Format(wxS("(%i,%i,%i)"),
+                                    (int)col.Red(),
+                                    (int)col.Green(),
+                                    (int)col.Blue());
+        }
+    }

     else
     else

+    {

         return m_choices.GetLabel(index);
         return m_choices.GetLabel(index);

+    }

 }
 
 wxString wxSystemColourProperty::ValueToString( wxVariant& value,
 }
 
 wxString wxSystemColourProperty::ValueToString( wxVariant& value,


@@ -1177,7 +1198,7 @@ wxString wxSystemColourProperty::ValueToString( wxVariant& value,
         index = m_choices.Index(val.m_type);
     }
 
         index = m_choices.Index(val.m_type);
     }
 

-    return ColourToString(val.m_colour, index);
+    return ColourToString(val.m_colour, index, argFlags);

 }
 
 
 }
 
 


@@ -1362,7 +1383,7 @@ void wxSystemColourProperty::OnCustomPaint( wxDC& dc, const wxRect& rect,
         col = GetVal().m_colour;
     }
 
         col = GetVal().m_colour;
     }
 

-    if ( col.Ok() )
+    if ( col.IsOk() )

     {
         dc.SetBrush(col);
         dc.DrawRectangle(rect);
     {
         dc.SetBrush(col);
         dc.DrawRectangle(rect);


@@ -1372,37 +1393,47 @@ void wxSystemColourProperty::OnCustomPaint( wxDC& dc, const wxRect& rect,
 
 bool wxSystemColourProperty::StringToValue( wxVariant& value, const wxString& text, int argFlags ) const
 {
 
 bool wxSystemColourProperty::StringToValue( wxVariant& value, const wxString& text, int argFlags ) const
 {

-    //
-    // Accept colour format "[Name] [(R,G,B)]"
-    // Name takes precedence.
-    //
-    wxString colourName;
-    wxString colourRGB;
+    wxString custColName(m_choices.GetLabel(GetCustomColourIndex()));
+    wxString colStr(text);
+    colStr.Trim(true);
+    colStr.Trim(false);

 
 

-    int ppos = text.Find(wxT("("));
+    wxColour customColour;
+    bool conversionSuccess = false;

 
 

-    if ( ppos == wxNOT_FOUND )
-    {
-        colourName = text;
-    }
-    else
+    if ( colStr != custColName )

     {
     {

-        colourName = text.substr(0, ppos);
-        colourRGB = text.substr(ppos, text.length()-ppos);
-    }
+        if ( colStr.Find(wxS("(")) == 0 )
+        {
+            // Eliminate whitespace
+            colStr.Replace(wxS(" "), wxEmptyString);

 
 

-    // Strip spaces from extremities
-    colourName.Trim(true);
-    colourName.Trim(false);
-    colourRGB.Trim(true);
+            int commaCount = colStr.Freq(wxS(','));
+            if ( commaCount == 2 )
+            {
+                // Convert (R,G,B) to rgb(R,G,B)
+                colStr = wxS("rgb") + colStr;
+            }
+            else if ( commaCount == 3 )
+            {
+                // We have int alpha, CSS format that wxColour takes as
+                // input processes float alpha. So, let's parse the colour
+                // ourselves instead of trying to convert it to a format
+                // that wxColour::FromString() understands.
+                int r = -1, g = -1, b = -1, a = -1;
+                wxSscanf(colStr, wxS("(%i,%i,%i,%i)"), &r, &g, &b, &a);
+                customColour.Set(r, g, b, a);
+                conversionSuccess = customColour.IsOk();
+            }
+        }

 
 

-    // Validate colourRGB string - (1,1,1) is shortest allowed
-    if ( colourRGB.length() < 7 )
-        colourRGB.clear();
+        if ( !conversionSuccess )
+            conversionSuccess = customColour.Set(colStr);
+    }

 
 

-    if ( colourRGB.length() == 0 && m_choices.GetCount() &&
+    if ( !conversionSuccess && m_choices.GetCount() &&

          !(m_flags & wxPG_PROP_HIDE_CUSTOM_COLOUR) &&
          !(m_flags & wxPG_PROP_HIDE_CUSTOM_COLOUR) &&

-         colourName == m_choices.GetLabel(GetCustomColourIndex()) )
+         colStr == custColName )

     {
         if ( !(argFlags & wxPG_EDITABLE_VALUE ))
         {
     {
         if ( !(argFlags & wxPG_EDITABLE_VALUE ))
         {


@@ -1420,10 +1451,12 @@ bool wxSystemColourProperty::StringToValue( wxVariant& value, const wxString& te
 
         bool done = false;
 
 
         bool done = false;
 

-        if ( colourName.length() )
+        if ( !conversionSuccess )

         {
             // Try predefined colour first
         {
             // Try predefined colour first

-            bool res = wxEnumProperty::StringToValue(value, colourName, argFlags);
+            bool res = wxEnumProperty::StringToValue(value,
+                                                     colStr,
+                                                     argFlags);

             if ( res && GetIndex() >= 0 )
             {
                 val.m_type = GetIndex();
             if ( res && GetIndex() >= 0 )
             {
                 val.m_type = GetIndex();


@@ -1436,22 +1469,11 @@ bool wxSystemColourProperty::StringToValue( wxVariant& value, const wxString& te
                 done = true;
             }
         }
                 done = true;
             }
         }

-        if ( colourRGB.length() && !done )
+        else

         {
         {

-            // Then check custom colour.

             val.m_type = wxPG_COLOUR_CUSTOM;
             val.m_type = wxPG_COLOUR_CUSTOM;

-
-            int r = -1, g = -1, b = -1;
-            wxSscanf(colourRGB.c_str(),wxT("(%i,%i,%i)"),&r,&g,&b);
-
-            if ( r >= 0 && r <= 255 &&
-                 g >= 0 && g <= 255 &&
-                 b >= 0 && b <= 255 )
-            {
-                val.m_colour.Set(r,g,b);
-
-                done = true;
-            }
+            val.m_colour = customColour;
+            done = true;

         }
 
         if ( !done )
         }
 
         if ( !done )


@@ -1563,7 +1585,7 @@ wxColourProperty::~wxColourProperty()
 
 void wxColourProperty::Init( wxColour colour )
 {
 
 void wxColourProperty::Init( wxColour colour )
 {

-    if ( !colour.Ok() )
+    if ( !colour.IsOk() )

         colour = *wxWHITE;
     wxVariant variant;
     variant << colour;
         colour = *wxWHITE;
     wxVariant variant;
     variant << colour;


@@ -1760,7 +1782,7 @@ void wxCursorProperty::OnCustomPaint( wxDC&, const wxRect&, wxPGPaintData& ) { }
 const wxString& wxPGGetDefaultImageWildcard()
 {
     // Form the wildcard, if not done yet
 const wxString& wxPGGetDefaultImageWildcard()
 {
     // Form the wildcard, if not done yet

-    if ( !wxPGGlobalVars->m_pDefaultImageWildcard.length() )
+    if ( wxPGGlobalVars->m_pDefaultImageWildcard.empty() )

     {
 
         wxString str;
     {
 
         wxString str;


@@ -1842,7 +1864,7 @@ void wxImageFileProperty::OnCustomPaint( wxDC& dc,
                                          const wxRect& rect,
                                          wxPGPaintData& )
 {
                                          const wxRect& rect,
                                          wxPGPaintData& )
 {

-    if ( m_pBitmap || (m_pImage && m_pImage->Ok() ) )
+    if ( m_pBitmap || (m_pImage && m_pImage->IsOk() ) )

     {
         // Draw the thumbnail
 
     {
         // Draw the thumbnail
 


@@ -2157,7 +2179,7 @@ wxString wxDateProperty::ValueToString( wxVariant& value,
     if ( !dateTime.IsValid() )
         return wxT("Invalid");
 
     if ( !dateTime.IsValid() )
         return wxT("Invalid");
 

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

     {
 #if wxUSE_DATEPICKCTRL
         bool showCentury = m_dpStyle & wxDP_SHOWCENTURY ? true : false;
     {
 #if wxUSE_DATEPICKCTRL
         bool showCentury = m_dpStyle & wxDP_SHOWCENTURY ? true : false;


@@ -2167,7 +2189,7 @@ wxString wxDateProperty::ValueToString( wxVariant& value,
         ms_defaultDateFormat = DetermineDefaultDateFormat( showCentury );
     }
 
         ms_defaultDateFormat = DetermineDefaultDateFormat( showCentury );
     }
 

-    if ( m_format.length() &&
+    if ( !m_format.empty() &&

          !(argFlags & wxPG_FULL_VALUE) )
             format = m_format.c_str();
 
          !(argFlags & wxPG_FULL_VALUE) )
             format = m_format.c_str();