Notebook, Listbox, and Checklst updates

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

diff --git a/include/wx/ffile.h b/include/wx/ffile.h
index 6a3f6fdb9ea0f1fca573394275cce28a09b2fab9..e8c4e3a72d7b94eb17ae96e5f0ee43a25063777f 100644 (file)
--- a/include/wx/ffile.h
+++ b/include/wx/ffile.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        ffile.h
+// Name:        wx/ffile.h

 // Purpose:     wxFFile - encapsulates "FILE *" stream
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     wxFFile - encapsulates "FILE *" stream
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -12,11 +12,13 @@
 #ifndef   _WX_FFILE_H_
 #define   _WX_FFILE_H_
 
 #ifndef   _WX_FFILE_H_
 #define   _WX_FFILE_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

     #pragma interface "ffile.h"
 #endif
 
     #pragma interface "ffile.h"
 #endif
 

-#if wxUSE_FILE
+#include "wx/defs.h"        // for wxUSE_FFILE
+
+#if wxUSE_FFILE

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


@@ -51,7 +53,7 @@ public:
   bool Close();
 
   // assign an existing file descriptor and get it back from wxFFile object
   bool Close();
 
   // assign an existing file descriptor and get it back from wxFFile object

-  void Attach(FILE *fp, const wxString& name = _T(""))
+  void Attach(FILE *fp, const wxString& name = wxT(""))

     { Close(); m_fp = fp; m_name = name; }
   void Detach() { m_fp = NULL; }
   FILE *fp() const { return m_fp; }
     { Close(); m_fp = fp; m_name = name; }
   void Detach() { m_fp = NULL; }
   FILE *fp() const { return m_fp; }


@@ -65,10 +67,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 +111,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_