Fix for missing -g from wx-config

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

diff --git a/include/wx/object.h b/include/wx/object.h
index f6b11f859491e11e98f2fdb410eb692f5dd30abb..845d0e238cfd187a880412387ab488cd110bc9ac 100644 (file)
--- a/include/wx/object.h
+++ b/include/wx/object.h
@@ -175,6 +175,13 @@ wxObject* WXDLLEXPORT_CTORFN wxConstructorFor##name(void) \
         ? (className *)(obj) \
         : (className *)0)
 
         ? (className *)(obj) \
         : (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)
+

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


@@ -191,6 +198,7 @@ wxObject* WXDLLEXPORT_CTORFN wxConstructorFor##name(void) \
 #endif // Debug/!Debug
 
 // Unfortunately Borland seems to need this include.
 #endif // Debug/!Debug
 
 // Unfortunately Borland seems to need this include.

+#if wxUSE_STD_IOSTREAM && (defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT)

 #ifdef __BORLANDC__
     #if wxUSE_IOSTREAMH
         #include <iostream.h>
 #ifdef __BORLANDC__
     #if wxUSE_IOSTREAMH
         #include <iostream.h>


@@ -198,6 +206,7 @@ wxObject* WXDLLEXPORT_CTORFN wxConstructorFor##name(void) \
         #include <iostream>
     #endif
 #endif
         #include <iostream>
     #endif
 #endif

+#endif

 
 class WXDLLEXPORT wxObjectRefData;
 
 
 class WXDLLEXPORT wxObjectRefData;
 


@@ -247,7 +256,7 @@ class WXDLLEXPORT wxObject
 #endif // Debug & memory tracing
 
 #if wxUSE_STD_IOSTREAM && (defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT)
 #endif // Debug & memory tracing
 
 #if wxUSE_STD_IOSTREAM && (defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT)

-  virtual void Dump(ostream& str);
+  virtual void Dump(wxSTD ostream& str);

 #endif
 
 #if wxUSE_SERIAL
 #endif
 
 #if wxUSE_SERIAL