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

9
include/wx/tbarbase.h
View File

@@ -194,15 +194,6 @@ public:
virtual void Detach() { m_tbar = (wxToolBarBase *)NULL; }
virtual void Attach(wxToolBarBase *tbar) { m_tbar = tbar; }
// compatibility only, don't use
#if WXWIN_COMPATIBILITY_2_2
wxDEPRECATED( const wxBitmap& GetBitmap1() const );
wxDEPRECATED( const wxBitmap& GetBitmap2() const );
wxDEPRECATED( void SetBitmap1(const wxBitmap& bmp) );
wxDEPRECATED( void SetBitmap2(const wxBitmap& bmp) );
#endif // WXWIN_COMPATIBILITY_2_2
protected:
wxToolBarBase *m_tbar; // the toolbar to which we belong (may be NULL)