Made OnInit() and OnRun() logic like MSW when it

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

diff --git a/include/wx/ffile.h b/include/wx/ffile.h
index 4695dc989b0ce8ee8758a0cebb656a5a95a3690c..4c48810ea5dbfaf66c7385fc7f28476013a403d4 100644 (file)
--- a/include/wx/ffile.h
+++ b/include/wx/ffile.h
@@ -16,7 +16,7 @@
     #pragma interface "ffile.h"
 #endif
 
     #pragma interface "ffile.h"
 #endif
 

-#if wxUSE_FILE
+#if wxUSE_FFILE

 
 #ifndef WX_PRECOMP
   #include  "wx/string.h"
 
 #ifndef WX_PRECOMP
   #include  "wx/string.h"


@@ -65,10 +65,11 @@ public:
     // returns the number of bytes written
   size_t Write(const void *pBuf, size_t nCount);
     // returns true on success
     // returns the number of bytes written
   size_t Write(const void *pBuf, size_t nCount);
     // returns true on success

-  bool Write(const wxString& s)
+  bool Write(const wxString& s, wxMBConv& conv = wxConvLibc)

   {
   {

-      size_t size = s.Len()*sizeof(wxChar);
-      return Write(s.c_str(), size) == size;
+      const wxWX2MBbuf buf = s.mb_str(conv);
+      size_t size = strlen(buf);
+      return Write((const char *)buf, size) == size;

   }
     // flush data not yet written
   bool Flush();
   }
     // flush data not yet written
   bool Flush();


@@ -108,7 +109,7 @@ private:
   wxString m_name;  // the name of the file (for diagnostic messages)
 };
 
   wxString m_name;  // the name of the file (for diagnostic messages)
 };
 

-#endif // wxUSE_FILE
+#endif // wxUSE_FFILE

 
 #endif // _WX_FFILE_H_
 
 
 #endif // _WX_FFILE_H_