More MSVC fixes .

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21781 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/arrstr.h b/include/wx/arrstr.h
index 957361363235e0d1d980918b59b8a2094049b2eb..5e396cc283a9e3cbed1d58847de02ade59d59c01 100644 (file)
--- a/include/wx/arrstr.h
+++ b/include/wx/arrstr.h
@@ -201,9 +201,9 @@ public:
   // FIXME: same in dynarray.h
   class reverse_iterator
   {
   // FIXME: same in dynarray.h
   class reverse_iterator
   {

-    typedef wxArrayString name;
-    typedef name::reference reference;
-    typedef name::pointer pointer;
+    typedef wxString value_type;
+    typedef value_type* pointer;
+    typedef value_type& reference;

     typedef reverse_iterator itor;
     friend itor operator+(int o, const itor& it);
     friend itor operator+(const itor& it, int o);
     typedef reverse_iterator itor;
     friend itor operator+(int o, const itor& it);
     friend itor operator+(const itor& it, int o);


@@ -227,9 +227,9 @@ public:
 
   class const_reverse_iterator
   {
 
   class const_reverse_iterator
   {

-    typedef wxArrayString name;
-    typedef name::const_reference reference;
-    typedef name::const_pointer pointer;
+    typedef wxString value_type;
+    typedef const value_type* pointer;
+    typedef const value_type& reference;

     typedef const_reverse_iterator itor;
     friend itor operator+(int o, const itor& it);
     friend itor operator+(const itor& it, int o);
     typedef const_reverse_iterator itor;
     friend itor operator+(int o, const itor& it);
     friend itor operator+(const itor& it, int o);

diff --git a/include/wx/list.h b/include/wx/list.h
index 56c3a674302781a3de8e4297bfb96264241107d7..8e1d5169ebc3c223cf7c28ec5adcff8f0ea4b933 100644 (file)
--- a/include/wx/list.h
+++ b/include/wx/list.h
@@ -661,14 +661,16 @@ private:
         {                                                                   \
             typedef name list;                                              \
         public:                                                             \
         {                                                                   \
             typedef name list;                                              \
         public:                                                             \

-            typedef list::Node Node;                                        \
+            typedef nodetype Node;                                          \

             typedef iterator itor;                                          \
             typedef iterator itor;                                          \

-            typedef list::value_type* ptr_type;                             \
+            typedef T* value_type;                                          \
+            typedef value_type* ptr_type;                                   \
+            typedef value_type& reference;                                  \

                                                                             \
             Node* m_node;                                                   \
             Node* m_init;                                                   \
         public:                                                             \
                                                                             \
             Node* m_node;                                                   \
             Node* m_init;                                                   \
         public:                                                             \

-            typedef list::reference reference_type;                         \
+            typedef reference reference_type;                               \

             typedef ptr_type pointer_type;                                  \
                                                                             \
             iterator(Node* node, Node* init) : m_node(node), m_init(init) {}\
             typedef ptr_type pointer_type;                                  \
                                                                             \
             iterator(Node* node, Node* init) : m_node(node), m_init(init) {}\


@@ -700,14 +702,16 @@ private:
         {                                                                   \
             typedef name list;                                              \
         public:                                                             \
         {                                                                   \
             typedef name list;                                              \
         public:                                                             \

-            typedef list::Node Node;                                        \
+            typedef nodetype Node;                                          \
+            typedef T* value_type;                                          \
+            typedef const value_type& const_reference;                      \

             typedef const_iterator itor;                                    \
             typedef const_iterator itor;                                    \

-            typedef list::value_type* ptr_type;                             \
+            typedef value_type* ptr_type;                                   \

                                                                             \
             Node* m_node;                                                   \
             Node* m_init;                                                   \
         public:                                                             \
                                                                             \
             Node* m_node;                                                   \
             Node* m_init;                                                   \
         public:                                                             \

-            typedef list::const_reference reference_type;                   \
+            typedef const_reference reference_type;                         \

             typedef const ptr_type pointer_type;                            \
                                                                             \
             const_iterator(Node* node, Node* init)                          \
             typedef const ptr_type pointer_type;                            \
                                                                             \
             const_iterator(Node* node, Node* init)                          \


@@ -742,14 +746,16 @@ private:
         {                                                                   \
             typedef name list;                                              \
         public:                                                             \
         {                                                                   \
             typedef name list;                                              \
         public:                                                             \

-            typedef list::Node Node;                                        \
+            typedef nodetype Node;                                          \
+            typedef T* value_type;                                          \

             typedef reverse_iterator itor;                                  \
             typedef reverse_iterator itor;                                  \

-            typedef list::value_type* ptr_type;                             \
+            typedef value_type* ptr_type;                                   \
+            typedef value_type& reference;                                  \

                                                                             \
             Node* m_node;                                                   \
             Node* m_init;                                                   \
         public:                                                             \
                                                                             \
             Node* m_node;                                                   \
             Node* m_init;                                                   \
         public:                                                             \

-            typedef list::reference reference_type;                         \
+            typedef reference reference_type;                               \

             typedef ptr_type pointer_type;                                  \
                                                                             \
             reverse_iterator(Node* node, Node* init)                        \
             typedef ptr_type pointer_type;                                  \
                                                                             \
             reverse_iterator(Node* node, Node* init)                        \


@@ -780,14 +786,16 @@ private:
         {                                                                   \
             typedef name list;                                              \
         public:                                                             \
         {                                                                   \
             typedef name list;                                              \
         public:                                                             \

-            typedef list::Node Node;                                        \
+            typedef nodetype Node;                                          \
+            typedef T* value_type;                                          \

             typedef const_reverse_iterator itor;                            \
             typedef const_reverse_iterator itor;                            \

-            typedef list::value_type* ptr_type;                             \
+            typedef value_type* ptr_type;                                   \
+            typedef const value_type& const_reference;                      \

                                                                             \
             Node* m_node;                                                   \
             Node* m_init;                                                   \
         public:                                                             \
                                                                             \
             Node* m_node;                                                   \
             Node* m_init;                                                   \
         public:                                                             \

-            typedef list::const_reference reference_type;                   \
+            typedef const_reference reference_type;                         \

             typedef const ptr_type pointer_type;                            \
                                                                             \
             const_reverse_iterator(Node* node, Node* init)                  \
             typedef const ptr_type pointer_type;                            \
                                                                             \
             const_reverse_iterator(Node* node, Node* init)                  \