diff --git a/src/propgrid/advprops.cpp b/src/propgrid/advprops.cpp
index e775001beb..5126534d4c 100644
--- a/src/propgrid/advprops.cpp
+++ b/src/propgrid/advprops.cpp
@@ -975,7 +975,8 @@ wxColourPropertyValue wxSystemColourProperty::GetVal( const wxVariant* pVariant
     if ( pVariant->IsNull() )
         return wxColourPropertyValue(wxPG_COLOUR_UNSPECIFIED, wxColour());
 
-    if ( pVariant->GetType() == wxS("wxColourPropertyValue") )
+    const wxString valType(pVariant->GetType());
+    if ( valType == wxS("wxColourPropertyValue") )
     {
         wxColourPropertyValue v;
         v << *pVariant;
@@ -985,16 +986,16 @@ wxColourPropertyValue wxSystemColourProperty::GetVal( const wxVariant* pVariant
     wxColour col;
     bool variantProcessed = true;
 
-    if ( pVariant->GetType() == wxS("wxColour*") )
+    if ( valType == wxS("wxColour*") )
     {
         wxColour* pCol = wxStaticCast(pVariant->GetWxObjectPtr(), wxColour);
         col = *pCol;
     }
-    else if ( pVariant->GetType() == wxS("wxColour") )
+    else if ( valType == wxS("wxColour") )
     {
         col << *pVariant;
     }
-    else if ( pVariant->GetType() == wxArrayInt_VariantType )
+    else if ( valType == wxArrayInt_VariantType )
     {
         // This code is mostly needed for wxPython bindings, which
         // may offer tuple of integers as colour value.
diff --git a/src/propgrid/props.cpp b/src/propgrid/props.cpp
index 518638572a..3f707f63d2 100644
--- a/src/propgrid/props.cpp
+++ b/src/propgrid/props.cpp
@@ -239,11 +239,12 @@ wxIntProperty::~wxIntProperty() { }
 wxString wxIntProperty::ValueToString( wxVariant& value,
                                        int WXUNUSED(argFlags) ) const
 {
-    if ( value.GetType() == wxPG_VARIANT_TYPE_LONG )
+    const wxString valType(value.GetType());
+    if ( valType == wxPG_VARIANT_TYPE_LONG )
     {
         return wxString::Format(wxS("%li"),value.GetLong());
     }
-    else if ( value.GetType() == wxPG_VARIANT_TYPE_LONGLONG )
+    else if ( valType == wxPG_VARIANT_TYPE_LONGLONG )
     {
         wxLongLong ll = value.GetLongLong();
         return ll.ToString();
@@ -283,7 +284,7 @@ bool wxIntProperty::StringToValue( wxVariant& variant, const wxString& text, int
 
         wxString useText = text.substr(firstNonZeroPos, text.length() - firstNonZeroPos);
 
-        wxString variantType = variant.GetType();
+        const wxString variantType(variant.GetType());
         bool isPrevLong = variantType == wxPG_VARIANT_TYPE_LONG;
 
         wxLongLong_t value64 = 0;
@@ -652,7 +653,7 @@ wxString wxUIntProperty::ValueToString( wxVariant& value,
 
 bool wxUIntProperty::StringToValue( wxVariant& variant, const wxString& text, int WXUNUSED(argFlags) ) const
 {
-    wxString variantType = variant.GetType();
+    const wxString variantType(variant.GetType());
     bool isPrevLong = variantType == wxPG_VARIANT_TYPE_LONG;
 
     if ( text.empty() )
@@ -1197,14 +1198,14 @@ wxEnumProperty::~wxEnumProperty ()
 
 void wxEnumProperty::OnSetValue()
 {
-    wxString variantType = m_value.GetType();
+    const wxString valType(m_value.GetType());
 
     int index = -1;
-    if ( variantType == wxPG_VARIANT_TYPE_LONG )
+    if ( valType == wxPG_VARIANT_TYPE_LONG )
     {
         ValueFromInt_(m_value, &index, m_value.GetLong(), wxPG_FULL_VALUE);
     }
-    else if ( variantType == wxPG_VARIANT_TYPE_STRING )
+    else if ( valType == wxPG_VARIANT_TYPE_STRING )
     {
         ValueFromString_(m_value, &index, m_value.GetString(), 0);
     }
@@ -1383,14 +1384,14 @@ wxEditEnumProperty::~wxEditEnumProperty()
 
 void wxEditEnumProperty::OnSetValue()
 {
-    wxString variantType = m_value.GetType();
+    const wxString valType(m_value.GetType());
 
     int index = -1;
-    if ( variantType == wxPG_VARIANT_TYPE_LONG )
+    if ( valType == wxPG_VARIANT_TYPE_LONG )
     {
         ValueFromInt_(m_value, &index, m_value.GetLong(), wxPG_FULL_VALUE);
     }
-    else if ( variantType == wxPG_VARIANT_TYPE_STRING )
+    else if ( valType == wxPG_VARIANT_TYPE_STRING )
     {
         wxString val = m_value.GetString();
         ValueFromString_(m_value, &index, val, 0);