need to AdjustScrollbars() after changing the virtual size in CalcDimensions()

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

diff --git a/src/propgrid/advprops.cpp b/src/propgrid/advprops.cpp
index 45ea5fda779dcb85571968602aa66ed58152e430..82578fd24278bc6467d82aad001d013f115e2da9 100644 (file)
--- a/src/propgrid/advprops.cpp
+++ b/src/propgrid/advprops.cpp
@@ -60,6 +60,8 @@
     #include <wx/msw/dc.h>
 #endif
 
+#include <typeinfo>
+
 // -----------------------------------------------------------------------
 
 #if defined(__WXMSW__)
@@ -467,9 +469,9 @@ wxFontProperty::wxFontProperty( const wxString& label, const wxString& name,
 
     wxFont& font = wxFontFromVariant(m_value);
 
-    AddChild( new wxIntProperty( _("Point Size"),emptyString,(long)font.GetPointSize() ) );
+    AddChild( new wxIntProperty( _("Point Size"), wxS("Point Size"),(long)font.GetPointSize() ) );
 
-    AddChild( new wxEnumProperty(_("Family"), emptyString,
+    AddChild( new wxEnumProperty(_("Family"), wxS("PointSize"),
               gs_fp_es_family_labels,gs_fp_es_family_values,
               font.GetFamily()) );
 
@@ -479,20 +481,20 @@ wxFontProperty::wxFontProperty( const wxString& label, const wxString& name,
          wxPGGlobalVars->m_fontFamilyChoices->Index(faceName) == wxNOT_FOUND )
         wxPGGlobalVars->m_fontFamilyChoices->AddAsSorted(faceName);
 
-    wxPGProperty* p = new wxEnumProperty(_("Face Name"),emptyString,
+    wxPGProperty* p = new wxEnumProperty(_("Face Name"), wxS("Face Name"),
                                          *wxPGGlobalVars->m_fontFamilyChoices);
 
     p->SetValueFromString(faceName, wxPG_FULL_VALUE);
 
     AddChild( p );
 
-    AddChild( new wxEnumProperty(_("Style"),emptyString,
+    AddChild( new wxEnumProperty(_("Style"), wxS("Style"),
               gs_fp_es_style_labels,gs_fp_es_style_values,font.GetStyle()) );
 
-    AddChild( new wxEnumProperty(_("Weight"),emptyString,
+    AddChild( new wxEnumProperty(_("Weight"), wxS("Weight"),
               gs_fp_es_weight_labels,gs_fp_es_weight_values,font.GetWeight()) );
 
-    AddChild( new wxBoolProperty(_("Underlined"),emptyString,
+    AddChild( new wxBoolProperty(_("Underlined"), wxS("Underlined"),
               font.GetUnderlined()) );
 }