renamed WX_DEFINE_ARRAY_NO_PTR in WX_DEFINE_ARRAY_PTR

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

diff --git a/include/wx/file.h b/include/wx/file.h
index 73778df34d51eea35832a77e2a954451e63c7374..e02c326b1bfc5c58d322d093b269a314b3f9fcfb 100644 (file)
--- a/include/wx/file.h
+++ b/include/wx/file.h
@@ -7,19 +7,20 @@
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FILEH__
 #define _WX_FILEH__
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FILEH__
 #define _WX_FILEH__
 

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

 #pragma interface "file.h"
 #endif
 
 #ifndef WX_PRECOMP
   #include  "wx/string.h"
   #include  "wx/filefn.h"
 #pragma interface "file.h"
 #endif
 
 #ifndef WX_PRECOMP
   #include  "wx/string.h"
   #include  "wx/filefn.h"

+  #include  "wx/strconv.h"

 #endif
 
 #if wxUSE_FILE
 #endif
 
 #if wxUSE_FILE


@@ -52,7 +53,8 @@
 // NB: for space efficiency this class has no virtual functions, including
 //     dtor which is _not_ virtual, so it shouldn't be used as a base class.
 // ----------------------------------------------------------------------------
 // NB: for space efficiency this class has no virtual functions, including
 //     dtor which is _not_ virtual, so it shouldn't be used as a base class.
 // ----------------------------------------------------------------------------

-class WXDLLEXPORT wxFile
+
+class WXDLLIMPEXP_BASE wxFile

 {
 public:
   // more file constants
 {
 public:
   // more file constants


@@ -99,7 +101,7 @@ 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, wxMBConv& conv = wxConvLocal)
+  bool Write(const wxString& s, wxMBConv& conv = wxConvUTF8)

   {
       const wxWX2MBbuf buf = s.mb_str(conv);
       size_t size = strlen(buf);
   {
       const wxWX2MBbuf buf = s.mb_str(conv);
       size_t size = strlen(buf);


@@ -147,7 +149,8 @@ private:
 // file (and close this one) or call Discard() to cancel the modification. If
 // you call neither of them, dtor will call Discard().
 // ----------------------------------------------------------------------------
 // file (and close this one) or call Discard() to cancel the modification. If
 // you call neither of them, dtor will call Discard().
 // ----------------------------------------------------------------------------

-class WXDLLEXPORT wxTempFile
+
+class WXDLLIMPEXP_BASE wxTempFile

 {
 public:
   // ctors
 {
 public:
   // ctors


@@ -164,7 +167,8 @@ public:
 
   // I/O (both functions return true on success, false on failure)
   bool Write(const void *p, size_t n) { return m_file.Write(p, n) != 0; }
 
   // I/O (both functions return true on success, false on failure)
   bool Write(const void *p, size_t n) { return m_file.Write(p, n) != 0; }

-  bool Write(const wxString& str, wxMBConv& conv = wxConvLibc) { return m_file.Write(str, conv); }
+  bool Write(const wxString& str, wxMBConv& conv = wxConvUTF8)
+    { return m_file.Write(str, conv); }

 
   // different ways to close the file
     // validate changes and delete the old file of name m_strName
 
   // different ways to close the file
     // validate changes and delete the old file of name m_strName