use wxString, not wxChar*, in wxCreateDynamicObject() and wxClassInfo::FindClass()

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46256 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/object.h b/include/wx/object.h
index 0651b16acbc4d02455597b77369a7b41733c0f9e..a65117de24aac1e0ba109cccbb8b79c2988c6259 100644 (file)
--- a/include/wx/object.h
+++ b/include/wx/object.h
@@ -20,6 +20,7 @@
 #include "wx/memory.h"
 
 class WXDLLIMPEXP_BASE wxObject;
+class WXDLLIMPEXP_BASE wxString;
 
 #ifndef wxUSE_EXTENDED_RTTI
 #define wxUSE_EXTENDED_RTTI 0
@@ -80,7 +81,7 @@ typedef wxObject *(*wxObjectConstructorFn)(void);
 class WXDLLIMPEXP_BASE wxClassInfo
 {
     friend class WXDLLIMPEXP_BASE wxObject;
-    friend WXDLLIMPEXP_BASE wxObject *wxCreateDynamicObject(const wxChar *name);
+    friend WXDLLIMPEXP_BASE wxObject *wxCreateDynamicObject(const wxString& name);
 public:
     wxClassInfo( const wxChar *className,
                  const wxClassInfo *baseInfo1,
@@ -117,7 +118,7 @@ public:
         { return m_objectConstructor; }
     static const wxClassInfo  *GetFirst() { return sm_first; }
     const wxClassInfo         *GetNext() const { return m_next; }
-    static wxClassInfo        *FindClass(const wxChar *className);
+    static wxClassInfo        *FindClass(const wxString& className);
 
         // Climb upwards through inheritance hierarchy.
         // Dual inheritance is catered for.
@@ -157,7 +158,7 @@ protected:
     DECLARE_NO_COPY_CLASS(wxClassInfo)
 };
 
-WXDLLIMPEXP_BASE wxObject *wxCreateDynamicObject(const wxChar *name);
+WXDLLIMPEXP_BASE wxObject *wxCreateDynamicObject(const wxString& name);
 
 // ----------------------------------------------------------------------------
 // Dynamic class macros

diff --git a/include/wx/xti.h b/include/wx/xti.h
index 1d423fd1a7b017fefc02fb16fd04b98bf81f6fea..659f26c6d29b90185b4b285169887fdb52033ee4 100644 (file)
--- a/include/wx/xti.h
+++ b/include/wx/xti.h
@@ -1602,7 +1602,7 @@ class WXDLLIMPEXP_BASE wxClassInfo
 {
     friend class WXDLLIMPEXP_BASE wxPropertyInfo ;
     friend class WXDLLIMPEXP_BASE wxHandlerInfo ;
-    friend wxObject *wxCreateDynamicObject(const wxChar *name);
+    friend wxObject *wxCreateDynamicObject(const wxString& name);
 public:
     wxClassInfo(const wxClassInfo **_Parents,
         const wxChar *_UnitName,
@@ -1699,7 +1699,7 @@ public:
     wxObjectConstructorFn      GetConstructor() const { return m_objectConstructor; }
     static const wxClassInfo  *GetFirst() { return sm_first; }
     const wxClassInfo         *GetNext() const { return m_next; }
-    static wxClassInfo        *FindClass(const wxChar *className);
+    static wxClassInfo        *FindClass(const wxString& className);
 
     // Climb upwards through inheritance hierarchy.
     // Dual inheritance is catered for.
@@ -1830,7 +1830,7 @@ protected:
 };
 
 
-WXDLLIMPEXP_BASE wxObject *wxCreateDynamicObject(const wxChar *name);
+WXDLLIMPEXP_BASE wxObject *wxCreateDynamicObject(const wxString& name);
 
 // ----------------------------------------------------------------------------
 // wxDynamicObject

diff --git a/src/common/object.cpp b/src/common/object.cpp
index 6b4d7e2ae9ca6c4d59bbee88f74ee166aa2f0223..301b6325564299d6666d4b656aa47c5e9f72fc6a 100644 (file)
--- a/src/common/object.cpp
+++ b/src/common/object.cpp
@@ -187,7 +187,7 @@ wxClassInfo::~wxClassInfo()
     Unregister();
 }
 
-wxClassInfo *wxClassInfo::FindClass(const wxChar *className)
+wxClassInfo *wxClassInfo::FindClass(const wxString& className)
 {
     if ( sm_classTable )
     {
@@ -197,7 +197,7 @@ wxClassInfo *wxClassInfo::FindClass(const wxChar *className)
     {
         for ( wxClassInfo *info = sm_first; info ; info = info->m_next )
         {
-            if ( wxStrcmp(info->GetClassName(), className) == 0 )
+            if ( className == info->GetClassName() )
                 return info;
         }
 
@@ -263,7 +263,7 @@ void wxClassInfo::Unregister()
     }
 }
 
-wxObject *wxCreateDynamicObject(const wxChar *name)
+wxObject *wxCreateDynamicObject(const wxString& name)
 {
 #if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT
     DEBUG_PRINTF(wxObject *wxCreateDynamicObject)