Removed WXWIN_COMPATIBILITY_2_2 together with code guarded by it.

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

View File

@@ -113,30 +113,6 @@ bool wxToolBarToolBase::SetLongHelp(const wxString& help)
return true;
}
#if WXWIN_COMPATIBILITY_2_2
const wxBitmap& wxToolBarToolBase::GetBitmap1() const
{
return GetNormalBitmap();
}
const wxBitmap& wxToolBarToolBase::GetBitmap2() const
{
return GetDisabledBitmap();
}
void wxToolBarToolBase::SetBitmap1(const wxBitmap& bmp)
{
SetNormalBitmap(bmp);
}
void wxToolBarToolBase::SetBitmap2(const wxBitmap& bmp)
{
SetDisabledBitmap(bmp);
}
#endif // WXWIN_COMPATIBILITY_2_2
// ----------------------------------------------------------------------------
// wxToolBarBase adding/deleting items
// ----------------------------------------------------------------------------