derive wxStaticText from wxStaticTextBase under wxGTK1 too, in particular thi sfixes...

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

diff --git a/include/wx/stringimpl.h b/include/wx/stringimpl.h
index 04ff3e43a164e8667d27a672e89f010fd51ea85a..b680b52cf1a03ff9c317939107eb4c95b04d9fe0 100644 (file)
--- a/include/wx/stringimpl.h
+++ b/include/wx/stringimpl.h
@@ -184,6 +184,7 @@ public:
         typedef wxStringCharType value_type;                                  \
         typedef ref_type reference;                                           \
         typedef ptr_type pointer;                                             \
+        typedef int difference_type;                                          \
                                                                               \
         iterator_name(pointer ptr) : m_ptr(ptr) { }                           \
                                                                               \
@@ -222,7 +223,7 @@ public:
         iterator_name& operator-=(size_t n)                                   \
             { m_ptr -= n; return *this; }                                     \
                                                                               \
-        size_t operator-(const iterator_name& i) const                        \
+        difference_type operator-(const iterator_name& i) const               \
             { return m_ptr - i.m_ptr; }                                       \
                                                                               \
         bool operator==(const iterator_name& i) const                         \
@@ -271,6 +272,8 @@ public:
                                     const wxStringCharType*);
   };
 
+  #undef WX_DEFINE_STRINGIMPL_ITERATOR
+
 
   // constructors and destructor
     // ctor for an empty string