Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed WXWIN_COMPATIBILITY_2_2 together with code guarded by it.

Browse Source 
Changed default for WXWIN_COMPATIBILITY_2_4 to 0.
  Added WXWIN_COMPATIBILITY_2_6 (defaults to 1).
  Ran build/update-setup-h.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35858 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2005-10-09 15:48:42 +00:00
parent 92b0cd9eb0
commit dee1a63ff5
59 changed files with 990 additions and 1678 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
include/wx/stream.h
View File

@@ -42,19 +42,6 @@ enum wxStreamError
wxSTREAM_READ_ERROR // generic read error
};
// compatibility
#if WXWIN_COMPATIBILITY_2_2
#define wxStream_NOERROR wxSTREAM_NOERROR
#define wxStream_EOF wxSTREAM_EOF
#define wxStream_WRITE_ERR wxSTREAM_WRITE_ERROR
#define wxStream_READ_ERR wxSTREAM_READ_ERROR
#define wxSTREAM_NO_ERR wxSTREAM_NO_ERROR
#define wxSTREAM_NOERROR wxSTREAM_NO_ERROR
#define wxSTREAM_WRITE_ERR wxSTREAM_WRITE_ERROR
#define wxSTREAM_READ_ERR wxSTREAM_READ_ERROR
#endif // WXWIN_COMPATIBILITY_2_2
// ============================================================================
// base stream classes: wxInputStream and wxOutputStream
// ============================================================================
@@ -84,13 +71,6 @@ public:
// returns true if the streams supports seeking to arbitrary offsets
virtual bool IsSeekable() const { return false; }
#if WXWIN_COMPATIBILITY_2_2
// deprecated, for compatibility only
wxDEPRECATED( wxStreamError LastError() const );
wxDEPRECATED( size_t StreamSize() const );
#endif // WXWIN_COMPATIBILITY_2_2
// Reserved for future use
virtual void ReservedStreamFunc1() {}
virtual void ReservedStreamFunc2() {}