Fix horizontal mouse wheel scrolling in wxGTK.

[wxWidgets.git] / src / common / xtistrm.cpp

diff --git a/src/common/xtistrm.cpp b/src/common/xtistrm.cpp
index a366c64d96d2d5baac3bba70559f8cc5cd34663a..d96db65eb3f49d691c1e41f45498d91369b5fe4b 100644 (file)
--- a/src/common/xtistrm.cpp
+++ b/src/common/xtistrm.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     27/07/03
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     27/07/03

-// RCS-ID:      $Id$

 // Copyright:   (c) 2003 Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2003 Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -289,8 +288,8 @@ void wxObjectWriter::WriteOneProperty( const wxObject *obj, const wxClassInfo* c
                         }
                         else
                         {
                         }
                         else
                         {

-                            wxLogError( _T("Streaming delegates for not already ")
-                                        _T("streamed objects not yet supported") );
+                            wxLogError( wxT("Streaming delegates for not already ")
+                                        wxT("streamed objects not yet supported") );

                         }
                     }
                 }
                         }
                     }
                 }


@@ -478,7 +477,7 @@ struct wxObjectRuntimeReaderCallback::wxObjectRuntimeReaderCallbackInternal
             return NULL;
         if ( m_objects.find(objectID) == m_objects.end() )
         {
             return NULL;
         if ( m_objects.find(objectID) == m_objects.end() )
         {

-            wxLogError( _("Passing an unkown object to GetObject") );
+            wxLogError( _("Passing an unknown object to GetObject") );

             return NULL;
         }
 
             return NULL;
         }
 


@@ -577,7 +576,7 @@ void wxObjectRuntimeReaderCallback::SetProperty(int objectID,
 {
     wxObject *o;
     o = m_data->GetObject(objectID);
 {
     wxObject *o;
     o = m_data->GetObject(objectID);

-    classInfo->SetProperty( o, propertyInfo->GetName(), value );
+    classInfo->SetProperty( o, propertyInfo->GetName().c_str(), value );

 }
 
 void wxObjectRuntimeReaderCallback::SetPropertyAsObject(int objectID,
 }
 
 void wxObjectRuntimeReaderCallback::SetPropertyAsObject(int objectID,


@@ -599,7 +598,7 @@ void wxObjectRuntimeReaderCallback::SetPropertyAsObject(int objectID,
         valo = dynvalo->GetSuperClassInstance();
     }
 
         valo = dynvalo->GetSuperClassInstance();
     }
 

-    classInfo->SetProperty( o, propertyInfo->GetName(), 
+    classInfo->SetProperty( o, propertyInfo->GetName().c_str(),

                             valClassInfo->ObjectPtrToAny(valo) );
 }
 
                             valClassInfo->ObjectPtrToAny(valo) );
 }
 


@@ -650,7 +649,7 @@ void wxObjectRuntimeReaderCallback::AddToPropertyCollection( int objectID,
 {
     wxObject *o;
     o = m_data->GetObject(objectID);
 {
     wxObject *o;
     o = m_data->GetObject(objectID);

-    classInfo->AddToPropertyCollection( o, propertyInfo->GetName(), value );
+    classInfo->AddToPropertyCollection( o, propertyInfo->GetName().c_str(), value );

 }
 
 void wxObjectRuntimeReaderCallback::AddToPropertyCollectionAsObject(int objectID,
 }
 
 void wxObjectRuntimeReaderCallback::AddToPropertyCollectionAsObject(int objectID,


@@ -674,7 +673,7 @@ void wxObjectRuntimeReaderCallback::AddToPropertyCollectionAsObject(int objectID
         valo = dynvalo->GetSuperClassInstance();
     }
 
         valo = dynvalo->GetSuperClassInstance();
     }
 

-    classInfo->AddToPropertyCollection( o, propertyInfo->GetName(), 
+    classInfo->AddToPropertyCollection( o, propertyInfo->GetName().c_str(),

                                         valClassInfo->ObjectPtrToAny(valo) );
 }
 
                                         valClassInfo->ObjectPtrToAny(valo) );
 }