wxStaticBitmapBase::DoGetBestSize

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

diff --git a/include/wx/file.h b/include/wx/file.h
index fd0b7021e3fd2ce318b6d49b9dd83a4725a96f6f..2bc154269882d59a4474753069577c6a45cdf695 100644 (file)
--- a/include/wx/file.h
+++ b/include/wx/file.h
@@ -13,7 +13,7 @@
 #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
 
 #pragma interface "file.h"
 #endif
 


@@ -54,7 +54,7 @@
 //     dtor which is _not_ virtual, so it shouldn't be used as a base class.
 // ----------------------------------------------------------------------------
 
 //     dtor which is _not_ virtual, so it shouldn't be used as a base class.
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT_BASE wxFile
+class WXDLLIMPEXP_BASE wxFile

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


@@ -75,11 +75,11 @@ public:
   // ctors
   // -----
     // def ctor
   // ctors
   // -----
     // def ctor

-  wxFile() { m_fd = fd_invalid; }
+  wxFile() { m_fd = fd_invalid; m_error = false; }

     // open specified file (may fail, use IsOpened())
   wxFile(const wxChar *szFileName, OpenMode mode = read);
     // attach to (already opened) file
     // open specified file (may fail, use IsOpened())
   wxFile(const wxChar *szFileName, OpenMode mode = read);
     // attach to (already opened) file

-  wxFile(int fd) { m_fd = fd; }
+  wxFile(int fd) { m_fd = fd; m_error = false; }

 
   // open/close
     // create a new file (with the default value of bOverwrite, it will fail if
 
   // open/close
     // create a new file (with the default value of bOverwrite, it will fail if


@@ -91,7 +91,7 @@ public:
   bool Close();  // Close is a NOP if not opened
 
   // assign an existing file descriptor and get it back from wxFile object
   bool Close();  // Close is a NOP if not opened
 
   // assign an existing file descriptor and get it back from wxFile object

-  void Attach(int fd) { Close(); m_fd = fd; }
+  void Attach(int fd) { Close(); m_fd = fd; m_error = false; }

   void Detach()       { m_fd = fd_invalid;  }
   int  fd() const { return m_fd; }
 
   void Detach()       { m_fd = fd_invalid;  }
   int  fd() const { return m_fd; }
 


@@ -150,7 +150,7 @@ private:
 // you call neither of them, dtor will call Discard().
 // ----------------------------------------------------------------------------
 
 // you call neither of them, dtor will call Discard().
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT_BASE wxTempFile
+class WXDLLIMPEXP_BASE wxTempFile

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