Reenable wxPalmOS status bar after recent changes. Start transition from faked drawin...

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

diff --git a/include/wx/object.h b/include/wx/object.h
index 68233948a5fe3f10cdc52f6191cd2bbe4101a1f3..11ffa2b356489989c6ffc7e81016b380543e16dc 100644 (file)
--- a/include/wx/object.h
+++ b/include/wx/object.h
@@ -26,8 +26,6 @@
 
 class WXDLLIMPEXP_BASE wxObject;
 
 
 class WXDLLIMPEXP_BASE wxObject;
 

-#if wxUSE_DYNAMIC_CLASSES
-

 #ifndef wxUSE_EXTENDED_RTTI
 #define wxUSE_EXTENDED_RTTI 0
 #endif
 #ifndef wxUSE_EXTENDED_RTTI
 #define wxUSE_EXTENDED_RTTI 0
 #endif


@@ -183,7 +181,7 @@ inline void wxClassInfo::CleanUpClasses() {}
     // 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* name::wxCreateObject()                             \
+ wxObject* name::wxCreateObject()                               \

   { return new name; }                                          \
  wxClassInfo name::ms_classInfo(wxT(#name),                     \
             &basename::ms_classInfo, NULL,                      \
   { return new name; }                                          \
  wxClassInfo name::ms_classInfo(wxT(#name),                     \
             &basename::ms_classInfo, NULL,                      \


@@ -193,12 +191,12 @@ inline void wxClassInfo::CleanUpClasses() {}
     // 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* name::wxCreateObject()                             \
+ wxObject* name::wxCreateObject()                               \

   { return new name; }                                          \
  wxClassInfo name::ms_classInfo(wxT(#name),                     \
             &basename1::ms_classInfo,                           \
             &basename2::ms_classInfo,                           \
   { return new name; }                                          \
  wxClassInfo name::ms_classInfo(wxT(#name),                     \
             &basename1::ms_classInfo,                           \
             &basename2::ms_classInfo,                           \

-            wxT(#basename2), (int) sizeof(name),                \
+            (int) sizeof(name),                                 \

             (wxObjectConstructorFn) name::wxCreateObject);
 
 // -----------------------------------
             (wxObjectConstructorFn) name::wxCreateObject);
 
 // -----------------------------------


@@ -296,36 +294,6 @@ name##PluginSentinel  m_pluginsentinel;
 
 #define CLASSINFO(name) (&name::ms_classInfo)
 
 
 #define CLASSINFO(name) (&name::ms_classInfo)
 

-#else // !wxUSE_DYNAMIC_CLASSES
-
-    // No dynamic class system: so stub out the macros
-
-#define DECLARE_DYNAMIC_CLASS(name)
-#define DECLARE_ABSTRACT_CLASS(name)
-#define DECLARE_CLASS(name)
-#define IMPLEMENT_DYNAMIC_CLASS(name, basename)
-#define IMPLEMENT_DYNAMIC_CLASS2(name, basename1, basename2)
-#define IMPLEMENT_ABSTRACT_CLASS(name, basename)
-#define IMPLEMENT_ABSTRACT_CLASS2(name, basename1, basename2)
-#define IMPLEMENT_CLASS IMPLEMENT_ABSTRACT_CLASS
-#define IMPLEMENT_CLASS2 IMPLEMENT_ABSTRACT_CLASS2
-
-#define DECLARE_PLUGGABLE_CLASS(name)
-#define DECLARE_ABSTRACT_PLUGGABLE_CLASS(name)
-#define IMPLEMENT_PLUGGABLE_CLASS(name, basename)
-#define IMPLEMENT_PLUGGABLE_CLASS2(name, basename1, basename2)
-#define IMPLEMENT_ABSTRACT_PLUGGABLE_CLASS(name, basename)
-#define IMPLEMENT_ABSTRACT_PLUGGABLE_CLASS2(name, basename1, basename2)
-
-#define DECLARE_USER_EXPORTED_PLUGGABLE_CLASS(name, usergoo)
-#define DECLARE_USER_EXPORTED_ABSTRACT_PLUGGABLE_CLASS(name, usergoo)
-#define IMPLEMENT_USER_EXPORTED_PLUGGABLE_CLASS(name, basename)
-#define IMPLEMENT_USER_EXPORTED_PLUGGABLE_CLASS2(name, basename1, basename2)
-#define IMPLEMENT_USER_EXPORTED_ABSTRACT_PLUGGABLE_CLASS(name, basename)
-#define IMPLEMENT_USER_EXPORTED_ABSTRACT_PLUGGABLE_CLASS2(name, basename1, basename2)
-
-#endif // wxUSE_DYNAMIC_CLASSES
-

 #define wxIS_KIND_OF(obj, className) obj->IsKindOf(&className::ms_classInfo)
 
 // Just seems a bit nicer-looking (pretend it's not a macro)
 #define wxIS_KIND_OF(obj, className) obj->IsKindOf(&className::ms_classInfo)
 
 // Just seems a bit nicer-looking (pretend it's not a macro)


@@ -590,7 +558,7 @@ private :
 
 #if defined(__WXDEBUG__) && wxUSE_GLOBAL_MEMORY_OPERATORS && wxUSE_DEBUG_NEW_ALWAYS
     #define new new(__TFILE__,__LINE__)
 
 #if defined(__WXDEBUG__) && wxUSE_GLOBAL_MEMORY_OPERATORS && wxUSE_DEBUG_NEW_ALWAYS
     #define new new(__TFILE__,__LINE__)

-#else if (defined(__WXDEBUG__) && defined(__VISUALC__) && !wxUSE_GLOBAL_MEMORY_OPERATORS && wxUSE_DEBUG_NEW_ALWAYS)
+#elif (defined(__WXDEBUG__) && defined(__VISUALC__) && !wxUSE_GLOBAL_MEMORY_OPERATORS && wxUSE_DEBUG_NEW_ALWAYS)

     // Including this file redefines new and allows leak reports to contain line numbers
     #include "wx/msw/msvcrt.h"
 #endif
     // Including this file redefines new and allows leak reports to contain line numbers
     #include "wx/msw/msvcrt.h"
 #endif