Correct bug in the wxSpinCtrlGeneric sub-controls resizing.

[wxWidgets.git] / src / common / object.cpp

diff --git a/src/common/object.cpp b/src/common/object.cpp
index 57825a52c5d3ee07d0121e443a7afa5dd3eec21b..05d4dd13b7cce1b64cf199e94a6a44ba27b6d0e1 100644 (file)
--- a/src/common/object.cpp
+++ b/src/common/object.cpp
@@ -55,10 +55,10 @@ const wxClassInfo* wxObject::ms_classParents[] = { NULL } ;
             (wxObjectConstructorFn) 0   ,
             NULL,NULL,0 , 0 ,
             0 , wxVariantOfPtrToObjectConverterwxObject , wxVariantToObjectConverterwxObject , wxObjectToVariantConverterwxObject);
             (wxObjectConstructorFn) 0   ,
             NULL,NULL,0 , 0 ,
             0 , wxVariantOfPtrToObjectConverterwxObject , wxVariantToObjectConverterwxObject , wxObjectToVariantConverterwxObject);

- template<> void wxStringReadValue(const wxString & , wxObject * & ){assert(0) ;}
- 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<> void wxStringReadValue(const wxString & , wxObject * & ){ wxFAIL_MSG("unreachable"); }
+ template<> void wxStringWriteValue(wxString & , wxObject* const & ){ wxFAIL_MSG("unreachable"); }
+ template<> void wxStringReadValue(const wxString & , wxObject & ){ wxFAIL_MSG("unreachable"); }
+ template<> void wxStringWriteValue(wxString & , wxObject const & ){ wxFAIL_MSG("unreachable"); }

  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
  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


@@ -283,8 +283,7 @@ void wxClassInfo::Unregister()
         sm_classTable->Delete(m_className);
         if ( sm_classTable->GetCount() == 0 )
         {
         sm_classTable->Delete(m_className);
         if ( sm_classTable->GetCount() == 0 )
         {

-            delete sm_classTable;
-            sm_classTable = NULL;
+            wxDELETE(sm_classTable);

         }
     }
 }
         }
     }
 }