Support using GetTextExtent() with empty string to get descent in wxOSX.

[wxWidgets.git] / include / wx / listimpl.cpp

diff --git a/include/wx/listimpl.cpp b/include/wx/listimpl.cpp
index 405ff6da9bf54b83b75f2bcc148fa01a42a90fb6..d9a4ffadf273d78259f76152648fdc64458a74b4 100644 (file)
--- a/include/wx/listimpl.cpp
+++ b/include/wx/listimpl.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if wxUSE_STL
+#if wxUSE_STD_CONTAINERS

 
 #undef  WX_DEFINE_LIST
 #define WX_DEFINE_LIST(name)                                                  \
 
 #undef  WX_DEFINE_LIST
 #define WX_DEFINE_LIST(name)                                                  \


@@ -17,9 +17,9 @@
     {                                                                         \
         delete X;                                                             \
     }                                                                         \
     {                                                                         \
         delete X;                                                             \
     }                                                                         \

-    name::BaseListType name::EmptyList;
+    _WX_LIST_HELPER_##name::BaseListType _WX_LIST_HELPER_##name::EmptyList;

 
 

-#else // !wxUSE_STL
+#else // !wxUSE_STD_CONTAINERS

     #undef WX_DEFINE_LIST_2
     #define WX_DEFINE_LIST_2(T, name)     \
         void wx##name##Node::DeleteData() \
     #undef WX_DEFINE_LIST_2
     #define WX_DEFINE_LIST_2(T, name)     \
         void wx##name##Node::DeleteData() \


@@ -32,5 +32,5 @@
     #undef  WX_DEFINE_LIST
     #define WX_DEFINE_LIST(name) WX_DEFINE_LIST_2(_WX_LIST_ITEM_TYPE_##name, name)
 
     #undef  WX_DEFINE_LIST
     #define WX_DEFINE_LIST(name) WX_DEFINE_LIST_2(_WX_LIST_ITEM_TYPE_##name, name)
 

-#endif // wxUSE_STL/!wxUSE_STL
+#endif // wxUSE_STD_CONTAINERS/!wxUSE_STD_CONTAINERS