wxString::Right() changed to AfterLast() (config works again)

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

diff --git a/src/common/object.cpp b/src/common/object.cpp
index 52d95152bb2c1b2f67e6fb25d8555eac548f2206..4ac78acc233be0e6217f1061047159b6908a6375 100644 (file)
--- a/src/common/object.cpp
+++ b/src/common/object.cpp
@@ -21,23 +21,34 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-#include "wx/hash.h"
-#ifdef USE_SERIAL
-#include "wx/objstrm.h"
-#include "wx/serbase.h"
-#endif
-#endif
+    #include "wx/hash.h"
+    #if wxUSE_SERIAL
+        #include "wx/objstrm.h"
+        #include "wx/serbase.h"
+
+        // for error messages
+        #include "wx/log.h"
+        #include "wx/intl.h"
+    #endif // wxUSE_SERIAL
+#endif // WX_PRECOMP

 
 #include <string.h>
 #include <assert.h>
 
 
 #include <string.h>
 #include <assert.h>
 

-#if (WXDEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT
+#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT

 #include "wx/memory.h"
 #endif
 
 #include "wx/memory.h"
 #endif
 

-#if WXDEBUG || USE_DEBUG_CONTEXT
+#if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT

   // for wxObject::Dump
   // for wxObject::Dump

-  #include <iostream.h>
+#if wxUSE_IOSTREAMH
+#  include <iostream.h>
+#else
+#  include <iostream>
+#  ifdef _MSC_VER
+      using namespace std;
+#  endif
+#endif

 #endif
 
 #if !USE_SHARED_LIBRARY
 #endif
 
 #if !USE_SHARED_LIBRARY


@@ -53,7 +64,7 @@ wxHashTable* wxClassInfo::sm_classTable = (wxHashTable*) NULL;
 wxObject::wxObject(void)
 {
   m_refData = (wxObjectRefData *) NULL;
 wxObject::wxObject(void)
 {
   m_refData = (wxObjectRefData *) NULL;

-#ifdef USE_SERIAL
+#if wxUSE_SERIAL

   m_serialObj = (wxObject_Serialize *)NULL;
 #endif
 }
   m_serialObj = (wxObject_Serialize *)NULL;
 #endif
 }


@@ -61,7 +72,7 @@ wxObject::wxObject(void)
 wxObject::~wxObject(void)
 {
        UnRef();
 wxObject::~wxObject(void)
 {
        UnRef();

-#ifdef USE_SERIAL
+#if wxUSE_SERIAL

        if (m_serialObj)
          delete m_serialObj;
 #endif
        if (m_serialObj)
          delete m_serialObj;
 #endif


@@ -83,7 +94,7 @@ bool wxObject::IsKindOf(wxClassInfo *info) const
     return FALSE;
 }
 
     return FALSE;
 }
 

-#if WXDEBUG || USE_DEBUG_CONTEXT
+#if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT

 void wxObject::Dump(ostream& str)
 {
   if (GetClassInfo() && GetClassInfo()->GetClassName())
 void wxObject::Dump(ostream& str)
 {
   if (GetClassInfo() && GetClassInfo()->GetClassName())


@@ -93,7 +104,7 @@ void wxObject::Dump(ostream& str)
 }
 #endif
 
 }
 #endif
 

-#if WXDEBUG && USE_MEMORY_TRACING
+#if defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING

 
 #ifdef new
 #undef new
 
 #ifdef new
 #undef new


@@ -111,14 +122,14 @@ void wxObject::operator delete (void * buf)
 
 // VC++ 6.0
 #if _MSC_VER >= 1200
 
 // VC++ 6.0
 #if _MSC_VER >= 1200

-void operator delete(void* pData, char* /* fileName */, int /* lineNum */)
+void wxObject::operator delete(void* pData, char* /* fileName */, int /* lineNum */)

 {
  ::operator delete(pData);
 }
 #endif
 
 // Cause problems for VC++ - crashes
 {
  ::operator delete(pData);
 }
 #endif
 
 // Cause problems for VC++ - crashes

-#ifndef _MSC_VER
+#if !defined(_MSC_VER) && wxUSE_ARRAY_MEMORY_OPERATORS

 void * wxObject::operator new[] (size_t size, char * fileName, int lineNum)
 {
   return wxDebugAlloc(size, fileName, lineNum, TRUE, TRUE);
 void * wxObject::operator new[] (size_t size, char * fileName, int lineNum)
 {
   return wxDebugAlloc(size, fileName, lineNum, TRUE, TRUE);


@@ -258,7 +269,7 @@ wxObject *wxCreateDynamicObject(const char *name)
     return (wxObject*) NULL;
 }
 
     return (wxObject*) NULL;
 }
 

-#ifdef USE_SERIAL
+#if wxUSE_SERIAL

 
 #include "wx/serbase.h"
 #include "wx/dynlib.h"
 
 #include "wx/serbase.h"
 #include "wx/dynlib.h"


@@ -276,19 +287,17 @@ void wxObject::StoreObject( wxObjectOutputStream& stream )
   wxLibrary *lib = wxTheLibraries.LoadLibrary("wxserial");
 
   if (!lib) {
   wxLibrary *lib = wxTheLibraries.LoadLibrary("wxserial");
 
   if (!lib) {

-    wxMessageBox("Can't load wxSerial dynamic library.", "Alert !");
+    wxLogError(_("Can't load wxSerial dynamic library."));

     return;
   }
   if (!m_serialObj) {
     m_serialObj = (WXSERIAL(wxObject) *)lib->CreateObject( obj_name );
 
     if (!m_serialObj) {
     return;
   }
   if (!m_serialObj) {
     m_serialObj = (WXSERIAL(wxObject) *)lib->CreateObject( obj_name );
 
     if (!m_serialObj) {

-      wxString message;
-
-      message.Printf("Can't find the serialization object (%s) for the object %s",
-                     WXSTRINGCAST obj_name,
-                     WXSTRINGCAST GetClassInfo()->GetClassName());
-      wxMessageBox(message, "Alert !");
+      wxLogError(_("Can't find the serialization object '%s' "
+                   "for the object '%s'."),
+                 obj_name.c_str(),
+                 GetClassInfo()->GetClassName());

       return;
     }
     m_serialObj->SetObject(this);
       return;
     }
     m_serialObj->SetObject(this);


@@ -306,12 +315,10 @@ void wxObject::LoadObject( wxObjectInputStream& stream )
     m_serialObj = (WXSERIAL(wxObject) *)lib->CreateObject( obj_name );
 
     if (!m_serialObj) {
     m_serialObj = (WXSERIAL(wxObject) *)lib->CreateObject( obj_name );
 
     if (!m_serialObj) {

-      wxString message;
-
-      message.Printf("Can't find the serialization object (%s) for the object %s",
-                     WXSTRINGCAST obj_name,
-                     WXSTRINGCAST GetClassInfo()->GetClassName());
-      wxMessageBox(message, "Alert !");
+      wxLogError(_("Can't find the serialization object '%s' "
+                   "for the object '%s'."),
+                 obj_name.c_str(),
+                 GetClassInfo()->GetClassName());

       return;
     }
     m_serialObj->SetObject(this);
       return;
     }
     m_serialObj->SetObject(this);