Some Motif fixes; makefile fixes; added wxTransferStreamToFile/FileToStream for wxWin
streams; fixed wxSP_... ids that clashed with wxTextCtrl; added generic GetPixel implementation for GTK/Motif git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6262 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -619,6 +619,11 @@ protected:
|
||||
// converts from/to a stream to/from a temporary file.
|
||||
bool WXDLLEXPORT wxTransferFileToStream(const wxString& filename, ostream& stream);
|
||||
bool WXDLLEXPORT wxTransferStreamToFile(istream& stream, const wxString& filename);
|
||||
#else
|
||||
// For compatibility with existing file formats:
|
||||
// converts from/to a stream to/from a temporary file.
|
||||
bool WXDLLEXPORT wxTransferFileToStream(const wxString& filename, wxOutputStream& stream);
|
||||
bool WXDLLEXPORT wxTransferStreamToFile(wxInputStream& stream, const wxString& filename);
|
||||
#endif
|
||||
|
||||
#endif // _WX_DOCH__
|
||||
|
Reference in New Issue
Block a user