diff -ur wxPython-4.0.7.post2/sip/cpp/sip_corecmodule.cpp wxPython-4.0.7.post2.new/sip/cpp/sip_corecmodule.cpp

--- wxPython-4.0.7.post2/sip/cpp/sip_corecmodule.cpp	2019-11-12 03:40:14.000000000 +0000

+++ wxPython-4.0.7.post2.new/sip/cpp/sip_corecmodule.cpp	2020-03-29 15:35:39.132185825 +0000

@@ -7272,7 +7272,7 @@

     if (pos != wxNOT_FOUND)

         name = name.Mid(pos + nsDelimiter.Len());

-    const sipTypeDef* td = sipFindType(name);

+    const sipTypeDef* td = sipFindType(name.c_str());

     if (!td)

         return NULL;

     PyObject* transferObj = setThisOwn ? Py_None : NULL;

@@ -7290,7 +7290,7 @@

 // Check if a PyObject is a specific wrapped class or subclass

 static bool i_wxPyWrappedPtr_TypeCheck(PyObject* obj, const wxString& className)

 {

-    const sipTypeDef* td = sipFindType(className);

+    const sipTypeDef* td = sipFindType(className.c_str());

     if (!td)

         return false;

     return sipCanConvertToType(obj, td, SIP_NO_CONVERTORS);

@@ -7300,7 +7300,7 @@

 // Convert a wrapped SIP object to its C++ pointer, ensuring that it is of the expected type

 static bool i_wxPyConvertWrappedPtr(PyObject* obj, void **ptr, const wxString& className)

 {

-    const sipTypeDef* td = sipFindType(className);

+    const sipTypeDef* td = sipFindType(className.c_str());

     if (!td)

         return false;

     if (! sipCanConvertToType(obj, td, SIP_NO_CONVERTORS))

@@ -15369,14 +15369,14 @@

             const wxClassInfo* info   = sipCpp->GetClassInfo();

             wxString           name   = info->GetClassName();

-            bool               exists = sipFindType(name) != NULL;

+            bool               exists = sipFindType(name.c_str()) != NULL;

             while (info && !exists) {

                 info = info->GetBaseClass1();

                 name = info->GetClassName();

-                exists = sipFindType(name) != NULL;

+                exists = sipFindType(name.c_str()) != NULL;

             }

             if (info)

-                sipType = sipFindType(name);

+                sipType = sipFindType(name.c_str());

             else

                 sipType = NULL;

@@ -15393,14 +15393,14 @@

             const wxClassInfo* info   = sipCpp->GetClassInfo();

             wxString           name   = info->GetClassName();

-            bool               exists = sipFindType(name) != NULL;

+            bool               exists = sipFindType(name.c_str()) != NULL;

             while (info && !exists) {

                 info = info->GetBaseClass1();

                 name = info->GetClassName();

-                exists = sipFindType(name) != NULL;

+                exists = sipFindType(name.c_str()) != NULL;

             }

             if (info)

-                sipType = sipFindType(name);

+                sipType = sipFindType(name.c_str());

             else

                 sipType = NULL;

diff -ur wxPython-4.0.7.post2/sip/cpp/sip_corewxTextCtrl.cpp wxPython-4.0.7.post2.new/sip/cpp/sip_corewxTextCtrl.cpp

--- wxPython-4.0.7.post2/sip/cpp/sip_corewxTextCtrl.cpp	2019-11-12 03:40:14.000000000 +0000

+++ wxPython-4.0.7.post2.new/sip/cpp/sip_corewxTextCtrl.cpp	2020-03-29 15:34:43.505161149 +0000

@@ -57,12 +57,16 @@

     {

         #ifdef __WXMSW__

             return self->ShowNativeCaret(show);

+	#else

+	    return false;

         #endif

     }

     bool _wxTextCtrl_HideNativeCaret(wxTextCtrl* self)

     {

         #ifdef __WXMSW__

             return self->HideNativeCaret();

+	#else

+	    return false;

         #endif

     }

     void _wxTextCtrl_write(wxTextCtrl* self, const wxString* text)

diff -ur wxPython-4.0.7.post2/sip/cpp/sip_corewxUIActionSimulator.cpp wxPython-4.0.7.post2.new/sip/cpp/sip_corewxUIActionSimulator.cpp

--- wxPython-4.0.7.post2/sip/cpp/sip_corewxUIActionSimulator.cpp	2019-11-12 03:40:14.000000000 +0000

+++ wxPython-4.0.7.post2.new/sip/cpp/sip_corewxUIActionSimulator.cpp	2020-03-29 15:34:12.989147615 +0000

@@ -453,7 +453,7 @@

             PyErr_Clear();

             Py_BEGIN_ALLOW_THREADS

-            sipRes = sipCpp->Text(*text);

+            sipRes = sipCpp->Text(text->c_str());

             Py_END_ALLOW_THREADS

             sipReleaseType(const_cast< ::wxString *>(text),sipType_wxString,textState);

diff -ur wxPython-4.0.7.post2/sip/cpp/sip_corewxVariantList.cpp wxPython-4.0.7.post2.new/sip/cpp/sip_corewxVariantList.cpp

--- wxPython-4.0.7.post2/sip/cpp/sip_corewxVariantList.cpp	2019-11-12 03:40:14.000000000 +0000

+++ wxPython-4.0.7.post2.new/sip/cpp/sip_corewxVariantList.cpp	2020-03-29 15:32:43.965108130 +0000

@@ -84,7 +84,7 @@

             size_t idx = 0;

             PyObject* value = PyList_New(0);

             for (idx=0; idx < sipCpp->GetCount(); idx++) {

-                PyObject* item = wxVariant_out_helper(sipCpp->Item(idx));

+                PyObject* item = wxVariant_out_helper(sipCpp->Item(idx)->GetData());

                 PyList_Append(value, item);

             }

             return value;

diff -ur wxPython-4.0.7.post2/sip/cpp/sip_propgridwxPGVariantList.cpp wxPython-4.0.7.post2.new/sip/cpp/sip_propgridwxPGVariantList.cpp

--- wxPython-4.0.7.post2/sip/cpp/sip_propgridwxPGVariantList.cpp	2019-11-12 03:40:55.000000000 +0000

+++ wxPython-4.0.7.post2.new/sip/cpp/sip_propgridwxPGVariantList.cpp	2020-03-29 15:36:57.311220487 +0000

@@ -84,7 +84,7 @@

             size_t idx = 0;

             PyObject* value = PyList_New(0);

             for (idx=0; idx < sipCpp->GetCount(); idx++) {

-                PyObject* item = wxPGVariant_out_helper(sipCpp->Item(idx));

+                PyObject* item = wxPGVariant_out_helper(sipCpp->Item(idx)->GetData());

                 PyList_Append(value, item);

             }

             return value;