X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b0540bb8ba756e2df3479073d9f6d7c3373460c3..924fe7dabe68c324b6e5005bbe1c4119447867f3:/src/common/object.cpp

diff --git a/src/common/object.cpp b/src/common/object.cpp
index 44e8d36ef3..622569f308 100644
--- a/src/common/object.cpp
+++ b/src/common/object.cpp
@@ -10,7 +10,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "object.h"
 #endif
 
@@ -33,9 +33,6 @@
 #endif
 
 #if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT
-    // for wxObject::Dump
-    #include "wx/ioswrap.h"
-
     #if defined(__VISAGECPP__)
         #define DEBUG_PRINTF(NAME) { static int raz=0; \
             printf( #NAME " %i\n",raz); fflush(stdout); raz++; }
@@ -52,14 +49,14 @@
 #endif
 
 #if wxUSE_EXTENDED_RTTI
-const wxClassInfo* wxObject::sm_classParentswxObject[] = { NULL } ;
+const wxClassInfo* wxObject::ms_classParents[] = { NULL } ;
  wxObject* wxVariantToObjectConverterwxObject ( wxxVariant &data )
-{ return data.Get<wxObject*>() ; }
+{ return data.wxTEMPLATED_MEMBER_CALL(Get , wxObject*) ; }
  wxObject* wxVariantOfPtrToObjectConverterwxObject ( wxxVariant &data )
-{ return &data.Get<wxObject>() ; }
+{ return &data.wxTEMPLATED_MEMBER_CALL(Get , wxObject) ; }
  wxxVariant wxObjectToVariantConverterwxObject ( wxObject *data )
  { return wxxVariant( dynamic_cast<wxObject*> (data)  ) ; }
- wxClassInfo wxObject::sm_classwxObject(sm_classParentswxObject , wxT("") , wxT("wxObject"),
+ wxClassInfo wxObject::ms_classInfo(ms_classParents , wxT("") , wxT("wxObject"),
             (int) sizeof(wxObject),                              \
             (wxObjectConstructorFn) 0   ,
 			(wxPropertyInfo*) NULL,(wxHandlerInfo*) NULL,0 , 0 ,
@@ -68,12 +65,10 @@ const wxClassInfo* wxObject::sm_classParentswxObject[] = { NULL } ;
  template<> void wxStringWriteValue(wxString & , wxObject* const & ){assert(0) ;}
  template<> void wxStringReadValue(const wxString & , wxObject & ){assert(0) ;}
  template<> void wxStringWriteValue(wxString & , wxObject const & ){assert(0) ;}
- template<> const wxTypeInfo* wxGetTypeInfo( wxObject ** )
- { static wxClassTypeInfo s_typeInfo(wxT_OBJECT_PTR , &wxObject::sm_classwxObject) ; return &s_typeInfo ; }
- template<> const wxTypeInfo* wxGetTypeInfo( wxObject * )
- { static wxClassTypeInfo s_typeInfo(wxT_OBJECT , &wxObject::sm_classwxObject) ; return &s_typeInfo ; }
+ wxClassTypeInfo s_typeInfo(wxT_OBJECT_PTR , &wxObject::ms_classInfo , NULL , NULL , typeid(wxObject*).name() ) ; 
+ wxClassTypeInfo s_typeInfowxObject(wxT_OBJECT , &wxObject::ms_classInfo , NULL , NULL , typeid(wxObject).name() ) ; 
 #else
-wxClassInfo wxObject::sm_classwxObject( wxT("wxObject"), 0, 0,
+wxClassInfo wxObject::ms_classInfo( wxT("wxObject"), 0, 0,
                                         (int) sizeof(wxObject),
                                         (wxObjectConstructorFn) 0 );
 #endif
@@ -101,17 +96,6 @@ bool wxObject::IsKindOf(wxClassInfo *info) const
     return (thisInfo) ? thisInfo->IsKindOf(info) : FALSE ;
 }
 
-#if wxUSE_STD_IOSTREAM && (defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT)
-void wxObject::Dump(wxSTD ostream& str)
-{
-    if (GetClassInfo() && GetClassInfo()->GetClassName())
-        str << GetClassInfo()->GetClassName();
-    else
-        str << _T("unknown object class");
-}
-#endif
-
-
 #if defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING && defined( new )
 	#undef new
 #endif