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

utils/helpview/src/helpview.cpp

@@ -301,22 +301,7 @@ void hvApp::MacOpenFile(const wxString& filename)
 #define ART(artId, xpmRc) \
 if ( id == artId ) return wxBitmap(xpmRc##_xpm);
 
-// Compatibility hack to use wxApp::GetStdIcon of overriden by the user
-#if WXWIN_COMPATIBILITY_2_2
-#define GET_STD_ICON_FROM_APP(iconId) \
-    if ( client == wxART_MESSAGE_BOX ) \
-{ \
-    wxIcon icon = wxTheApp->GetStdIcon(iconId); \
-    if ( icon.Ok() ) \
-{ \
-    wxBitmap bmp; \
-    bmp.CopyFromIcon(icon); \
-    return bmp; \
-} \
-}
-#else
 #define GET_STD_ICON_FROM_APP(iconId)
-#endif
 
 // There are two ways of getting the standard icon: either via XPMs or via
 // wxIcon ctor. This depends on the platform: