projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added status bar fields styles support (patch 988292)
[wxWidgets.git]
/
include
/
wx
/
object.h
diff --git
a/include/wx/object.h
b/include/wx/object.h
index 49027a7e30462aab9f423dad5d49302925afd95f..1443bcfa938280c580db7e2b24adf9a1b32bb6eb 100644
(file)
--- a/
include/wx/object.h
+++ b/
include/wx/object.h
@@
-107,11
+107,11
@@
public:
( m_baseInfo2 && m_baseInfo2->IsKindOf(info) ) );
}
( m_baseInfo2 && m_baseInfo2->IsKindOf(info) ) );
}
-#if
def
WXWIN_COMPATIBILITY_2_4
+#if WXWIN_COMPATIBILITY_2_4
// Initializes parent pointers and hash table for fast searching.
// Initializes parent pointers and hash table for fast searching.
- wxDEPRECATED( static void
InitializeClasses() );
+ wxDEPRECATED( static void InitializeClasses() );
// Cleans up hash table used for fast searching.
// Cleans up hash table used for fast searching.
- wxDEPRECATED( static void
CleanUpClasses() );
+ wxDEPRECATED( static void CleanUpClasses() );
#endif
static void CleanUp();
#endif
static void CleanUp();
@@
-149,7
+149,7
@@
protected:
WXDLLIMPEXP_BASE wxObject *wxCreateDynamicObject(const wxChar *name);
WXDLLIMPEXP_BASE wxObject *wxCreateDynamicObject(const wxChar *name);
-#if
def
WXWIN_COMPATIBILITY_2_4
+#if WXWIN_COMPATIBILITY_2_4
inline void wxClassInfo::InitializeClasses() {}
inline void wxClassInfo::CleanUpClasses() {}
#endif
inline void wxClassInfo::InitializeClasses() {}
inline void wxClassInfo::CleanUpClasses() {}
#endif
@@
-333,27
+333,24
@@
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::ms_classInfo))
+ ((className *) wxCheckDynamicCast( \
+ wx_const_cast(wxObject *, wx_static_cast(const wxObject *, \
+ wx_const_cast(className *, wx_static_cast(const className *, obj)))), \
+ &className::ms_classInfo))
// The 'this' pointer is always true, so use this version
// to cast the this pointer and avoid compiler warnings.
#define wxDynamicCastThis(className) \
(IsKindOf(&className::ms_classInfo) ? (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::ms_classInfo) ? (className *)(this) : (className *)0)
-#ifdef HAVE_CONST_CAST
-#define wxConstCast(obj, className) const_cast<className *>(obj)
-#else
-#define wxConstCast(obj, className) ((className *)(obj))
-#endif
-
-
#ifdef __WXDEBUG__
#ifdef __WXDEBUG__
-inline void wxCheckCast(void *ptr)
+inline void
*
wxCheckCast(void *ptr)
{
wxASSERT_MSG( ptr, _T("wxStaticCast() used incorrectly") );
{
wxASSERT_MSG( ptr, _T("wxStaticCast() used incorrectly") );
+ return ptr;
}
#define wxStaticCast(obj, className) \
}
#define wxStaticCast(obj, className) \
- (
wxCheckCast(wxDynamicCast(obj, className)), ((className *)(obj
)))
+ (
(className *)wxCheckCast(wxDynamicCast(obj, className
)))
#else // !__WXDEBUG__
#define wxStaticCast(obj, className) ((className *)(obj))
#else // !__WXDEBUG__
#define wxStaticCast(obj, className) ((className *)(obj))
@@
-419,7
+416,7
@@
inline void wxCheckCast(void *ptr)
#endif // WXDEBUG && wxUSE_MEMORY_TRACING
// ----------------------------------------------------------------------------
#endif // WXDEBUG && wxUSE_MEMORY_TRACING
// ----------------------------------------------------------------------------
-// wxObject: the root class of wxWi
ndow
s object hierarchy
+// wxObject: the root class of wxWi
dget
s object hierarchy
// ----------------------------------------------------------------------------
class WXDLLIMPEXP_BASE wxObject
// ----------------------------------------------------------------------------
class WXDLLIMPEXP_BASE wxObject
@@
-550,7
+547,7
@@
public:
// get the runtime identity of this object
wxClassInfo *GetClassInfo() const
{
// get the runtime identity of this object
wxClassInfo *GetClassInfo() const
{
- return
const_cast<wxClassInfo*>((const wxClassInfo*)
m_classInfo);
+ return
wx_const_cast(wxClassInfo *,
m_classInfo);
}
wxObject* GetSuperClassInstance() const
}
wxObject* GetSuperClassInstance() const