wxHtmlWindow background drawing fixes for OS X and optimizations

[wxWidgets.git] / include / wx / meta / convertible.h

diff --git a/include/wx/meta/convertible.h b/include/wx/meta/convertible.h
index 5a826bc2571c2976f81bfe3df433d718d4824fcb..d43fc2c74de5ac6277eb64087cbd2f70b4560ad5 100644 (file)
--- a/include/wx/meta/convertible.h
+++ b/include/wx/meta/convertible.h
@@ -8,19 +8,27 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef _WX_CONVERTIBLE_H_
-#define _WX_CONVERTIBLE_H_
+#ifndef _WX_META_CONVERTIBLE_H_
+#define _WX_META_CONVERTIBLE_H_
+
+//
+// Introduce an extra class to make this header compilable with g++3.2
+//
+template <class D, class B>
+struct wxConvertibleTo_SizeHelper
+{
+       static char Match(B* pb);
+       static int  Match(...);
+};
 
 // Helper to decide if an object of type D is convertible to type B (the test
 // succeeds in particular when D derives from B)
 template <class D, class B>
 struct wxConvertibleTo
 {
-    static char Match(B* pb);
-    static int Match(...);
-
-    enum { value = sizeof(Match(static_cast<D*>(NULL))) == sizeof(char) };
+    enum { value = sizeof(wxConvertibleTo_SizeHelper<D,B>::Match(static_cast<D*>(NULL)))==sizeof(char)
+       };
 };
 
-#endif // _WX_CONVERTIBLE_H_
+#endif // _WX_META_CONVERTIBLE_H_