Avoid crash when releasing the mouse in wxRibbonToolBar.

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

diff --git a/src/common/file.cpp b/src/common/file.cpp
index 8aaa9ac05e64ec4eddf1c2ab06831ad2bcf2c65f..bd4a4f0a0c3dc3567ef67b15c2d897836b5d4df7 100644 (file)
--- a/src/common/file.cpp
+++ b/src/common/file.cpp
@@ -312,7 +312,12 @@ bool wxFile::Write(const wxString& s, const wxMBConv& conv)
   if ( !buf )
       return false;
 
+#if wxUSE_UNICODE
   const size_t size = buf.length();
+#else
+  const size_t size = s.length();
+#endif
+
   return Write(buf, size) == size;
 }
 
@@ -410,8 +415,7 @@ wxFileOffset wxFile::Length() const
 
     wxFileOffset iRc = Tell();
     if ( iRc != wxInvalidOffset ) {
-        // have to use const_cast :-(
-        wxFileOffset iLen = ((wxFile *)this)->SeekEnd();
+        wxFileOffset iLen = const_cast<wxFile *>(this)->SeekEnd();
         if ( iLen != wxInvalidOffset ) {
             // restore old position
             if ( ((wxFile *)this)->Seek(iRc) == wxInvalidOffset ) {