Removed conflicting wxEntry prototype

[wxWidgets.git] / include / wx / object.h

diff --git a/include/wx/object.h b/include/wx/object.h
index 289263764593b448c24675dab63a15dabe650d1c..92f759609d9341fcb536b509a89d0fd4c592ea5e 100644 (file)
--- a/include/wx/object.h
+++ b/include/wx/object.h
@@ -5,7 +5,7 @@
 // Modified by: Ron Lee
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Modified by: Ron Lee
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c) 1997 Julian Smart and Markus Holzem
+// Copyright:   (c) 1997 Julian Smart

 //              (c) 2001 Ron Lee <ron@debian.org>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 //              (c) 2001 Ron Lee <ron@debian.org>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -13,7 +13,7 @@
 #ifndef _WX_OBJECTH__
 #define _WX_OBJECTH__
 
 #ifndef _WX_OBJECTH__
 #define _WX_OBJECTH__
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface "object.h"
 #endif
 
 #pragma interface "object.h"
 #endif
 


@@ -24,7 +24,7 @@
 #include "wx/defs.h"
 #include "wx/memory.h"
 
 #include "wx/defs.h"
 #include "wx/memory.h"
 

-class WXDLLEXPORT wxObject;
+class WXDLLIMPEXP_BASE wxObject;

 
 #if wxUSE_DYNAMIC_CLASSES
 
 
 #if wxUSE_DYNAMIC_CLASSES
 


@@ -41,14 +41,9 @@ class WXDLLEXPORT wxObject;
 #undef GetClassInfo
 #endif
 
 #undef GetClassInfo
 #endif
 

-class WXDLLEXPORT wxClassInfo;
-class WXDLLEXPORT wxHashTable;
-class WXDLLEXPORT wxObjectRefData;
-
-#if wxUSE_STD_IOSTREAM && (defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT)
-    #include "wx/ioswrap.h"
-#endif
-
+class WXDLLIMPEXP_BASE wxClassInfo;
+class WXDLLIMPEXP_BASE wxHashTable;
+class WXDLLIMPEXP_BASE wxObjectRefData;

 
 // ----------------------------------------------------------------------------
 // wxClassInfo
 
 // ----------------------------------------------------------------------------
 // wxClassInfo


@@ -56,7 +51,7 @@ class WXDLLEXPORT wxObjectRefData;
 
 typedef wxObject *(*wxObjectConstructorFn)(void);
 
 
 typedef wxObject *(*wxObjectConstructorFn)(void);
 

-class WXDLLEXPORT wxClassInfo
+class WXDLLIMPEXP_BASE wxClassInfo

 {
 public:
     wxClassInfo( const wxChar *className,
 {
 public:
     wxClassInfo( const wxChar *className,


@@ -72,16 +67,9 @@ public:
         , m_baseInfo1(0)
         , m_baseInfo2(0)
         , m_next(sm_first)
         , m_baseInfo1(0)
         , m_baseInfo2(0)
         , m_next(sm_first)

-        {
-#ifdef __WXDEBUG__
-            if (sm_classTable != NULL) {
-                wxString msg(_T("too late binding of class info (lazy binding) for "));
-                msg += className;
-                wxFAIL_MSG(msg);
-            }
-#endif
-            sm_first = this;
-        }
+        { sm_first = this; }
+
+    ~wxClassInfo();

 
     wxObject *CreateObject() { return m_objectConstructor ? (*m_objectConstructor)() : 0; }
 
 
     wxObject *CreateObject() { return m_objectConstructor ? (*m_objectConstructor)() : 0; }
 


@@ -145,7 +133,7 @@ private:
     DECLARE_NO_COPY_CLASS(wxClassInfo)
 };
 
     DECLARE_NO_COPY_CLASS(wxClassInfo)
 };
 

-WXDLLEXPORT wxObject *wxCreateDynamicObject(const wxChar *name);
+WXDLLIMPEXP_BASE wxObject *wxCreateDynamicObject(const wxChar *name);

 
 // ----------------------------------------------------------------------------
 // Dynamic class macros
 
 // ----------------------------------------------------------------------------
 // Dynamic class macros


@@ -167,7 +155,7 @@ WXDLLEXPORT wxObject *wxCreateDynamicObject(const wxChar *name);
     // Single inheritance with one base class
 
 #define IMPLEMENT_DYNAMIC_CLASS(name, basename)                 \
     // Single inheritance with one base class
 
 #define IMPLEMENT_DYNAMIC_CLASS(name, basename)                 \

- wxObject* WXDLLEXPORT_CTORFN wxConstructorFor##name()          \
+ wxObject* wxConstructorFor##name()                             \

   { return new name; }                                          \
  wxClassInfo name::sm_class##name(wxT(#name), wxT(#basename),   \
             0, (int) sizeof(name),                              \
   { return new name; }                                          \
  wxClassInfo name::sm_class##name(wxT(#name), wxT(#basename),   \
             0, (int) sizeof(name),                              \


@@ -176,7 +164,7 @@ WXDLLEXPORT wxObject *wxCreateDynamicObject(const wxChar *name);
     // Multiple inheritance with two base classes
 
 #define IMPLEMENT_DYNAMIC_CLASS2(name, basename1, basename2)    \
     // Multiple inheritance with two base classes
 
 #define IMPLEMENT_DYNAMIC_CLASS2(name, basename1, basename2)    \

- wxObject* WXDLLEXPORT_CTORFN wxConstructorFor##name()          \
+ wxObject* wxConstructorFor##name()                             \

   { return new name; }                                          \
  wxClassInfo name::sm_class##name(wxT(#name), wxT(#basename1),  \
             wxT(#basename2), (int) sizeof(name),                \
   { return new name; }                                          \
  wxClassInfo name::sm_class##name(wxT(#name), wxT(#basename1),  \
             wxT(#basename2), (int) sizeof(name),                \


@@ -310,14 +298,18 @@ name##PluginSentinel  m_pluginsentinel;
 
 // to be replaced by dynamic_cast<> in the future
 #define wxDynamicCast(obj, className) \
 
 // to be replaced by dynamic_cast<> in the future
 #define wxDynamicCast(obj, className) \

- (className *) wxCheckDynamicCast((wxObject*)(obj), &className::sm_class##className)
+ ((className *) wxCheckDynamicCast((wxObject*)(obj), &className::sm_class##className))

 
 // The 'this' pointer is always true, so use this version
 // to cast the this pointer and avoid compiler warnings.
 #define wxDynamicCastThis(className) \
  (IsKindOf(&className::sm_class##className) ? (className *)(this) : (className *)0)
 
 
 // The 'this' pointer is always true, so use this version
 // to cast the this pointer and avoid compiler warnings.
 #define wxDynamicCastThis(className) \
  (IsKindOf(&className::sm_class##className) ? (className *)(this) : (className *)0)
 

+#ifdef HAVE_CONST_CAST
+#define wxConstCast(obj, className) const_cast<className *>(obj)
+#else

 #define wxConstCast(obj, className) ((className *)(obj))
 #define wxConstCast(obj, className) ((className *)(obj))

+#endif

 
 
 #ifdef __WXDEBUG__
 
 
 #ifdef __WXDEBUG__


@@ -333,18 +325,6 @@ inline void wxCheckCast(void *ptr)
 
 #endif  // __WXDEBUG__
 
 
 #endif  // __WXDEBUG__
 

-
-// for some reason Borland seems to need this include.
-#if wxUSE_STD_IOSTREAM                                \
-    && (defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT)  \
-    && defined(__BORLANDC__)
-    #if wxUSE_IOSTREAMH
-        #include <iostream.h>
-    #else
-        #include <iostream>
-    #endif
-#endif // wxUSE_IOSTREAMH
-

 // ----------------------------------------------------------------------------
 // set up memory debugging macros
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // set up memory debugging macros
 // ----------------------------------------------------------------------------


@@ -403,20 +383,41 @@ inline void wxCheckCast(void *ptr)
 
 #endif // WXDEBUG && wxUSE_MEMORY_TRACING
 
 
 #endif // WXDEBUG && wxUSE_MEMORY_TRACING
 

+#if wxUSE_STD_IOSTREAM && (defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT)
+// needed by wxObject::Dump
+#include "wx/iosfwrap.h"
+#endif

 
 // ----------------------------------------------------------------------------
 // wxObject: the root class of wxWindows object hierarchy
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // wxObject: the root class of wxWindows object hierarchy
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxObject
+class WXDLLIMPEXP_BASE wxObject

 {
     DECLARE_ABSTRACT_CLASS(wxObject)
 {
     DECLARE_ABSTRACT_CLASS(wxObject)

-    DECLARE_NO_COPY_CLASS(wxObject)

 
 

+private:
+    void InitFrom(const wxObject& other);
+    

 public:
     wxObject() { m_refData = NULL; }
     virtual ~wxObject() { UnRef(); }
     
 public:
     wxObject() { m_refData = NULL; }
     virtual ~wxObject() { UnRef(); }
     

+    wxObject(const wxObject& other)
+        {
+            InitFrom(other);
+        }
+    
+    wxObject& operator=(const wxObject& other)
+    {
+        if ( this != &other )
+        {
+            UnRef();
+            InitFrom(other);
+        }
+        return *this;
+    }
+

     bool IsKindOf(wxClassInfo *info) const;
 
 
     bool IsKindOf(wxClassInfo *info) const;
 
 


@@ -489,9 +490,9 @@ protected:
 // wxObjectRefData: ref counted data meant to be stored in wxObject
 // ----------------------------------------------------------------------------
 
 // wxObjectRefData: ref counted data meant to be stored in wxObject
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxObjectRefData
+class WXDLLIMPEXP_BASE wxObjectRefData

 {
 {

-    friend class wxObject;
+    friend class WXDLLIMPEXP_BASE wxObject;

 
 public:
     wxObjectRefData() : m_count(1) { }
 
 public:
     wxObjectRefData() : m_count(1) { }