added safe check for Pango version and use it to avoid underline hack in wxDC::DrawTe...

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

diff --git a/include/wx/file.h b/include/wx/file.h
index 7f3f0e8184add500a6d9a4ecfae377a305c37676..d3dd07ea3a5af02f2374d3cf8b2ebefc5ef675e9 100644 (file)
--- a/include/wx/file.h
+++ b/include/wx/file.h
@@ -73,7 +73,7 @@ public:
     // def ctor
   wxFile() { m_fd = fd_invalid; m_error = false; }
     // open specified file (may fail, use IsOpened())
-  wxFile(const wxChar *szFileName, OpenMode mode = read);
+  wxFile(const wxString& fileName, OpenMode mode = read);
     // attach to (already opened) file
   wxFile(int lfd) { m_fd = lfd; m_error = false; }
 
@@ -97,12 +97,7 @@ public:
     // returns the number of bytes written
   size_t Write(const void *pBuf, size_t nCount);
     // returns true on success
-  bool Write(const wxString& s, const wxMBConv& conv = wxConvUTF8)
-  {
-      const wxWX2MBbuf buf = s.mb_str(conv);
-      size_t size = strlen(buf);
-      return Write((const char *) buf, size) == size;
-  }
+  bool Write(const wxString& s, const wxMBConv& conv = wxConvUTF8);
     // flush data not yet written
   bool Flush();