diff --git a/include/wx/propgrid/propgridiface.h b/include/wx/propgrid/propgridiface.h
index 6413296d5e..485486e941 100644
--- a/include/wx/propgrid/propgridiface.h
+++ b/include/wx/propgrid/propgridiface.h
@@ -1218,13 +1218,29 @@ public:
     }
 
 #if wxUSE_LONGLONG
-    /** Sets value (wxLongLong&) of a property.
+#ifdef wxLongLong_t
+    /** Sets value (wxLongLong_t&) of a property.
     */
+    void SetPropertyValue(wxPGPropArg id, wxLongLong_t value)
+    {
+        wxVariant v = WXVARIANT(wxLongLong(value));
+        SetPropVal(id, v);
+    }
+#endif
     void SetPropertyValue( wxPGPropArg id, wxLongLong value )
     {
         wxVariant v = WXVARIANT(value);
         SetPropVal( id, v );
     }
+#ifdef wxULongLong_t
+    /** Sets value (wxULongLong_t&) of a property.
+    */
+    void SetPropertyValue(wxPGPropArg id, wxULongLong_t value)
+    {
+        wxVariant v = WXVARIANT(wxULongLong(value));
+        SetPropVal(id, v);
+    }
+#endif
     /** Sets value (wxULongLong&) of a property.
     */
     void SetPropertyValue( wxPGPropArg id, wxULongLong value )
diff --git a/src/propgrid/props.cpp b/src/propgrid/props.cpp
index b74619040b..9ccc8b0410 100644
--- a/src/propgrid/props.cpp
+++ b/src/propgrid/props.cpp
@@ -638,7 +638,7 @@ wxUIntProperty::wxUIntProperty( const wxString& label, const wxString& name,
     SetValue((long)value);
 }
 
-#if wxUSE_LONLONG
+#if wxUSE_LONGLONG
 wxUIntProperty::wxUIntProperty( const wxString& label, const wxString& name,
     const wxULongLong& value ) : wxPGProperty(label,name)
 {