Richtext interface fixes and additions for Phoenix

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

diff --git a/include/wx/xtitypes.h b/include/wx/xtitypes.h
index 0879897f537da277d01f8246c9a9e067701e668b..d3fd1432f8bfa41cec5729274d685b31cb75d6c8 100644 (file)
--- a/include/wx/xtitypes.h
+++ b/include/wx/xtitypes.h
@@ -147,7 +147,7 @@ void wxSetFromString(const wxString &s, wxBitset<e> &data )
     {
         flag = array[i];
         int ivalue;
     {
         flag = array[i];
         int ivalue;

-        if ( edata->HasEnumMemberValue( flag, &ivalue ) )
+        if ( edata->HasEnumMemberValue( flag.c_str(), &ivalue ) )

         {
             data.set( (e) ivalue );
         }
         {
             data.set( (e) ivalue );
         }


@@ -236,7 +236,7 @@ void wxFlagsToString( wxString &s, const e& data )
 #define wxBEGIN_FLAGS( e ) \
     wxEnumMemberData s_enumDataMembers##e[] = {
 
 #define wxBEGIN_FLAGS( e ) \
     wxEnumMemberData s_enumDataMembers##e[] = {
 

-#define wxFLAGS_MEMBER( v ) { wxT(#v), v },
+#define wxFLAGS_MEMBER( v ) { wxT(#v), static_cast<int>(v) },

 
 #define wxEND_FLAGS( e )                                                \
         { NULL, 0 } };                                                 \
 
 #define wxEND_FLAGS( e )                                                \
         { NULL, 0 } };                                                 \


@@ -355,7 +355,7 @@ public:
         if ( m_toString ) 
             (*m_toString)( data, result ); 
         else 
         if ( m_toString ) 
             (*m_toString)( data, result ); 
         else 

-            wxLogError( wxGetTranslation(_T("String conversions not supported")) ); 
+            wxLogError( wxGetTranslation(wxT("String conversions not supported")) ); 

     }
 
     // convert a string into a wxAny holding the corresponding data in this type
     }
 
     // convert a string into a wxAny holding the corresponding data in this type


@@ -364,7 +364,7 @@ public:
         if( m_fromString ) 
             (*m_fromString)( data, result ); 
         else 
         if( m_fromString ) 
             (*m_fromString)( data, result ); 
         else 

-            wxLogError( wxGetTranslation(_T("String conversions not supported")) ); 
+            wxLogError( wxGetTranslation(wxT("String conversions not supported")) ); 

     }
 
     // statics:
     }
 
     // statics:


@@ -428,7 +428,7 @@ public:
         if( m_toLong ) 
             (*m_toLong)( data, result ); 
         else 
         if( m_toLong ) 
             (*m_toLong)( data, result ); 
         else 

-            wxLogError( wxGetTranslation(_T("Long Conversions not supported")) ); 
+            wxLogError( wxGetTranslation(wxT("Long Conversions not supported")) ); 

     }
 
     // convert a long into a wxAny holding the corresponding data in this type
     }
 
     // convert a long into a wxAny holding the corresponding data in this type


@@ -437,7 +437,7 @@ public:
         if( m_fromLong ) 
             (*m_fromLong)( data, result ); 
         else 
         if( m_fromLong ) 
             (*m_fromLong)( data, result ); 
         else 

-            wxLogError( wxGetTranslation(_T("Long Conversions not supported")) ); 
+            wxLogError( wxGetTranslation(wxT("Long Conversions not supported")) ); 

     }
 
 private:
     }
 
 private: