remove WXWIN_COMPATIBILITY_2_6, add WXWIN_COMPATIBILITY_3_0

closes #15792

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75532 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

configure

@@ -1141,8 +1141,8 @@ enable_no_deps
 enable_vararg_macros
 enable_universal_binary
 enable_macosx_arch
-enable_compat26
 enable_compat28
+enable_compat30
 enable_rpath
 enable_objc_uniquifying
 enable_visibility
@@ -2072,8 +2072,8 @@ Optional Features:
   --disable-vararg_macros don't use vararg macros, even if they are supported
   --enable-universal_binary=archs create universal binary for the specified (or all supported) architectures
   --enable-macosx_arch=ARCH  build for just the specified architecture
-  --enable-compat26       enable wxWidgets 2.6 compatibility
+  --enable-compat28       enable wxWidgets 2.8 compatibility
-  --disable-compat28      disable wxWidgets 2.8 compatibility
+  --disable-compat30      disable wxWidgets 3.0 compatibility
   --disable-rpath         disable use of rpath for uninstalled builds
   --enable-objc_uniquifying enable Objective-C class name uniquifying
   --disable-visibility    disable use of ELF symbols visibility even if supported
@@ -6734,50 +6734,6 @@ $as_echo "$wxUSE_MAC_ARCH" >&6; }
               fi
           fi
 
-          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-compat26" >&5
-$as_echo_n "checking for --${enablestring:-enable}-compat26... " >&6; }
-          # Check whether --enable-compat26 was given.
-if test "${enable_compat26+set}" = set; then :
-  enableval=$enable_compat26;
-                          if test "$enableval" = yes; then
-                            wx_cv_use_compat26='WXWIN_COMPATIBILITY_2_6=yes'
-                          else
-                            wx_cv_use_compat26='WXWIN_COMPATIBILITY_2_6=no'
-                          fi
-
-else
-
-                          wx_cv_use_compat26='WXWIN_COMPATIBILITY_2_6=${'DEFAULT_WXWIN_COMPATIBILITY_2_6":-$defaultval}"
-
-fi
-
-
-          eval "$wx_cv_use_compat26"
-
-          if test x"$enablestring" = xdisable; then
-            if test $WXWIN_COMPATIBILITY_2_6 = no; then
-              result=yes
-            else
-              result=no
-            fi
-          else
-            result=$WXWIN_COMPATIBILITY_2_6
-          fi
-
-          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
-$as_echo "$result" >&6; }
-
-
-          enablestring=disable
-          defaultval=
-          if test -z "$defaultval"; then
-              if test x"$enablestring" = xdisable; then
-                  defaultval=yes
-              else
-                  defaultval=no
-              fi
-          fi
-
           { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-compat28" >&5
 $as_echo_n "checking for --${enablestring:-enable}-compat28... " >&6; }
           # Check whether --enable-compat28 was given.
@@ -6812,6 +6768,50 @@ fi
 $as_echo "$result" >&6; }
 
 
+          enablestring=disable
+          defaultval=
+          if test -z "$defaultval"; then
+              if test x"$enablestring" = xdisable; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-compat30" >&5
+$as_echo_n "checking for --${enablestring:-enable}-compat30... " >&6; }
+          # Check whether --enable-compat30 was given.
+if test "${enable_compat30+set}" = set; then :
+  enableval=$enable_compat30;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_compat30='WXWIN_COMPATIBILITY_3_0=yes'
+                          else
+                            wx_cv_use_compat30='WXWIN_COMPATIBILITY_3_0=no'
+                          fi
+
+else
+
+                          wx_cv_use_compat30='WXWIN_COMPATIBILITY_3_0=${'DEFAULT_WXWIN_COMPATIBILITY_3_0":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_compat30"
+
+          if test x"$enablestring" = xdisable; then
+            if test $WXWIN_COMPATIBILITY_3_0 = no; then
+              result=yes
+            else
+              result=no
+            fi
+          else
+            result=$WXWIN_COMPATIBILITY_3_0
+          fi
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
+
+
 
           enablestring=disable
           defaultval=
@@ -33132,15 +33132,15 @@ else
 fi
 
 
-if test "x$WXWIN_COMPATIBILITY_2_6" = "xyes"; then
+if test "x$WXWIN_COMPATIBILITY_2_8" = "xyes"; then
-    $as_echo "#define WXWIN_COMPATIBILITY_2_6 1" >>confdefs.h
+    $as_echo "#define WXWIN_COMPATIBILITY_2_8 1" >>confdefs.h
 
 
-    WXWIN_COMPATIBILITY_2_8="yes"
+    WXWIN_COMPATIBILITY_3_0="yes"
 fi
 
-if test "x$WXWIN_COMPATIBILITY_2_8" != "xno"; then
+if test "x$WXWIN_COMPATIBILITY_3_0" != "xno"; then
-    $as_echo "#define WXWIN_COMPATIBILITY_2_8 1" >>confdefs.h
+    $as_echo "#define WXWIN_COMPATIBILITY_3_0 1" >>confdefs.h
 
 fi
 
@@ -42881,8 +42881,8 @@ else
 fi
 
 echo "  What level of wxWidgets compatibility should be enabled?"
-echo "                                       wxWidgets 2.6      ${WXWIN_COMPATIBILITY_2_6:-no}"
+echo "                                       wxWidgets 2.8      ${WXWIN_COMPATIBILITY_2_8:-no}"
-echo "                                       wxWidgets 2.8      ${WXWIN_COMPATIBILITY_2_8:-yes}"
+echo "                                       wxWidgets 3.0      ${WXWIN_COMPATIBILITY_3_0:-yes}"
 
 echo "  Which libraries should wxWidgets use?"
 echo "                                       STL                ${wxUSE_STL}"

configure.in

@@ -715,8 +715,8 @@ WX_ARG_DISABLE(vararg_macros,[  --disable-vararg_macros don't use vararg macros,
 WX_ARG_ENABLE_PARAM(universal_binary, [[  --enable-universal_binary=archs create universal binary for the specified (or all supported) architectures]], wxUSE_UNIVERSAL_BINARY)
 WX_ARG_ENABLE_PARAM(macosx_arch,      [[  --enable-macosx_arch=ARCH  build for just the specified architecture]], wxUSE_MAC_ARCH)
 
-WX_ARG_ENABLE(compat26,      [  --enable-compat26       enable wxWidgets 2.6 compatibility], WXWIN_COMPATIBILITY_2_6)
+WX_ARG_ENABLE(compat28,      [  --enable-compat28       enable wxWidgets 2.8 compatibility], WXWIN_COMPATIBILITY_2_8)
-WX_ARG_DISABLE(compat28,     [  --disable-compat28      disable wxWidgets 2.8 compatibility], WXWIN_COMPATIBILITY_2_8)
+WX_ARG_DISABLE(compat30,     [  --disable-compat30      disable wxWidgets 3.0 compatibility], WXWIN_COMPATIBILITY_3_0)
 
 WX_ARG_DISABLE(rpath,        [  --disable-rpath         disable use of rpath for uninstalled builds], wxUSE_RPATH)
 
@@ -5353,14 +5353,14 @@ dnl ---------------------------------------------------------------------------
 dnl compatibility level
 dnl ---------------------------------------------------------------------------
 
-if test "x$WXWIN_COMPATIBILITY_2_6" = "xyes"; then
+if test "x$WXWIN_COMPATIBILITY_2_8" = "xyes"; then
-    AC_DEFINE(WXWIN_COMPATIBILITY_2_6)
+    AC_DEFINE(WXWIN_COMPATIBILITY_2_8)
 
-    WXWIN_COMPATIBILITY_2_8="yes"
+    WXWIN_COMPATIBILITY_3_0="yes"
 fi
 
-if test "x$WXWIN_COMPATIBILITY_2_8" != "xno"; then
+if test "x$WXWIN_COMPATIBILITY_3_0" != "xno"; then
-    AC_DEFINE(WXWIN_COMPATIBILITY_2_8)
+    AC_DEFINE(WXWIN_COMPATIBILITY_3_0)
 fi
 
 dnl ---------------------------------------------------------------------------
@@ -8486,8 +8486,8 @@ else
 fi
 
 echo "  What level of wxWidgets compatibility should be enabled?"
-echo "                                       wxWidgets 2.6      ${WXWIN_COMPATIBILITY_2_6:-no}"
+echo "                                       wxWidgets 2.8      ${WXWIN_COMPATIBILITY_2_8:-no}"
-echo "                                       wxWidgets 2.8      ${WXWIN_COMPATIBILITY_2_8:-yes}"
+echo "                                       wxWidgets 3.0      ${WXWIN_COMPATIBILITY_3_0:-yes}"
 
 echo "  Which libraries should wxWidgets use?"
 echo "                                       STL                ${wxUSE_STL}"

include/wx/android/setup.h

@@ -25,16 +25,6 @@
 // compatibility settings
 // ----------------------------------------------------------------------------
 
-// This setting determines the compatibility with 2.6 API: set it to 0 to
-// flag all cases of using deprecated functions.
-//
-// Default is 1 but please try building your code with 0 as the default will
-// change to 0 in the next version and the deprecated functions will disappear
-// in the version after it completely.
-//
-// Recommended setting: 0 (please update your code)
-#define WXWIN_COMPATIBILITY_2_6 0
-
 // This setting determines the compatibility with 2.8 API: set it to 0 to
 // flag all cases of using deprecated functions.
 //
@@ -43,7 +33,17 @@
 // in the version after it completely.
 //
 // Recommended setting: 0 (please update your code)
-#define WXWIN_COMPATIBILITY_2_8 1
+#define WXWIN_COMPATIBILITY_2_8 0
+
+// This setting determines the compatibility with 3.0 API: set it to 0 to
+// flag all cases of using deprecated functions.
+//
+// Default is 1 but please try building your code with 0 as the default will
+// change to 0 in the next version and the deprecated functions will disappear
+// in the version after it completely.
+//
+// Recommended setting: 0 (please update your code)
+#define WXWIN_COMPATIBILITY_3_0 1
 
 // MSW-only: Set to 0 for accurate dialog units, else 1 for old behaviour when
 // default system font is used for wxWindow::GetCharWidth/Height() instead of

include/wx/app.h

@@ -657,12 +657,6 @@ public:
     // deactivated
     virtual void SetActive(bool isActive, wxWindow *lastFocus);
 
-#if WXWIN_COMPATIBILITY_2_6
-    // returns true if the program is successfully initialized
-    wxDEPRECATED_MSG("always returns true now, don't call")
-    bool Initialized();
-#endif // WXWIN_COMPATIBILITY_2_6
-
 protected:
     // override base class method to use GUI traits
     virtual wxAppTraits *CreateTraits();
@@ -694,10 +688,6 @@ protected:
     wxDECLARE_NO_COPY_CLASS(wxAppBase);
 };
 
-#if WXWIN_COMPATIBILITY_2_6
-    inline bool wxAppBase::Initialized() { return true; }
-#endif // WXWIN_COMPATIBILITY_2_6
-
 // ----------------------------------------------------------------------------
 // now include the declaration of the real class
 // ----------------------------------------------------------------------------

include/wx/artprov.h

@@ -186,18 +186,6 @@ public:
     // the topmost provider if platform_dependent = false
     static wxSize GetSizeHint(const wxArtClient& client, bool platform_dependent = false);
 
-#if WXWIN_COMPATIBILITY_2_6
-    // use the corresponding methods without redundant "Provider" suffix
-    static wxDEPRECATED( void PushProvider(wxArtProvider *provider) );
-    static wxDEPRECATED( void InsertProvider(wxArtProvider *provider) );
-    static wxDEPRECATED( bool PopProvider() );
-
-    // use Delete() if this is what you really need, or just delete the
-    // provider pointer, do not use Remove() as it does not delete the pointer
-    // unlike RemoveProvider() which does
-    static wxDEPRECATED( bool RemoveProvider(wxArtProvider *provider) );
-#endif // WXWIN_COMPATIBILITY_2_6
-
 protected:
     friend class wxArtProviderModule;
 #if wxUSE_ARTPROVIDER_STD

include/wx/bmpbuttn.h

@@ -80,16 +80,6 @@ public:
     int GetMarginX() const { return DoGetBitmapMargins().x; }
     int GetMarginY() const { return DoGetBitmapMargins().y; }
 
-    // deprecated synonym for SetBitmapLabel()
-#if WXWIN_COMPATIBILITY_2_6
-    wxDEPRECATED_INLINE( void SetLabel(const wxBitmap& bitmap),
-       SetBitmapLabel(bitmap); )
-
-    // prevent virtual function hiding
-    virtual void SetLabel(const wxString& label)
-        { wxWindow::SetLabel(label); }
-#endif // WXWIN_COMPATIBILITY_2_6
-
 protected:
 #ifndef wxHAS_BUTTON_BITMAP
     // function called when any of the bitmaps changes

include/wx/bookctrl.h

@@ -432,14 +432,6 @@ typedef void (wxEvtHandler::*wxBookCtrlEventFunction)(wxBookCtrlEvent&);
 #define wxEVT_COMMAND_BOOKCTRL_PAGE_CHANGED    wxEVT_BOOKCTRL_PAGE_CHANGED
 #define wxEVT_COMMAND_BOOKCTRL_PAGE_CHANGING   wxEVT_BOOKCTRL_PAGE_CHANGING
 
-#if WXWIN_COMPATIBILITY_2_6
-    #define wxBC_TOP                               wxBK_TOP
-    #define wxBC_BOTTOM                            wxBK_BOTTOM
-    #define wxBC_LEFT                              wxBK_LEFT
-    #define wxBC_RIGHT                             wxBK_RIGHT
-    #define wxBC_DEFAULT                           wxBK_DEFAULT
-#endif
-
 #endif // wxUSE_BOOKCTRL
 
 #endif // _WX_BOOKCTRL_H_

include/wx/brush.h

@@ -93,15 +93,10 @@ public:
     wxBrush *FindOrCreateBrush(const wxColour& colour,
                                wxBrushStyle style = wxBRUSHSTYLE_SOLID);
 
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
+#if WXWIN_COMPATIBILITY_3_0
     wxBrush *FindOrCreateBrush(const wxColour& colour, int style)
         { return FindOrCreateBrush(colour, (wxBrushStyle)style); }
 #endif
-
-#if WXWIN_COMPATIBILITY_2_6
-    wxDEPRECATED( void AddBrush(wxBrush*) );
-    wxDEPRECATED( void RemoveBrush(wxBrush*) );
-#endif
 };
 
 extern WXDLLIMPEXP_DATA_CORE(wxBrushList*)   wxTheBrushList;
@@ -112,7 +107,7 @@ extern WXDLLIMPEXP_DATA_CORE(wxBrushList*)   wxTheBrushList;
 //
 // to compile without warnings which it would otherwise provoke from some
 // compilers as it compares elements of different enums
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
+#if WXWIN_COMPATIBILITY_3_0
 
 // Unfortunately some compilers have ambiguity issues when enum comparisons are
 // overloaded so we have to disable the overloads in this case, see
@@ -131,6 +126,6 @@ inline bool operator!=(wxBrushStyle s, wxDeprecatedGUIConstants t)
 
 #endif // wxCOMPILER_NO_OVERLOAD_ON_ENUM
 
-#endif // FUTURE_WXWIN_COMPATIBILITY_3_0
+#endif // WXWIN_COMPATIBILITY_3_0
 
 #endif // _WX_BRUSH_H_BASE_

include/wx/build.h

@@ -72,16 +72,16 @@
 #endif
 
 // WXWIN_COMPATIBILITY macros affect presence of virtual functions
-#if WXWIN_COMPATIBILITY_2_6
-    #define __WX_BO_WXWIN_COMPAT_2_6 ",compatible with 2.6"
-#else
-    #define __WX_BO_WXWIN_COMPAT_2_6
-#endif
 #if WXWIN_COMPATIBILITY_2_8
     #define __WX_BO_WXWIN_COMPAT_2_8 ",compatible with 2.8"
 #else
     #define __WX_BO_WXWIN_COMPAT_2_8
 #endif
+#if WXWIN_COMPATIBILITY_3_0
+    #define __WX_BO_WXWIN_COMPAT_3_0 ",compatible with 3.0"
+#else
+    #define __WX_BO_WXWIN_COMPAT_3_0
+#endif
 
 // deriving wxWin containers from STL ones changes them completely:
 #if wxUSE_STD_CONTAINERS
@@ -96,7 +96,7 @@
     " (" __WX_BO_UNICODE \
      __WX_BO_COMPILER \
      __WX_BO_STL \
-     __WX_BO_WXWIN_COMPAT_2_6 __WX_BO_WXWIN_COMPAT_2_8 \
+     __WX_BO_WXWIN_COMPAT_2_8 __WX_BO_WXWIN_COMPAT_3_0 \
      ")"
 
 

include/wx/chkconf.h

@@ -1257,16 +1257,16 @@
    Section 3a: check consistency of the non-GUI settings.
  */
 
-#if WXWIN_COMPATIBILITY_2_6
+#if WXWIN_COMPATIBILITY_2_8
-#   if !WXWIN_COMPATIBILITY_2_8
+#   if !WXWIN_COMPATIBILITY_3_0
 #       ifdef wxABORT_ON_CONFIG_ERROR
-#           error "2.6.X compatibility requires 2.8.X compatibility"
+#           error "2.8.X compatibility requires 3.0.X compatibility"
 #       else
-#           undef WXWIN_COMPATIBILITY_2_8
+#           undef WXWIN_COMPATIBILITY_3_0
-#           define WXWIN_COMPATIBILITY_2_8 1
+#           define WXWIN_COMPATIBILITY_3_0 1
 #       endif
 #   endif
-#endif /* WXWIN_COMPATIBILITY_2_6 */
+#endif /* WXWIN_COMPATIBILITY_2_8 */
 
 #if wxUSE_ARCHIVE_STREAMS
 #   if !wxUSE_DATETIME

include/wx/cocoa/brush.h

@@ -29,8 +29,8 @@ class WXDLLIMPEXP_CORE wxBrush: public wxBrushBase
 public:
     wxBrush();
     wxBrush(const wxColour& col, wxBrushStyle style = wxBRUSHSTYLE_SOLID);
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
+#if WXWIN_COMPATIBILITY_3_0
-    wxDEPRECATED_FUTURE( wxBrush(const wxColour& col, int style) );
+    wxDEPRECATED( wxBrush(const wxColour& col, int style) );
 #endif
     wxBrush(const wxBitmap& stipple);
     virtual ~wxBrush();
@@ -54,8 +54,8 @@ public:
     virtual wxBrushStyle GetStyle() const;
     wxBitmap *GetStipple() const;
 
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
+#if WXWIN_COMPATIBILITY_3_0
-    wxDEPRECATED_FUTURE( void SetStyle(int style) )
+    wxDEPRECATED( void SetStyle(int style) )
         { SetStyle((wxBrushStyle)style); }
 #endif
 

include/wx/cocoa/dialog.h

@@ -29,20 +29,6 @@ class WXDLLIMPEXP_CORE wxDialog : public wxDialogBase, protected wxCocoaNSPanel
 public:
     wxDialog() { Init(); }
 
-#if WXWIN_COMPATIBILITY_2_6
-    // Constructor with a modal flag, but no window id - the old convention
-    wxDialog(wxWindow *parent,
-            const wxString& title, bool WXUNUSED(modal),
-            int x = wxDefaultCoord, int y= wxDefaultCoord, int width = 500, int height = 500,
-            long style = wxDEFAULT_DIALOG_STYLE,
-            const wxString& name = wxDialogNameStr)
-    {
-        Init();
-        Create(parent, wxID_ANY, title, wxPoint(x, y), wxSize(width, height),
-               style, name);
-    }
-#endif // WXWIN_COMPATIBILITY_2_6
-
     // Constructor with no modal flag - the new convention.
     wxDialog(wxWindow *parent, wxWindowID winid,
              const wxString& title,

include/wx/cocoa/font.h

@@ -53,7 +53,7 @@ public:
 
     /*! @abstract   Platform-independent construction with individual properties
      */
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
+#if WXWIN_COMPATIBILITY_3_0
     wxFont(int size,
            int family,
            int style,

include/wx/cocoa/pen.h

@@ -25,8 +25,8 @@ class WXDLLIMPEXP_CORE wxPen: public wxGDIObject
 public:
     wxPen();
     wxPen(const wxColour& col, int width = 1, wxPenStyle style = wxPENSTYLE_SOLID);
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
+#if WXWIN_COMPATIBILITY_3_0
-    wxDEPRECATED_FUTURE( wxPen(const wxColour& col, int width, int style) );
+    wxDEPRECATED( wxPen(const wxColour& col, int width, int style) );
 #endif
     wxPen(const wxBitmap& stipple, int width);
     virtual ~wxPen();
@@ -53,8 +53,8 @@ public:
     int GetDashes(wxDash **ptr) const;
     wxBitmap *GetStipple() const;
 
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
+#if WXWIN_COMPATIBILITY_3_0
-    wxDEPRECATED_FUTURE( void SetStyle(int style) )
+    wxDEPRECATED( void SetStyle(int style) )
         { SetStyle((wxPenStyle)style); }
 #endif
 

include/wx/colour.h

@@ -168,14 +168,6 @@ public:
     wxColour ChangeLightness(int ialpha) const;
     wxColour& MakeDisabled(unsigned char brightness = 255);
 
-    // old, deprecated
-    // ---------------
-
-#if WXWIN_COMPATIBILITY_2_6
-    static wxDEPRECATED( wxColour CreateByName(const wxString& name) );
-    wxDEPRECATED( void InitFromName(const wxString& col) );
-#endif
-
 protected:
     // Some ports need Init() and while we don't, provide a stub so that the
     // ports which don't need it are not forced to define it

include/wx/datetime.h

@@ -613,21 +613,6 @@ public:
                                      Month month = Inv_Month,
                                      int year = Inv_Year);
 
-#if WXWIN_COMPATIBILITY_2_6
-        // sets the date to the given day of the given week in the year,
-        // returns true on success and false if given date doesn't exist (e.g.
-        // numWeek is > 53)
-        //
-        // these functions are badly defined as they're not the reverse of
-        // GetWeekOfYear(), use SetToTheWeekOfYear() instead
-    wxDEPRECATED( bool SetToTheWeek(wxDateTime_t numWeek,
-                                    WeekDay weekday = Mon,
-                                    WeekFlags flags = Monday_First) );
-    wxDEPRECATED( wxDateTime GetWeek(wxDateTime_t numWeek,
-                                     WeekDay weekday = Mon,
-                                     WeekFlags flags = Monday_First) const );
-#endif // WXWIN_COMPATIBILITY_2_6
-
         // returns the date corresponding to the given week day of the given
         // week (in ISO notation) of the specified year
     static wxDateTime SetToWeekOfYear(int year,

include/wx/defs.h

@@ -13,13 +13,6 @@
 #ifndef _WX_DEFS_H_
 #define _WX_DEFS_H_
 
-/*
-    NOTE: this symbol will be replaced with "WXWIN_COMPATIBILITY_3_0" as soon
-          as the development branch for 3.1 is created
- */
-#define FUTURE_WXWIN_COMPATIBILITY_3_0      1
-#define wxDEPRECATED_FUTURE( x )            x
-
 /*  ---------------------------------------------------------------------------- */
 /*  compiler and OS identification */
 /*  ---------------------------------------------------------------------------- */
@@ -1941,12 +1934,6 @@ enum wxBorder
 /*  always show an entire number of rows */
 #define wxLB_INT_HEIGHT     0x0800
 
-#if WXWIN_COMPATIBILITY_2_6
-    /*  deprecated synonyms */
-    #define wxPROCESS_ENTER   0x0400  /*  wxTE_PROCESS_ENTER */
-    #define wxPASSWORD        0x0800  /*  wxTE_PASSWORD */
-#endif
-
 /*
  * wxComboBox style flags
  */
@@ -2429,7 +2416,7 @@ enum wxHatchStyle
              wxPenStyle, wxPenCap, wxPenJoin enum values instead!
 */
 
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
+#if WXWIN_COMPATIBILITY_3_0
 
 /* don't use any elements of this enum in the new code */
 enum wxDeprecatedGUIConstants
@@ -2634,11 +2621,6 @@ enum wxKeyCode
     WXK_SCROLL,
     WXK_PAGEUP,
     WXK_PAGEDOWN,
-#if WXWIN_COMPATIBILITY_2_6
-    WXK_PRIOR = WXK_PAGEUP,
-    WXK_NEXT  = WXK_PAGEDOWN,
-#endif
-
     WXK_NUMPAD_SPACE,
     WXK_NUMPAD_TAB,
     WXK_NUMPAD_ENTER,
@@ -2653,10 +2635,6 @@ enum wxKeyCode
     WXK_NUMPAD_DOWN,
     WXK_NUMPAD_PAGEUP,
     WXK_NUMPAD_PAGEDOWN,
-#if WXWIN_COMPATIBILITY_2_6
-    WXK_NUMPAD_PRIOR = WXK_NUMPAD_PAGEUP,
-    WXK_NUMPAD_NEXT  = WXK_NUMPAD_PAGEDOWN,
-#endif
     WXK_NUMPAD_END,
     WXK_NUMPAD_BEGIN,
     WXK_NUMPAD_INSERT,

include/wx/dfb/brush.h

@@ -32,8 +32,8 @@ class WXDLLIMPEXP_CORE wxBrush : public wxBrushBase
 public:
     wxBrush() {}
     wxBrush(const wxColour &colour, wxBrushStyle style = wxBRUSHSTYLE_SOLID);
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
+#if WXWIN_COMPATIBILITY_3_0
-    wxDEPRECATED_FUTURE( wxBrush(const wxColour& col, int style) );
+    wxDEPRECATED( wxBrush(const wxColour& col, int style) );
 #endif
     wxBrush(const wxBitmap &stippleBitmap);
 
@@ -49,8 +49,8 @@ public:
     void SetStyle(wxBrushStyle style);
     void SetStipple(const wxBitmap& stipple);
 
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
+#if WXWIN_COMPATIBILITY_3_0
-    wxDEPRECATED_FUTURE( void SetStyle(int style) )
+    wxDEPRECATED( void SetStyle(int style) )
         { SetStyle((wxBrushStyle)style); }
 #endif
 

include/wx/dfb/font.h

@@ -38,7 +38,7 @@ public:
     }
 
     wxFont(const wxNativeFontInfo& info) { Create(info); }
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
+#if WXWIN_COMPATIBILITY_3_0
     wxFont(int size,
            int family,
            int style,

include/wx/dfb/pen.h

@@ -32,8 +32,8 @@ class WXDLLIMPEXP_CORE wxPen: public wxPenBase
 public:
     wxPen() {}
     wxPen(const wxColour &colour, int width = 1, wxPenStyle style = wxPENSTYLE_SOLID);
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
+#if WXWIN_COMPATIBILITY_3_0
-    wxDEPRECATED_FUTURE( wxPen(const wxColour& col, int width, int style) );
+    wxDEPRECATED( wxPen(const wxColour& col, int width, int style) );
 #endif
 
     wxPen(const wxBitmap& stipple, int width);
@@ -60,8 +60,8 @@ public:
     wxDash* GetDash() const;
     wxBitmap *GetStipple() const;
 
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
+#if WXWIN_COMPATIBILITY_3_0
-    wxDEPRECATED_FUTURE( void SetStyle(int style) )
+    wxDEPRECATED( void SetStyle(int style) )
         { SetStyle((wxPenStyle)style); }
 #endif
 

include/wx/dirdlg.h

@@ -72,13 +72,6 @@ public:
         return true;
     }
 
-#if WXWIN_COMPATIBILITY_2_6
-
-    wxDEPRECATED( long GetStyle() const );
-    wxDEPRECATED( void SetStyle(long style) );
-
-#endif  // WXWIN_COMPATIBILITY_2_6
-
     virtual void SetMessage(const wxString& message) { m_message = message; }
     virtual void SetPath(const wxString& path) { m_path = path; }
 

include/wx/docview.h

@@ -533,12 +533,6 @@ public:
     );
 #endif
 
-#if WXWIN_COMPATIBILITY_2_6
-    // deprecated, use GetHistoryFilesCount() instead
-    wxDEPRECATED( size_t GetNoHistoryFiles() const );
-#endif // WXWIN_COMPATIBILITY_2_6
-
-
 protected:
     // Called when a file selected from the MRU list doesn't exist any more.
     // The default behaviour is to remove the file from the MRU and notify the
@@ -577,13 +571,6 @@ protected:
     wxDECLARE_NO_COPY_CLASS(wxDocManager);
 };
 
-#if WXWIN_COMPATIBILITY_2_6
-inline size_t wxDocManager::GetNoHistoryFiles() const
-{
-    return GetHistoryFilesCount();
-}
-#endif // WXWIN_COMPATIBILITY_2_6
-
 // ----------------------------------------------------------------------------
 // Base class for child frames -- this is what wxView renders itself into
 //

include/wx/event.h

@@ -4305,13 +4305,6 @@ typedef void (wxEvtHandler::*wxClipboardTextEventFunction)(wxClipboardTextEvent&
     EVT_COMMAND_SCROLL_THUMBRELEASE(winid, func) \
     EVT_COMMAND_SCROLL_CHANGED(winid, func)
 
-#if WXWIN_COMPATIBILITY_2_6
-    // compatibility macros for the old name, deprecated in 2.8
-    #define wxEVT_SCROLL_ENDSCROLL wxEVT_SCROLL_CHANGED
-    #define EVT_COMMAND_SCROLL_ENDSCROLL EVT_COMMAND_SCROLL_CHANGED
-    #define EVT_SCROLL_ENDSCROLL EVT_SCROLL_CHANGED
-#endif // WXWIN_COMPATIBILITY_2_6
-
 // Convenience macros for commonly-used commands
 #define EVT_CHECKBOX(winid, func) wx__DECLARE_EVT1(wxEVT_CHECKBOX, winid, wxCommandEventHandler(func))
 #define EVT_CHOICE(winid, func) wx__DECLARE_EVT1(wxEVT_CHOICE, winid, wxCommandEventHandler(func))

include/wx/filedlg.h

@@ -49,18 +49,6 @@ enum
     wxFD_PREVIEW           = 0x0100
 };
 
-#if WXWIN_COMPATIBILITY_2_6
-enum
-{
-    wxOPEN              = wxFD_OPEN,
-    wxSAVE              = wxFD_SAVE,
-    wxOVERWRITE_PROMPT  = wxFD_OVERWRITE_PROMPT,
-    wxFILE_MUST_EXIST   = wxFD_FILE_MUST_EXIST,
-    wxMULTIPLE          = wxFD_MULTIPLE,
-    wxCHANGE_DIR        = wxFD_CHANGE_DIR
-};
-#endif
-
 #define wxFD_DEFAULT_STYLE      wxFD_OPEN
 
 extern WXDLLIMPEXP_DATA_CORE(const char) wxFileDialogNameStr[];
@@ -135,14 +123,6 @@ public:
 
     // Utility functions
 
-#if WXWIN_COMPATIBILITY_2_6
-
-    wxDEPRECATED( long GetStyle() const );
-    wxDEPRECATED( void SetStyle(long style) );
-
-#endif  // WXWIN_COMPATIBILITY_2_6
-
-
     // Append first extension to filePath from a ';' separated extensionList
     // if filePath = "path/foo.bar" just return it as is
     // if filePath = "foo[.]" and extensionList = "*.jpg;*.png" return "foo.jpg"

include/wx/filefn.h

@@ -641,15 +641,6 @@ WXDLLIMPEXP_BASE bool wxRemoveFile(const wxString& file);
 WXDLLIMPEXP_BASE bool wxRenameFile(const wxString& file1, const wxString& file2, bool overwrite = true);
 
 // Get current working directory.
-#if WXWIN_COMPATIBILITY_2_6
-// If buf is NULL, allocates space using new, else
-// copies into buf.
-// IMPORTANT NOTE getcwd is know not to work under some releases
-// of Win32s 1.3, according to MS release notes!
-wxDEPRECATED( WXDLLIMPEXP_BASE wxChar* wxGetWorkingDirectory(wxChar *buf = NULL, int sz = 1000) );
-// new and preferred version of wxGetWorkingDirectory
-// NB: can't have the same name because of overloading ambiguity
-#endif // WXWIN_COMPATIBILITY_2_6
 WXDLLIMPEXP_BASE wxString wxGetCwd();
 
 // Set working directory
@@ -665,15 +656,6 @@ WXDLLIMPEXP_BASE bool wxRmdir(const wxString& dir, int flags = 0);
 WXDLLIMPEXP_BASE wxFileKind wxGetFileKind(int fd);
 WXDLLIMPEXP_BASE wxFileKind wxGetFileKind(FILE *fp);
 
-#if WXWIN_COMPATIBILITY_2_6
-// compatibility defines, don't use in new code
-wxDEPRECATED( inline bool wxPathExists(const wxChar *pszPathName) );
-inline bool wxPathExists(const wxChar *pszPathName)
-{
-    return wxDirExists(pszPathName);
-}
-#endif //WXWIN_COMPATIBILITY_2_6
-
 // permissions; these functions work both on files and directories:
 WXDLLIMPEXP_BASE bool wxIsWritable(const wxString &path);
 WXDLLIMPEXP_BASE bool wxIsReadable(const wxString &path);
@@ -832,11 +814,6 @@ public:
 
     // Given full path and filename, add path to list
     bool EnsureFileAccessible(const wxString& path);
-
-#if WXWIN_COMPATIBILITY_2_6
-    // Returns true if the path is in the list
-    wxDEPRECATED( bool Member(const wxString& path) const );
-#endif
 };
 
 #endif // _WX_FILEFN_H_

include/wx/filehistory.h

@@ -60,11 +60,6 @@ public:
     void SetBaseId(wxWindowID baseId) { m_idBase = baseId; }
     wxWindowID GetBaseId() const { return m_idBase; }
 
-#if WXWIN_COMPATIBILITY_2_6
-    // deprecated, use GetCount() instead
-    wxDEPRECATED( size_t GetNoHistoryFiles() const );
-#endif // WXWIN_COMPATIBILITY_2_6
-
 protected:
     // Last n files
     wxArrayString     m_fileHistory;
@@ -86,14 +81,6 @@ private:
     wxDECLARE_NO_COPY_CLASS(wxFileHistoryBase);
 };
 
-#if WXWIN_COMPATIBILITY_2_6
-inline size_t wxFileHistoryBase::GetNoHistoryFiles() const
-{
-    return m_fileHistory.GetCount();
-}
-#endif // WXWIN_COMPATIBILITY_2_6
-
-
 #if defined(__WXGTK20__)
     #include "wx/gtk/filehistory.h"
 #else

include/wx/font.h

@@ -285,7 +285,7 @@ public:
     virtual ~wxFontBase();
 
 
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
+#if WXWIN_COMPATIBILITY_3_0
     // from the font components
     static wxFont *New(
         int pointSize,              // size of the font in points
@@ -475,19 +475,19 @@ WXDLLIMPEXP_CORE wxString wxToString(const wxFontBase& font);
 WXDLLIMPEXP_CORE bool wxFromString(const wxString& str, wxFontBase* font);
 
 
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
+#if WXWIN_COMPATIBILITY_3_0
 #define wxDECLARE_FONT_COMPAT_SETTER   \
-    wxDEPRECATED_FUTURE( void SetFamily(int family) ) \
+    wxDEPRECATED( void SetFamily(int family) ) \
         { SetFamily((wxFontFamily)family); } \
-    wxDEPRECATED_FUTURE( void SetStyle(int style) ) \
+    wxDEPRECATED( void SetStyle(int style) ) \
         { SetStyle((wxFontStyle)style); } \
-    wxDEPRECATED_FUTURE( void SetWeight(int weight) ) \
+    wxDEPRECATED( void SetWeight(int weight) ) \
         { SetWeight((wxFontWeight)weight); } \
-    wxDEPRECATED_FUTURE( void SetFamily(wxDeprecatedGUIConstants family) ) \
+    wxDEPRECATED( void SetFamily(wxDeprecatedGUIConstants family) ) \
         { SetFamily((wxFontFamily)family); } \
-    wxDEPRECATED_FUTURE( void SetStyle(wxDeprecatedGUIConstants style) ) \
+    wxDEPRECATED( void SetStyle(wxDeprecatedGUIConstants style) ) \
         { SetStyle((wxFontStyle)style); } \
-    wxDEPRECATED_FUTURE( void SetWeight(wxDeprecatedGUIConstants weight) ) \
+    wxDEPRECATED( void SetWeight(wxDeprecatedGUIConstants weight) ) \
         { SetWeight((wxFontWeight)weight); }
 #else
 #define wxDECLARE_FONT_COMPAT_SETTER  /*empty*/
@@ -546,7 +546,7 @@ public:
                              const wxString& face = wxEmptyString,
                              wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
 
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
+#if WXWIN_COMPATIBILITY_3_0
      wxFont *FindOrCreateFont(int pointSize, int family, int style, int weight,
                               bool underline = false,
                               const wxString& face = wxEmptyString,
@@ -554,11 +554,6 @@ public:
         { return FindOrCreateFont(pointSize, (wxFontFamily)family, (wxFontStyle)style,
                                   (wxFontWeight)weight, underline, face, encoding); }
 #endif
-
-#if WXWIN_COMPATIBILITY_2_6
-    wxDEPRECATED( void AddFont(wxFont*) );
-    wxDEPRECATED( void RemoveFont(wxFont*) );
-#endif
 };
 
 extern WXDLLIMPEXP_DATA_CORE(wxFontList*)    wxTheFontList;
@@ -570,7 +565,7 @@ extern WXDLLIMPEXP_DATA_CORE(wxFontList*)    wxTheFontList;
 //
 // to compile without warnings which it would otherwise provoke from some
 // compilers as it compares elements of different enums
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
+#if WXWIN_COMPATIBILITY_3_0
 
 // Unfortunately some compilers have ambiguity issues when enum comparisons are
 // overloaded so we have to disable the overloads in this case, see
@@ -592,7 +587,7 @@ inline bool operator!=(wxFontWeight s, wxDeprecatedGUIConstants t)
 
 #endif // // wxCOMPILER_NO_OVERLOAD_ON_ENUM
 
-#endif // FUTURE_WXWIN_COMPATIBILITY_3_0
+#endif // WXWIN_COMPATIBILITY_3_0
 
 #endif
     // _WX_FONT_H_BASE_

include/wx/fontdlg.h

@@ -40,13 +40,6 @@ public:
     const wxFontData& GetFontData() const { return m_fontData; }
     wxFontData& GetFontData() { return m_fontData; }
 
-#if WXWIN_COMPATIBILITY_2_6
-    // deprecated interface, for compatibility only, don't use
-    wxDEPRECATED( wxFontDialogBase(wxWindow *parent, const wxFontData *data) );
-
-    wxDEPRECATED( bool Create(wxWindow *parent, const wxFontData *data) );
-#endif // WXWIN_COMPATIBILITY_2_6
-
 protected:
     virtual bool DoCreate(wxWindow *parent) { m_parent = parent; return true; }
 
@@ -58,15 +51,6 @@ protected:
     wxDECLARE_NO_COPY_CLASS(wxFontDialogBase);
 };
 
-#if WXWIN_COMPATIBILITY_2_6
-    // deprecated interface, for compatibility only, don't use
-inline wxFontDialogBase::wxFontDialogBase(wxWindow *parent, const wxFontData *data)
-{ m_parent = parent; InitFontData(data); }
-
-inline bool wxFontDialogBase::Create(wxWindow *parent, const wxFontData *data)
-{ InitFontData(data); return Create(parent); }
-#endif // WXWIN_COMPATIBILITY_2_6
-
 // ----------------------------------------------------------------------------
 // platform-specific wxFontDialog implementation
 // ----------------------------------------------------------------------------

include/wx/gauge.h

@@ -27,11 +27,6 @@
 // Win32 only, is default (and only) on some other platforms
 #define wxGA_SMOOTH          0x0020
 
-#if WXWIN_COMPATIBILITY_2_6
-    // obsolete style
-    #define wxGA_PROGRESSBAR     0
-#endif // WXWIN_COMPATIBILITY_2_6
-
 // GTK and Mac always have native implementation of the indeterminate mode
 // wxMSW has native implementation only if comctl32.dll >= 6.00
 #if !defined(__WXGTK20__) && !defined(__WXMAC__) && !defined(__WXCOCOA__)

include/wx/gdicmn.h

@@ -808,13 +808,6 @@ public:
     // return true if the rectangle 'rect' is (not strictly) inside this rect
     bool Contains(const wxRect& rect) const;
 
-#if WXWIN_COMPATIBILITY_2_6
-    // use Contains() instead
-    wxDEPRECATED( bool Inside(int x, int y) const );
-    wxDEPRECATED( bool Inside(const wxPoint& pt) const );
-    wxDEPRECATED( bool Inside(const wxRect& rect) const );
-#endif // WXWIN_COMPATIBILITY_2_6
-
     // return true if the rectangles have a non empty intersection
     bool Intersects(const wxRect& rect) const;
 
@@ -861,16 +854,6 @@ WXDLLIMPEXP_CORE wxRect operator+(const wxRect& r1, const wxRect& r2);
 // intersections of two rectangles
 WXDLLIMPEXP_CORE wxRect operator*(const wxRect& r1, const wxRect& r2);
 
-
-
-
-#if WXWIN_COMPATIBILITY_2_6
-inline bool wxRect::Inside(int cx, int cy) const { return Contains(cx, cy); }
-inline bool wxRect::Inside(const wxPoint& pt) const { return Contains(pt); }
-inline bool wxRect::Inside(const wxRect& rect) const { return Contains(rect); }
-#endif // WXWIN_COMPATIBILITY_2_6
-
-
 // define functions which couldn't be defined above because of declarations
 // order
 inline void wxSize::IncBy(const wxPoint& pt) { IncBy(pt.x, pt.y); }
@@ -906,12 +889,6 @@ public:
     // add a new colour to the database
     void AddColour(const wxString& name, const wxColour& colour);
 
-#if WXWIN_COMPATIBILITY_2_6
-    // deprecated, use Find() instead
-    wxDEPRECATED( wxColour *FindColour(const wxString& name) );
-#endif // WXWIN_COMPATIBILITY_2_6
-
-
 #ifdef __WXPM__
     // PM keeps its own type of colour table
     long*                           m_palTable;

include/wx/generic/dragimgg.h

@@ -121,18 +121,6 @@ public:
         Create(str, cursor);
     }
 
-#if WXWIN_COMPATIBILITY_2_6
-    // don't use in new code, use versions without hot spot parameter
-    wxDEPRECATED( wxGenericDragImage(const wxCursor& cursor, const wxPoint& cursorHotspot) );
-    wxDEPRECATED( wxGenericDragImage(const wxBitmap& image, const wxCursor& cursor, const wxPoint& cursorHotspot) );
-    wxDEPRECATED( wxGenericDragImage(const wxIcon& image, const wxCursor& cursor, const wxPoint& cursorHotspot) );
-    wxDEPRECATED( wxGenericDragImage(const wxString& str, const wxCursor& cursor, const wxPoint& cursorHotspot) );
-    wxDEPRECATED( bool Create(const wxCursor& cursor, const wxPoint& cursorHotspot) );
-    wxDEPRECATED( bool Create(const wxBitmap& image, const wxCursor& cursor, const wxPoint& cursorHotspot) );
-    wxDEPRECATED( bool Create(const wxIcon& image, const wxCursor& cursor, const wxPoint& cursorHotspot) );
-    wxDEPRECATED( bool Create(const wxString& str, const wxCursor& cursor, const wxPoint& cursorHotspot) );
-#endif // WXWIN_COMPATIBILITY_2_6
-
 #if wxUSE_TREECTRL
     wxGenericDragImage(const wxTreeCtrl& treeCtrl, wxTreeItemId& id)
     {

include/wx/generic/fontdlgg.h

@@ -52,11 +52,6 @@ public:
 
     virtual int ShowModal();
 
-#if WXWIN_COMPATIBILITY_2_6
-    // deprecated, for backwards compatibility only
-    wxDEPRECATED( wxGenericFontDialog(wxWindow *parent, const wxFontData *data) );
-#endif // WXWIN_COMPATIBILITY_2_6
-
     // Internal functions
     void OnCloseWindow(wxCloseEvent& event);
 
@@ -100,10 +95,4 @@ private:
     DECLARE_DYNAMIC_CLASS(wxGenericFontDialog)
 };
 
-#if WXWIN_COMPATIBILITY_2_6
-    // deprecated, for backwards compatibility only
-inline wxGenericFontDialog::wxGenericFontDialog(wxWindow *parent, const wxFontData *data)
-                           :wxFontDialogBase(parent) { Init(); InitFontData(data); Create(parent); }
-#endif // WXWIN_COMPATIBILITY_2_6
-
 #endif // _WX_GENERIC_FONTDLGG_H

include/wx/generic/listctrl.h

@@ -145,12 +145,6 @@ public:
 
     virtual void EnableBellOnNoMatch(bool on = true);
 
-#if WXWIN_COMPATIBILITY_2_6
-    // obsolete, don't use
-    wxDEPRECATED( int GetItemSpacing( bool isSmall ) const );
-#endif // WXWIN_COMPATIBILITY_2_6
-
-
     // overridden base class virtuals
     // ------------------------------
 

include/wx/generic/sashwin.h

@@ -40,15 +40,9 @@ class WXDLLIMPEXP_ADV wxSashEdge
 public:
     wxSashEdge()
     { m_show = false;
-#if WXWIN_COMPATIBILITY_2_6
-      m_border = false;
-#endif
       m_margin = 0; }
 
     bool    m_show;     // Is the sash showing?
-#if WXWIN_COMPATIBILITY_2_6
-    bool    m_border;   // Do we draw a border?
-#endif
     int     m_margin;   // The margin size
 };
 
@@ -97,16 +91,6 @@ public:
     // Get whether there's a sash in this position
     bool GetSashVisible(wxSashEdgePosition edge) const { return m_sashes[edge].m_show; }
 
-#if WXWIN_COMPATIBILITY_2_6
-    // Set whether there's a border in this position
-    // This value is unused in wxSashWindow.
-    void SetSashBorder(wxSashEdgePosition edge, bool border) { m_sashes[edge].m_border = border; }
-
-    // Get whether there's a border in this position
-    // This value is unused in wxSashWindow.
-    bool HasBorder(wxSashEdgePosition edge) const { return m_sashes[edge].m_border; }
-#endif
-
     // Get border size
     int GetEdgeMargin(wxSashEdgePosition edge) const { return m_sashes[edge].m_margin; }
 

include/wx/generic/treectlg.h

@@ -191,11 +191,6 @@ public:
 
     wxTreeItemId GetNext(const wxTreeItemId& item) const;
 
-#if WXWIN_COMPATIBILITY_2_6
-    // use EditLabel() instead
-    void Edit( const wxTreeItemId& item ) { EditLabel(item); }
-#endif // WXWIN_COMPATIBILITY_2_6
-
     // implementation only from now on
 
     // overridden base class virtuals

include/wx/gtk/brush.h

@@ -22,8 +22,8 @@ public:
     wxBrush() { }
 
     wxBrush( const wxColour &colour, wxBrushStyle style = wxBRUSHSTYLE_SOLID );
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
+#if WXWIN_COMPATIBILITY_3_0
-    wxDEPRECATED_FUTURE( wxBrush(const wxColour& col, int style) );
+    wxDEPRECATED( wxBrush(const wxColour& col, int style) );
 #endif
     wxBrush( const wxBitmap &stippleBitmap );
     virtual ~wxBrush();
@@ -40,8 +40,8 @@ public:
     void SetStyle( wxBrushStyle style );
     void SetStipple( const wxBitmap& stipple );
 
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
+#if WXWIN_COMPATIBILITY_3_0
-    wxDEPRECATED_FUTURE( void SetStyle(int style) )
+    wxDEPRECATED( void SetStyle(int style) )
         { SetStyle((wxBrushStyle)style); }
 #endif
 

include/wx/gtk/font.h

@@ -27,7 +27,7 @@ public:
 
     wxFont(const wxNativeFontInfo& info);
 
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
+#if WXWIN_COMPATIBILITY_3_0
     wxFont(int size,
            int family,
            int style,

include/wx/gtk/fontdlg.h

@@ -25,11 +25,6 @@ public:
 
     virtual ~wxFontDialog();
 
-#if WXWIN_COMPATIBILITY_2_6
-    // deprecated interface, don't use
-    wxDEPRECATED( wxFontDialog(wxWindow *parent, const wxFontData *data) );
-#endif // WXWIN_COMPATIBILITY_2_6
-
 protected:
     // create the GTK dialog
     virtual bool DoCreate(wxWindow *parent);
@@ -37,10 +32,4 @@ protected:
     DECLARE_DYNAMIC_CLASS(wxFontDialog)
 };
 
-#if WXWIN_COMPATIBILITY_2_6
-    // deprecated interface, don't use
-inline wxFontDialog::wxFontDialog(wxWindow *parent, const wxFontData *data)
-        : wxFontDialogBase(parent) { InitFontData(data); Create(parent); }
-#endif // WXWIN_COMPATIBILITY_2_6
-
 #endif

include/wx/gtk/pen.h

@@ -21,8 +21,8 @@ public:
     wxPen() { }
 
     wxPen( const wxColour &colour, int width = 1, wxPenStyle style = wxPENSTYLE_SOLID );
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
+#if WXWIN_COMPATIBILITY_3_0
-    wxDEPRECATED_FUTURE( wxPen(const wxColour& col, int width, int style) );
+    wxDEPRECATED( wxPen(const wxColour& col, int width, int style) );
 #endif
 
     virtual ~wxPen();
@@ -49,8 +49,8 @@ public:
     wxDash* GetDash() const;
     wxBitmap *GetStipple() const;
 
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
+#if WXWIN_COMPATIBILITY_3_0
-    wxDEPRECATED_FUTURE( void SetStyle(int style) )
+    wxDEPRECATED( void SetStyle(int style) )
         { SetStyle((wxPenStyle)style); }
 #endif
 

include/wx/gtk/setup0.h

@@ -26,16 +26,6 @@
 // compatibility settings
 // ----------------------------------------------------------------------------
 
-// This setting determines the compatibility with 2.6 API: set it to 0 to
-// flag all cases of using deprecated functions.
-//
-// Default is 1 but please try building your code with 0 as the default will
-// change to 0 in the next version and the deprecated functions will disappear
-// in the version after it completely.
-//
-// Recommended setting: 0 (please update your code)
-#define WXWIN_COMPATIBILITY_2_6 0
-
 // This setting determines the compatibility with 2.8 API: set it to 0 to
 // flag all cases of using deprecated functions.
 //
@@ -44,7 +34,17 @@
 // in the version after it completely.
 //
 // Recommended setting: 0 (please update your code)
-#define WXWIN_COMPATIBILITY_2_8 1
+#define WXWIN_COMPATIBILITY_2_8 0
+
+// This setting determines the compatibility with 3.0 API: set it to 0 to
+// flag all cases of using deprecated functions.
+//
+// Default is 1 but please try building your code with 0 as the default will
+// change to 0 in the next version and the deprecated functions will disappear
+// in the version after it completely.
+//
+// Recommended setting: 0 (please update your code)
+#define WXWIN_COMPATIBILITY_3_0 1
 
 // MSW-only: Set to 0 for accurate dialog units, else 1 for old behaviour when
 // default system font is used for wxWindow::GetCharWidth/Height() instead of

include/wx/gtk1/brush.h

@@ -32,8 +32,8 @@ public:
     wxBrush() { }
 
     wxBrush( const wxColour &colour, wxBrushStyle style = wxBRUSHSTYLE_SOLID );
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
+#if WXWIN_COMPATIBILITY_3_0
-    wxDEPRECATED_FUTURE( wxBrush(const wxColour& col, int style) );
+    wxDEPRECATED( wxBrush(const wxColour& col, int style) );
 #endif
     wxBrush( const wxBitmap &stippleBitmap );
     virtual ~wxBrush();
@@ -50,8 +50,8 @@ public:
     void SetStyle( wxBrushStyle style );
     void SetStipple( const wxBitmap& stipple );
 
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
+#if WXWIN_COMPATIBILITY_3_0
-    wxDEPRECATED_FUTURE( void SetStyle(int style) )
+    wxDEPRECATED( void SetStyle(int style) )
         { SetStyle((wxBrushStyle)style); }
 #endif
 

include/wx/gtk1/font.h

@@ -52,7 +52,7 @@ public:
 
     wxFont(const wxNativeFontInfo& info);
 
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
+#if WXWIN_COMPATIBILITY_3_0
     wxFont(int size,
            int family,
            int style,

include/wx/gtk1/fontdlg.h

@@ -28,11 +28,6 @@ public:
     // implementation only
     void SetChosenFont(const char *name);
 
-#if WXWIN_COMPATIBILITY_2_6
-    // deprecated interface, don't use
-    wxDEPRECATED( wxFontDialog(wxWindow *parent, const wxFontData *data) );
-#endif // WXWIN_COMPATIBILITY_2_6
-
 protected:
     // create the GTK dialog
     virtual bool DoCreate(wxWindow *parent);
@@ -41,10 +36,4 @@ private:
     DECLARE_DYNAMIC_CLASS(wxFontDialog)
 };
 
-#if WXWIN_COMPATIBILITY_2_6
-    // deprecated interface, don't use
-inline wxFontDialog::wxFontDialog(wxWindow *parent, const wxFontData *data)
-        : wxFontDialogBase(parent) { InitFontData(data); Create(parent); }
-#endif // WXWIN_COMPATIBILITY_2_6
-
 #endif

include/wx/gtk1/pen.h

@@ -37,8 +37,8 @@ public:
     wxPen() { }
 
     wxPen( const wxColour &colour, int width = 1, wxPenStyle style = wxPENSTYLE_SOLID );
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
+#if WXWIN_COMPATIBILITY_3_0
-    wxDEPRECATED_FUTURE( wxPen(const wxColour& col, int width, int style) );
+    wxDEPRECATED( wxPen(const wxColour& col, int width, int style) );
 #endif
 
     bool operator==(const wxPen& pen) const;
@@ -63,8 +63,8 @@ public:
     wxDash* GetDash() const;
     wxBitmap *GetStipple() const;
 
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
+#if WXWIN_COMPATIBILITY_3_0
-    wxDEPRECATED_FUTURE( void SetStyle(int style) )
+    wxDEPRECATED( void SetStyle(int style) )
         { SetStyle((wxPenStyle)style); }
 #endif
 

include/wx/gtk1/treectrl.h

@@ -62,14 +62,6 @@ static const int wxTREE_HITTEST_ONITEM  = wxTREE_HITTEST_ONITEMICON |
                                           wxTREE_HITTEST_ONITEMLABEL |
                                           wxTREE_HITTEST_ONITEMSTATEICON;
 
-#if WXWIN_COMPATIBILITY_2_6
-    // NB: all the following flags are for compatbility only and will be removed in
-    //     next versions
-    // flags for deprecated InsertItem() variant
-    #define wxTREE_INSERT_FIRST 0xFFFF0001
-    #define wxTREE_INSERT_LAST  0xFFFF0002
-#endif
-
 // ----------------------------------------------------------------------------
 // wxTreeItemId identifies an element of the tree. In this implementation, it's
 // just a trivial wrapper around GTK GtkTreeItem *. It's opaque for the
@@ -331,39 +323,6 @@ public:
     void SortChildren(const wxTreeItemId& item,
                       wxTreeItemCmpFunc *cmpFunction = NULL);
 
-    // deprecated
-    // ----------
-
-#if WXWIN_COMPATIBILITY_2_6
-    // these methods are deprecated and will be removed in future versions of
-    // wxWidgets, they're here for compatibility only, don't use them in new
-    // code (the comments indicate why these methods are now useless and how to
-    // replace them)
-
-        // use Expand, Collapse, CollapseAndReset or Toggle
-    wxDEPRECATED( void ExpandItem(const wxTreeItemId& item, int action) );
-
-        // use SetImageList
-    wxDEPRECATED( void SetImageList(wxImageList *imageList, int) )
-        { SetImageList(imageList); }
-
-        // use Set/GetItemImage directly
-    wxDEPRECATED( int GetItemSelectedImage(const wxTreeItemId& item) const );
-    wxDEPRECATED( void SetItemSelectedImage(const wxTreeItemId& item, int image) );
-
-        // get the first child of this item
-    wxDEPRECATED( wxTreeItemId GetFirstChild(const wxTreeItemId& item, long& cookie) const );
-        // get the next child (after GetFirstChild or GetNextChild)
-    wxDEPRECATED( wxTreeItemId GetNextChild(const wxTreeItemId& item, long& cookie) const );
-
-        // use AddRoot, PrependItem or AppendItem
-    wxDEPRECATED( wxTreeItemId InsertItem(const wxTreeItemId& parent,
-                                          const wxString& text,
-                                          int image = -1, int selImage = -1,
-                                          long insertAfter = wxTREE_INSERT_LAST) );
-
-#endif // WXWIN_COMPATIBILITY_2_6
-
         // use Set/GetImageList and Set/GetStateImageList
     wxImageList *GetImageList(int) const
         { return GetImageList(); }

include/wx/html/htmlcell.h

@@ -217,11 +217,6 @@ public:
     virtual wxCursor GetMouseCursorAt(wxHtmlWindowInterface *window,
                                       const wxPoint& relPos) const;
 
-#if WXWIN_COMPATIBILITY_2_6
-    // this was replaced by GetMouseCursor, don't use in new code!
-    virtual wxCursor GetCursor() const;
-#endif
-
     // return next cell among parent's cells
     wxHtmlCell *GetNext() const {return m_Next;}
     // returns first child cell (if there are any, i.e. if this is container):
@@ -275,12 +270,6 @@ public:
                                    const wxPoint& pos,
                                    const wxMouseEvent& event);
 
-#if WXWIN_COMPATIBILITY_2_6
-    // this was replaced by ProcessMouseClick, don't use in new code!
-    virtual void OnMouseClick(wxWindow *window,
-                              int x, int y, const wxMouseEvent& event);
-#endif
-
     // This method used to adjust pagebreak position. The parameter is variable
     // that contains y-coordinate of page break (= horizontal line that should
     // not be crossed by words, images etc.). If this cell cannot be divided
@@ -492,11 +481,6 @@ public:
     virtual wxHtmlLinkInfo* GetLink(int x = 0, int y = 0) const;
     virtual const wxHtmlCell* Find(int condition, const void* param) const;
 
-#if WXWIN_COMPATIBILITY_2_6
-    // this was replaced by ProcessMouseClick, don't use in new code!
-    virtual void OnMouseClick(wxWindow *window,
-                              int x, int y, const wxMouseEvent& event);
-#endif
     virtual bool ProcessMouseClick(wxHtmlWindowInterface *window,
                                    const wxPoint& pos,
                                    const wxMouseEvent& event);

include/wx/html/winpars.h

@@ -66,10 +66,6 @@ public:
 
     // returns interface to the rendering window
     wxHtmlWindowInterface *GetWindowInterface() {return m_windowInterface;}
-#if WXWIN_COMPATIBILITY_2_6
-    // deprecated, use GetWindowInterface()->GetHTMLWindow() instead
-    wxDEPRECATED( wxHtmlWindow *GetWindow() );
-#endif
 
     // Sets fonts to be used when displaying HTML page. (if size null then default sizes used).
     void SetFonts(const wxString& normal_face, const wxString& fixed_face, const int *sizes = NULL);

include/wx/log.h

@@ -564,13 +564,6 @@ public:
     // this method exists for backwards compatibility only, don't use
     bool HasPendingMessages() const { return true; }
 
-#if WXWIN_COMPATIBILITY_2_6
-    // this function doesn't do anything any more, don't call it
-    static wxDEPRECATED_INLINE(
-        wxChar *SetLogBuffer(wxChar *, size_t = 0), return NULL;
-    );
-#endif // WXWIN_COMPATIBILITY_2_6
-
     // don't use integer masks any more, use string trace masks instead
 #if WXWIN_COMPATIBILITY_2_8
     static wxDEPRECATED_INLINE( void SetTraceMask(wxTraceMask ulMask),

include/wx/motif/font.h

@@ -43,7 +43,7 @@ public:
 
     wxFont(const wxNativeFontInfo& info);
 
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
+#if WXWIN_COMPATIBILITY_3_0
     wxFont(int size,
            int family,
            int style,

include/wx/motif/setup0.h

@@ -26,16 +26,6 @@
 // compatibility settings
 // ----------------------------------------------------------------------------
 
-// This setting determines the compatibility with 2.6 API: set it to 0 to
-// flag all cases of using deprecated functions.
-//
-// Default is 1 but please try building your code with 0 as the default will
-// change to 0 in the next version and the deprecated functions will disappear
-// in the version after it completely.
-//
-// Recommended setting: 0 (please update your code)
-#define WXWIN_COMPATIBILITY_2_6 0
-
 // This setting determines the compatibility with 2.8 API: set it to 0 to
 // flag all cases of using deprecated functions.
 //
@@ -44,7 +34,17 @@
 // in the version after it completely.
 //
 // Recommended setting: 0 (please update your code)
-#define WXWIN_COMPATIBILITY_2_8 1
+#define WXWIN_COMPATIBILITY_2_8 0
+
+// This setting determines the compatibility with 3.0 API: set it to 0 to
+// flag all cases of using deprecated functions.
+//
+// Default is 1 but please try building your code with 0 as the default will
+// change to 0 in the next version and the deprecated functions will disappear
+// in the version after it completely.
+//
+// Recommended setting: 0 (please update your code)
+#define WXWIN_COMPATIBILITY_3_0 1
 
 // MSW-only: Set to 0 for accurate dialog units, else 1 for old behaviour when
 // default system font is used for wxWindow::GetCharWidth/Height() instead of

include/wx/mstream.h

@@ -44,11 +44,6 @@ public:
 
     wxStreamBuffer *GetInputStreamBuffer() const { return m_i_streambuf; }
 
-#if WXWIN_COMPATIBILITY_2_6
-    // deprecated, compatibility only
-    wxDEPRECATED( wxStreamBuffer *InputStreamBuffer() const );
-#endif // WXWIN_COMPATIBILITY_2_6
-
 protected:
     wxStreamBuffer *m_i_streambuf;
 
@@ -80,11 +75,6 @@ public:
 
     wxStreamBuffer *GetOutputStreamBuffer() const { return m_o_streambuf; }
 
-#if WXWIN_COMPATIBILITY_2_6
-    // deprecated, compatibility only
-    wxDEPRECATED( wxStreamBuffer *OutputStreamBuffer() const );
-#endif // WXWIN_COMPATIBILITY_2_6
-
 protected:
     wxStreamBuffer *m_o_streambuf;
 
@@ -97,11 +87,6 @@ protected:
     wxDECLARE_NO_COPY_CLASS(wxMemoryOutputStream);
 };
 
-#if WXWIN_COMPATIBILITY_2_6
-    inline wxStreamBuffer *wxMemoryInputStream::InputStreamBuffer() const { return m_i_streambuf; }
-    inline wxStreamBuffer *wxMemoryOutputStream::OutputStreamBuffer() const { return m_o_streambuf; }
-#endif // WXWIN_COMPATIBILITY_2_6
-
 #endif
   // wxUSE_STREAMS
 

include/wx/msw/brush.h

@@ -24,8 +24,8 @@ class WXDLLIMPEXP_CORE wxBrush : public wxBrushBase
 public:
     wxBrush();
     wxBrush(const wxColour& col, wxBrushStyle style = wxBRUSHSTYLE_SOLID);
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
+#if WXWIN_COMPATIBILITY_3_0
-    wxDEPRECATED_FUTURE( wxBrush(const wxColour& col, int style) );
+    wxDEPRECATED( wxBrush(const wxColour& col, int style) );
 #endif
     wxBrush(const wxBitmap& stipple);
     virtual ~wxBrush();
@@ -42,8 +42,8 @@ public:
     wxBrushStyle GetStyle() const;
     wxBitmap *GetStipple() const;
 
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
+#if WXWIN_COMPATIBILITY_3_0
-    wxDEPRECATED_FUTURE( void SetStyle(int style) )
+    wxDEPRECATED( void SetStyle(int style) )
         { SetStyle((wxBrushStyle)style); }
 #endif
 

include/wx/msw/font.h

@@ -25,7 +25,7 @@ public:
 
     wxFont(const wxFontInfo& info);
 
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
+#if WXWIN_COMPATIBILITY_3_0
     wxFont(int size,
            int family,
            int style,
@@ -61,7 +61,7 @@ public:
                         weight, underlined, face, encoding);
     }
 
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
+#if WXWIN_COMPATIBILITY_3_0
     wxFont(const wxSize& pixelSize,
            int family,
            int style,

include/wx/msw/fontdlg.h

@@ -26,20 +26,9 @@ public:
 
     virtual int ShowModal();
 
-#if WXWIN_COMPATIBILITY_2_6
-    // deprecated interface, don't use
-    wxDEPRECATED( wxFontDialog(wxWindow *parent, const wxFontData *data) );
-#endif // WXWIN_COMPATIBILITY_2_6
-
 protected:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxFontDialog)
 };
 
-#if WXWIN_COMPATIBILITY_2_6
-    // deprecated interface, don't use
-inline wxFontDialog::wxFontDialog(wxWindow *parent, const wxFontData *data)
-        : wxFontDialogBase(parent) { InitFontData(data); Create(parent); }
-#endif // WXWIN_COMPATIBILITY_2_6
-
 #endif
     // _WX_MSW_FONTDLG_H_

include/wx/msw/listctrl.h

@@ -365,12 +365,6 @@ public:
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
-
-#if WXWIN_COMPATIBILITY_2_6
-    // obsolete stuff, for compatibility only -- don't use
-    wxDEPRECATED( int GetItemSpacing(bool isSmall) const);
-#endif // WXWIN_COMPATIBILITY_2_6
-
     // convert our styles to Windows
     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
 

include/wx/msw/pen.h

@@ -23,8 +23,8 @@ class WXDLLIMPEXP_CORE wxPen : public wxPenBase
 public:
     wxPen() { }
     wxPen(const wxColour& col, int width = 1, wxPenStyle style = wxPENSTYLE_SOLID);
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
+#if WXWIN_COMPATIBILITY_3_0
-    wxDEPRECATED_FUTURE( wxPen(const wxColour& col, int width, int style) );
+    wxDEPRECATED( wxPen(const wxColour& col, int width, int style) );
 #endif
 
     wxPen(const wxBitmap& stipple, int width);
@@ -54,8 +54,8 @@ public:
     int GetDashCount() const;
     wxBitmap* GetStipple() const;
 
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
+#if WXWIN_COMPATIBILITY_3_0
-    wxDEPRECATED_FUTURE( void SetStyle(int style) )
+    wxDEPRECATED( void SetStyle(int style) )
         { SetStyle((wxPenStyle)style); }
 #endif
 

include/wx/msw/setup0.h

@@ -26,16 +26,6 @@
 // compatibility settings
 // ----------------------------------------------------------------------------
 
-// This setting determines the compatibility with 2.6 API: set it to 0 to
-// flag all cases of using deprecated functions.
-//
-// Default is 1 but please try building your code with 0 as the default will
-// change to 0 in the next version and the deprecated functions will disappear
-// in the version after it completely.
-//
-// Recommended setting: 0 (please update your code)
-#define WXWIN_COMPATIBILITY_2_6 0
-
 // This setting determines the compatibility with 2.8 API: set it to 0 to
 // flag all cases of using deprecated functions.
 //
@@ -44,7 +34,17 @@
 // in the version after it completely.
 //
 // Recommended setting: 0 (please update your code)
-#define WXWIN_COMPATIBILITY_2_8 1
+#define WXWIN_COMPATIBILITY_2_8 0
+
+// This setting determines the compatibility with 3.0 API: set it to 0 to
+// flag all cases of using deprecated functions.
+//
+// Default is 1 but please try building your code with 0 as the default will
+// change to 0 in the next version and the deprecated functions will disappear
+// in the version after it completely.
+//
+// Recommended setting: 0 (please update your code)
+#define WXWIN_COMPATIBILITY_3_0 1
 
 // MSW-only: Set to 0 for accurate dialog units, else 1 for old behaviour when
 // default system font is used for wxWindow::GetCharWidth/Height() instead of

include/wx/msw/treectrl.h

@@ -33,15 +33,6 @@ class  WXDLLIMPEXP_FWD_CORE wxImageList;
 class  WXDLLIMPEXP_FWD_CORE wxDragImage;
 struct WXDLLIMPEXP_FWD_CORE wxTreeViewItem;
 
-#if WXWIN_COMPATIBILITY_2_6
-    // NB: all the following flags are for compatbility only and will be removed in the
-    //     next versions
-    // flags for deprecated InsertItem() variant (their values are the same as of
-    // TVI_FIRST and TVI_LAST)
-    #define wxTREE_INSERT_FIRST 0xFFFF0001
-    #define wxTREE_INSERT_LAST  0xFFFF0002
-#endif
-
 // hash storing attributes for our items
 WX_DECLARE_EXPORTED_VOIDPTR_HASH_MAP(wxTreeItemAttr *, wxMapTreeAttr);
 

include/wx/msw/wince/setup.h

@@ -26,16 +26,6 @@
 // compatibility settings
 // ----------------------------------------------------------------------------
 
-// This setting determines the compatibility with 2.6 API: set it to 0 to
-// flag all cases of using deprecated functions.
-//
-// Default is 1 but please try building your code with 0 as the default will
-// change to 0 in the next version and the deprecated functions will disappear
-// in the version after it completely.
-//
-// Recommended setting: 0 (please update your code)
-#define WXWIN_COMPATIBILITY_2_6 0
-
 // This setting determines the compatibility with 2.8 API: set it to 0 to
 // flag all cases of using deprecated functions.
 //
@@ -44,7 +34,17 @@
 // in the version after it completely.
 //
 // Recommended setting: 0 (please update your code)
-#define WXWIN_COMPATIBILITY_2_8 1
+#define WXWIN_COMPATIBILITY_2_8 0
+
+// This setting determines the compatibility with 3.0 API: set it to 0 to
+// flag all cases of using deprecated functions.
+//
+// Default is 1 but please try building your code with 0 as the default will
+// change to 0 in the next version and the deprecated functions will disappear
+// in the version after it completely.
+//
+// Recommended setting: 0 (please update your code)
+#define WXWIN_COMPATIBILITY_3_0 1
 
 // MSW-only: Set to 0 for accurate dialog units, else 1 for old behaviour when
 // default system font is used for wxWindow::GetCharWidth/Height() instead of

include/wx/os2/brush.h

@@ -19,8 +19,8 @@ class WXDLLIMPEXP_CORE wxBrush: public wxBrushBase
 public:
     wxBrush();
     wxBrush(const wxColour& rCol, wxBrushStyle nStyle = wxBRUSHSTYLE_SOLID);
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
+#if WXWIN_COMPATIBILITY_3_0
-    wxDEPRECATED_FUTURE( wxBrush(const wxColour& col, int style) );
+    wxDEPRECATED( wxBrush(const wxColour& col, int style) );
 #endif
     wxBrush(const wxBitmap& rStipple);
     virtual ~wxBrush();
@@ -39,8 +39,8 @@ public:
     wxBitmap* GetStipple(void) const;
     int       GetPS(void) const;
 
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
+#if WXWIN_COMPATIBILITY_3_0
-    wxDEPRECATED_FUTURE( void SetStyle(int style) )
+    wxDEPRECATED( void SetStyle(int style) )
         { SetStyle((wxBrushStyle)style); }
 #endif
 

include/wx/os2/dialog.h

@@ -71,28 +71,6 @@ public:
                                   ,WXWPARAM wParam
                                   ,WXLPARAM lParam
                                  );
-#if WXWIN_COMPATIBILITY_2_6
-
-    // Constructor with a modal flag, but no window id - the old convention
-    wxDEPRECATED( wxDialog( wxWindow*       pParent
-                           ,const wxString& rsTitle
-                           ,bool            bModal
-                           ,int             nX = -1
-                           ,int             nY = -1
-                           ,int             nWidth = 500
-                           ,int             nHeight = 500
-                           ,long            lStyle = wxDEFAULT_DIALOG_STYLE
-                           ,const wxString& rsName = wxDialogNameStr
-                          ) );
-
-    // just call Show() or ShowModal()
-    wxDEPRECATED( void SetModal(bool bFlag) );
-
-    // use IsModal()
-    wxDEPRECATED( bool IsModalShowing() const );
-
-#endif // WXWIN_COMPATIBILITY_2_6
-
 protected:
     //
     // Common part of all ctors

include/wx/os2/font.h

@@ -40,7 +40,7 @@ public:
             SetPixelSize(info.GetPixelSize());
     }
 
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
+#if WXWIN_COMPATIBILITY_3_0
     wxFont(int size,
            int family,
            int style,

include/wx/os2/fontdlg.h

@@ -37,22 +37,9 @@ public:
 
     virtual int ShowModal();
 
-#if WXWIN_COMPATIBILITY_2_6
-    //
-    // Deprecated interface, don't use
-    //
-    wxDEPRECATED( wxFontDialog( wxWindow* pParent, const wxFontData* pData ) );
-#endif // WXWIN_COMPATIBILITY_2_6
-
 protected:
     DECLARE_DYNAMIC_CLASS(wxFontDialog)
 }; // end of CLASS wxFontDialog
 
-#if WXWIN_COMPATIBILITY_2_6
-    // deprecated interface, don't use
-inline wxFontDialog::wxFontDialog(wxWindow *parent, const wxFontData *data)
-        : wxFontDialogBase(parent) { InitFontData(data); Create(parent); }
-#endif // WXWIN_COMPATIBILITY_2_6
-
 #endif
     // _WX_FONTDLG_H_

include/wx/os2/pen.h

@@ -28,8 +28,8 @@ public:
           ,int             nWidth = 1
           ,wxPenStyle      nStyle = wxPENSTYLE_SOLID
          );
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
+#if WXWIN_COMPATIBILITY_3_0
-    wxDEPRECATED_FUTURE( wxPen(const wxColour& col, int width, int style) );
+    wxDEPRECATED( wxPen(const wxColour& col, int width, int style) );
 #endif
 
     wxPen( const wxBitmap& rStipple
@@ -68,8 +68,8 @@ public:
     int       GetDashCount() const;
     wxBitmap* GetStipple(void) const;
 
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
+#if WXWIN_COMPATIBILITY_3_0
-    wxDEPRECATED_FUTURE( void SetStyle(int style) )
+    wxDEPRECATED( void SetStyle(int style) )
         { SetStyle((wxPenStyle)style); }
 #endif
 

include/wx/os2/setup0.h

@@ -26,16 +26,6 @@
 // compatibility settings
 // ----------------------------------------------------------------------------
 
-// This setting determines the compatibility with 2.6 API: set it to 0 to
-// flag all cases of using deprecated functions.
-//
-// Default is 1 but please try building your code with 0 as the default will
-// change to 0 in the next version and the deprecated functions will disappear
-// in the version after it completely.
-//
-// Recommended setting: 0 (please update your code)
-#define WXWIN_COMPATIBILITY_2_6 0
-
 // This setting determines the compatibility with 2.8 API: set it to 0 to
 // flag all cases of using deprecated functions.
 //
@@ -44,7 +34,17 @@
 // in the version after it completely.
 //
 // Recommended setting: 0 (please update your code)
-#define WXWIN_COMPATIBILITY_2_8 1
+#define WXWIN_COMPATIBILITY_2_8 0
+
+// This setting determines the compatibility with 3.0 API: set it to 0 to
+// flag all cases of using deprecated functions.
+//
+// Default is 1 but please try building your code with 0 as the default will
+// change to 0 in the next version and the deprecated functions will disappear
+// in the version after it completely.
+//
+// Recommended setting: 0 (please update your code)
+#define WXWIN_COMPATIBILITY_3_0 1
 
 // MSW-only: Set to 0 for accurate dialog units, else 1 for old behaviour when
 // default system font is used for wxWindow::GetCharWidth/Height() instead of

include/wx/os2/treectrl.h

@@ -35,12 +35,6 @@ struct WXDLLIMPEXP_FWD_CORE wxTreeViewItem;
 // they're equivalent
 class wxTreeItemData;
 
-#if WXWIN_COMPATIBILITY_2_6
-    // flags for deprecated InsertItem() variant
-    #define wxTREE_INSERT_FIRST 0xFFFF0001
-    #define wxTREE_INSERT_LAST  0xFFFF0002
-#endif
-
 // hash storing attributes for our items
 WX_DECLARE_EXPORTED_VOIDPTR_HASH_MAP(wxTreeItemAttr *, wxMapTreeAttr);
 

include/wx/osx/brush.h

@@ -23,8 +23,8 @@ class WXDLLIMPEXP_CORE wxBrush: public wxBrushBase
 public:
     wxBrush();
     wxBrush(const wxColour& col, wxBrushStyle style = wxBRUSHSTYLE_SOLID);
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
+#if WXWIN_COMPATIBILITY_3_0
-    wxDEPRECATED_FUTURE( wxBrush(const wxColour& col, int style) );
+    wxDEPRECATED( wxBrush(const wxColour& col, int style) );
 #endif
     wxBrush(const wxBitmap& stipple);
     virtual ~wxBrush();
@@ -41,8 +41,8 @@ public:
     wxBrushStyle GetStyle() const ;
     wxBitmap *GetStipple() const ;
 
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
+#if WXWIN_COMPATIBILITY_3_0
-    wxDEPRECATED_FUTURE( void SetStyle(int style) )
+    wxDEPRECATED( void SetStyle(int style) )
         { SetStyle((wxBrushStyle)style); }
 #endif
 

include/wx/osx/font.h

@@ -56,7 +56,7 @@ public:
     wxFont(WX_NSFont nsfont);
 #endif
 
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
+#if WXWIN_COMPATIBILITY_3_0
     wxFont(int size,
            int family,
            int style,

include/wx/osx/pen.h

@@ -21,8 +21,8 @@ class WXDLLIMPEXP_CORE wxPen : public wxPenBase
 public:
     wxPen();
     wxPen(const wxColour& col, int width = 1, wxPenStyle style = wxPENSTYLE_SOLID);
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
+#if WXWIN_COMPATIBILITY_3_0
-    wxDEPRECATED_FUTURE( wxPen(const wxColour& col, int width, int style) );
+    wxDEPRECATED( wxPen(const wxColour& col, int width, int style) );
 #endif
 
     wxPen(const wxBitmap& stipple, int width);
@@ -52,8 +52,8 @@ public:
 
     wxBitmap *GetStipple() const ;
 
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
+#if WXWIN_COMPATIBILITY_3_0
-    wxDEPRECATED_FUTURE( void SetStyle(int style) )
+    wxDEPRECATED( void SetStyle(int style) )
         { SetStyle((wxPenStyle)style); }
 #endif
 

include/wx/osx/setup0.h

@@ -27,16 +27,6 @@
 // compatibility settings
 // ----------------------------------------------------------------------------
 
-// This setting determines the compatibility with 2.6 API: set it to 0 to
-// flag all cases of using deprecated functions.
-//
-// Default is 1 but please try building your code with 0 as the default will
-// change to 0 in the next version and the deprecated functions will disappear
-// in the version after it completely.
-//
-// Recommended setting: 0 (please update your code)
-#define WXWIN_COMPATIBILITY_2_6 0
-
 // This setting determines the compatibility with 2.8 API: set it to 0 to
 // flag all cases of using deprecated functions.
 //
@@ -45,7 +35,17 @@
 // in the version after it completely.
 //
 // Recommended setting: 0 (please update your code)
-#define WXWIN_COMPATIBILITY_2_8 1
+#define WXWIN_COMPATIBILITY_2_8 0
+
+// This setting determines the compatibility with 3.0 API: set it to 0 to
+// flag all cases of using deprecated functions.
+//
+// Default is 1 but please try building your code with 0 as the default will
+// change to 0 in the next version and the deprecated functions will disappear
+// in the version after it completely.
+//
+// Recommended setting: 0 (please update your code)
+#define WXWIN_COMPATIBILITY_3_0 1
 
 // MSW-only: Set to 0 for accurate dialog units, else 1 for old behaviour when
 // default system font is used for wxWindow::GetCharWidth/Height() instead of

include/wx/osx/treectrl.h

@@ -59,15 +59,6 @@ enum {
     wxTREE_NEXT_ROOT                   // Retrieves the first child item of the root item of which the specified item is a part.
 };
 
-#if WXWIN_COMPATIBILITY_2_6
-    // Flags for InsertItem
-    enum {
-        wxTREE_INSERT_LAST = -1,
-        wxTREE_INSERT_FIRST = -2,
-        wxTREE_INSERT_SORT = -3
-    };
-#endif
-
 class WXDLLIMPEXP_CORE wxTreeItem: public wxObject
 {
     DECLARE_DYNAMIC_CLASS(wxTreeItem)
@@ -189,20 +180,6 @@ public:
       // adding/deleting items
     bool DeleteItem(long item);
 
-#if WXWIN_COMPATIBILITY_2_6
-    wxDEPRECATED( long InsertItem(long parent, wxTreeItem& info,
-                  long insertAfter = wxTREE_INSERT_LAST) );
-        // If image > -1 and selImage == -1, the same image is used for
-        // both selected and unselected items.
-    wxDEPRECATED( long InsertItem(long parent, const wxString& label,
-                                  int image = -1, int selImage = -1,
-                                  long insertAfter = wxTREE_INSERT_LAST) );
-
-        // use Expand, Collapse, CollapseAndReset or Toggle
-    wxDEPRECATED( bool ExpandItem(long item, int action) );
-    wxDEPRECATED( void SetImageList(wxImageList *imageList, int which = wxIMAGE_LIST_NORMAL) );
-#endif // WXWIN_COMPATIBILITY_2_6
-
       // changing item state
     bool ExpandItem(long item)   { return ExpandItem(item, wxTREE_EXPAND_EXPAND);   }
     bool CollapseItem(long item) { return ExpandItem(item, wxTREE_EXPAND_COLLAPSE); }

include/wx/pen.h

@@ -122,14 +122,10 @@ public:
                            int width = 1,
                            wxPenStyle style = wxPENSTYLE_SOLID);
 
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
+#if WXWIN_COMPATIBILITY_3_0
     wxPen *FindOrCreatePen(const wxColour& colour, int width, int style)
         { return FindOrCreatePen(colour, width, (wxPenStyle)style); }
 #endif
-#if WXWIN_COMPATIBILITY_2_6
-    wxDEPRECATED( void AddPen(wxPen*) );
-    wxDEPRECATED( void RemovePen(wxPen*) );
-#endif
 };
 
 extern WXDLLIMPEXP_DATA_CORE(wxPenList*)   wxThePenList;
@@ -140,7 +136,7 @@ extern WXDLLIMPEXP_DATA_CORE(wxPenList*)   wxThePenList;
 //
 // to compile without warnings which it would otherwise provoke from some
 // compilers as it compares elements of different enums
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
+#if WXWIN_COMPATIBILITY_3_0
 
 // Unfortunately some compilers have ambiguity issues when enum comparisons are
 // overloaded so we have to disable the overloads in this case, see
@@ -159,6 +155,6 @@ inline bool operator!=(wxPenStyle s, wxDeprecatedGUIConstants t)
 
 #endif // wxCOMPILER_NO_OVERLOAD_ON_ENUM
 
-#endif // FUTURE_WXWIN_COMPATIBILITY_3_0
+#endif // WXWIN_COMPATIBILITY_3_0
 
 #endif // _WX_PEN_H_BASE_

include/wx/platinfo.h

@@ -348,22 +348,4 @@ protected:
     wxEndianness m_endian;
 };
 
-
-#if WXWIN_COMPATIBILITY_2_6
-    #define wxUNKNOWN_PLATFORM      wxOS_UNKNOWN
-    #define wxUnix                  wxOS_UNIX
-    #define wxWin95                 wxOS_WINDOWS_9X
-    #define wxWIN95                 wxOS_WINDOWS_9X
-    #define wxWINDOWS_NT            wxOS_WINDOWS_NT
-    #define wxMSW                   wxOS_WINDOWS
-    #define wxWinCE                 wxOS_WINDOWS_CE
-    #define wxWIN32S                wxOS_WINDOWS_9X
-
-    #define wxOS2                   wxPORT_OS2
-    #define wxCocoa                 wxPORT_MAC
-    #define wxMac                   wxPORT_MAC
-    #define wxMotif                 wxPORT_MOTIF
-    #define wxGTK                   wxPORT_GTK
-#endif // WXWIN_COMPATIBILITY_2_6
-
 #endif // _WX_PLATINFO_H_

include/wx/propgrid/propgriddefs.h

@@ -188,7 +188,7 @@
 // (for tree buttons)
 //#undef wxPG_ICON_WIDTH
 
-#if WXWIN_COMPATIBILITY_2_6 || WXWIN_COMPATIBILITY_2_8
+#if WXWIN_COMPATIBILITY_2_8
     #define wxPG_COMPATIBILITY_1_4      1
 #else
     #define wxPG_COMPATIBILITY_1_4      0

include/wx/setup_inc.h

@@ -22,16 +22,6 @@
 // compatibility settings
 // ----------------------------------------------------------------------------
 
-// This setting determines the compatibility with 2.6 API: set it to 0 to
-// flag all cases of using deprecated functions.
-//
-// Default is 1 but please try building your code with 0 as the default will
-// change to 0 in the next version and the deprecated functions will disappear
-// in the version after it completely.
-//
-// Recommended setting: 0 (please update your code)
-#define WXWIN_COMPATIBILITY_2_6 0
-
 // This setting determines the compatibility with 2.8 API: set it to 0 to
 // flag all cases of using deprecated functions.
 //
@@ -40,7 +30,17 @@
 // in the version after it completely.
 //
 // Recommended setting: 0 (please update your code)
-#define WXWIN_COMPATIBILITY_2_8 1
+#define WXWIN_COMPATIBILITY_2_8 0
+
+// This setting determines the compatibility with 3.0 API: set it to 0 to
+// flag all cases of using deprecated functions.
+//
+// Default is 1 but please try building your code with 0 as the default will
+// change to 0 in the next version and the deprecated functions will disappear
+// in the version after it completely.
+//
+// Recommended setting: 0 (please update your code)
+#define WXWIN_COMPATIBILITY_3_0 1
 
 // MSW-only: Set to 0 for accurate dialog units, else 1 for old behaviour when
 // default system font is used for wxWindow::GetCharWidth/Height() instead of

include/wx/sizer.h

@@ -351,12 +351,6 @@ public:
     bool IsSizer() const { return m_kind == Item_Sizer; }
     bool IsSpacer() const { return m_kind == Item_Spacer; }
 
-#if WXWIN_COMPATIBILITY_2_6
-    // Deprecated in 2.6, use {G,S}etProportion instead.
-    wxDEPRECATED( void SetOption( int option ) );
-    wxDEPRECATED( int GetOption() const );
-#endif // WXWIN_COMPATIBILITY_2_6
-
     void SetProportion( int proportion )
         { m_proportion = proportion; }
     int GetProportion() const
@@ -591,12 +585,6 @@ public:
     void SetContainingWindow(wxWindow *window);
     wxWindow *GetContainingWindow() const { return m_containingWindow; }
 
-#if WXWIN_COMPATIBILITY_2_6
-    // Deprecated in 2.6 since historically it does not delete the window,
-    // use Detach instead.
-    wxDEPRECATED( virtual bool Remove( wxWindow *window ) );
-#endif // WXWIN_COMPATIBILITY_2_6
-
     virtual bool Remove( wxSizer *sizer );
     virtual bool Remove( int index );
 

include/wx/slider.h

@@ -41,11 +41,6 @@
 #define wxSL_VALUE_LABEL     0x4000
 #define wxSL_LABELS          (wxSL_MIN_MAX_LABELS|wxSL_VALUE_LABEL)
 
-#if WXWIN_COMPATIBILITY_2_6
-    // obsolete
-    #define wxSL_NOTIFY_DRAG     0x0000
-#endif // WXWIN_COMPATIBILITY_2_6
-
 extern WXDLLIMPEXP_DATA_CORE(const char) wxSliderNameStr[];
 
 // ----------------------------------------------------------------------------

include/wx/splitter.h

@@ -28,12 +28,6 @@
 #define wxSP_BORDER           wxSP_3DBORDER
 #define wxSP_3D               (wxSP_3DBORDER | wxSP_3DSASH)
 
-#if WXWIN_COMPATIBILITY_2_6
-    // obsolete styles, don't do anything
-    #define wxSP_SASH_AQUA        0
-    #define wxSP_FULLSASH         0
-#endif // WXWIN_COMPATIBILITY_2_6
-
 class WXDLLIMPEXP_FWD_CORE wxSplitterEvent;
 
 wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_SPLITTER_SASH_POS_CHANGED, wxSplitterEvent );

include/wx/stopwatch.h

@@ -89,16 +89,4 @@ private:
 
 #endif // wxUSE_STOPWATCH
 
-#if wxUSE_LONGLONG && WXWIN_COMPATIBILITY_2_6
-
-    // Starts a global timer
-    // -- DEPRECATED: use wxStopWatch instead
-    wxDEPRECATED( void WXDLLIMPEXP_BASE wxStartTimer() );
-
-    // Gets elapsed milliseconds since last wxStartTimer or wxGetElapsedTime
-    // -- DEPRECATED: use wxStopWatch instead
-    wxDEPRECATED( long WXDLLIMPEXP_BASE wxGetElapsedTime(bool resetTimer = true) );
-
-#endif // wxUSE_LONGLONG && WXWIN_COMPATIBILITY_2_6
-
 #endif // _WX_STOPWATCH_H_

include/wx/stream.h

@@ -495,11 +495,6 @@ public:
     wxInputStream *GetInputStream() const;
     wxOutputStream *GetOutputStream() const;
 
-#if WXWIN_COMPATIBILITY_2_6
-    // deprecated, for compatibility only
-    wxDEPRECATED( wxStreamBase *Stream() );
-#endif // WXWIN_COMPATIBILITY_2_6
-
     // this constructs a dummy wxStreamBuffer, used by (and exists for)
     // wxMemoryStreams only, don't use!
     wxStreamBuffer(BufMode mode);
@@ -578,11 +573,6 @@ public:
     void SetInputStreamBuffer(wxStreamBuffer *buffer);
     wxStreamBuffer *GetInputStreamBuffer() const { return m_i_streambuf; }
 
-#if WXWIN_COMPATIBILITY_2_6
-    // deprecated, for compatibility only
-    wxDEPRECATED( wxStreamBuffer *InputStreamBuffer() const );
-#endif // WXWIN_COMPATIBILITY_2_6
-
 protected:
     virtual size_t OnSysRead(void *buffer, size_t bufsize);
     virtual wxFileOffset OnSysSeek(wxFileOffset seek, wxSeekMode mode);
@@ -630,11 +620,6 @@ public:
     void SetOutputStreamBuffer(wxStreamBuffer *buffer);
     wxStreamBuffer *GetOutputStreamBuffer() const { return m_o_streambuf; }
 
-#if WXWIN_COMPATIBILITY_2_6
-    // deprecated, for compatibility only
-    wxDEPRECATED( wxStreamBuffer *OutputStreamBuffer() const );
-#endif // WXWIN_COMPATIBILITY_2_6
-
 protected:
     virtual size_t OnSysWrite(const void *buffer, size_t bufsize);
     virtual wxFileOffset OnSysSeek(wxFileOffset seek, wxSeekMode mode);
@@ -645,12 +630,6 @@ protected:
     wxDECLARE_NO_COPY_CLASS(wxBufferedOutputStream);
 };
 
-#if WXWIN_COMPATIBILITY_2_6
-    inline wxStreamBase *wxStreamBuffer::Stream() { return m_stream; }
-    inline wxStreamBuffer *wxBufferedInputStream::InputStreamBuffer() const { return m_i_streambuf; }
-    inline wxStreamBuffer *wxBufferedOutputStream::OutputStreamBuffer() const { return m_o_streambuf; }
-#endif // WXWIN_COMPATIBILITY_2_6
-
 // ---------------------------------------------------------------------------
 // wxWrapperInputStream: forwards all IO to another stream.
 // ---------------------------------------------------------------------------

include/wx/string.h

@@ -110,15 +110,6 @@ namespace wxPrivate
 // constants
 // ----------------------------------------------------------------------------
 
-#if WXWIN_COMPATIBILITY_2_6
-
-// deprecated in favour of wxString::npos, don't use in new code
-//
-// maximum possible length for a string means "take all string" everywhere
-#define wxSTRING_MAXLEN wxString::npos
-
-#endif // WXWIN_COMPATIBILITY_2_6
-
 // ---------------------------------------------------------------------------
 // global functions complementing standard C string library replacements for
 // strlen() and portable strcasecmp()

include/wx/textctrl.h

@@ -100,11 +100,6 @@ const wxTextCoord wxInvalidTextCoord    = -2;
 #define wxTE_WORDWRAP       0x0001  // wrap only at words boundaries
 #define wxTE_BESTWRAP       0x0000  // this is the default
 
-#if WXWIN_COMPATIBILITY_2_6
-    // obsolete synonym
-    #define wxTE_LINEWRAP       wxTE_CHARWRAP
-#endif // WXWIN_COMPATIBILITY_2_6
-
 #if WXWIN_COMPATIBILITY_2_8
     // this style is (or at least should be) on by default now, don't use it
     #define wxTE_AUTO_SCROLL    0

include/wx/thread.h

@@ -382,23 +382,12 @@ public:
     // on the associated mutex object before returning.
     wxCondError Broadcast();
 
-
-#if WXWIN_COMPATIBILITY_2_6
-    // deprecated version, don't use
-    wxDEPRECATED( bool Wait(unsigned long milliseconds) );
-#endif // WXWIN_COMPATIBILITY_2_6
-
 private:
     wxConditionInternal *m_internal;
 
     wxDECLARE_NO_COPY_CLASS(wxCondition);
 };
 
-#if WXWIN_COMPATIBILITY_2_6
-    inline bool wxCondition::Wait(unsigned long milliseconds)
-        { return WaitTimeout(milliseconds) == wxCOND_NO_ERROR; }
-#endif // WXWIN_COMPATIBILITY_2_6
-
 // ----------------------------------------------------------------------------
 // wxSemaphore: a counter limiting the number of threads concurrently accessing
 //              a shared resource

include/wx/toplevel.h

@@ -84,20 +84,6 @@ class WXDLLIMPEXP_FWD_CORE wxTopLevelWindowBase;
     #define wxTINY_CAPTION_VERT     wxTINY_CAPTION
 #endif
 
-#if WXWIN_COMPATIBILITY_2_6
-
-    // deprecated versions defined for compatibility reasons
-    #define wxRESIZE_BOX            wxMAXIMIZE_BOX
-    #define wxTHICK_FRAME           wxRESIZE_BORDER
-
-    // obsolete styles, unused any more
-    #define wxDIALOG_MODAL          0
-    #define wxDIALOG_MODELESS       0
-    #define wxNO_3D                 0
-    #define wxUSER_COLOURS          0
-
-#endif // WXWIN_COMPATIBILITY_2_6
-
 // default style
 //
 // under Windows CE (at least when compiling with eVC 4) we should create

include/wx/treebase.h

@@ -24,19 +24,6 @@
 #include "wx/dynarray.h"
 #include "wx/itemid.h"
 
-#if WXWIN_COMPATIBILITY_2_6
-
-// flags for deprecated `Expand(int action)', will be removed in next versions
-enum
-{
-    wxTREE_EXPAND_EXPAND,
-    wxTREE_EXPAND_COLLAPSE,
-    wxTREE_EXPAND_COLLAPSE_RESET,
-    wxTREE_EXPAND_TOGGLE
-};
-
-#endif // WXWIN_COMPATIBILITY_2_6
-
 // ----------------------------------------------------------------------------
 // wxTreeItemId identifies an element of the tree. It's opaque for the
 // application and the only method which can be used by user code is IsOk().
@@ -159,13 +146,6 @@ static const int wxTREE_ITEMSTATE_PREV  = -3;   // cycle to the previous state
     #define wxTR_DEFAULT_STYLE       (wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT)
 #endif
 
-#if WXWIN_COMPATIBILITY_2_6
-// deprecated, don't use
-#define wxTR_MAC_BUTTONS             0
-#define wxTR_AQUA_BUTTONS            0
-#endif // WXWIN_COMPATIBILITY_2_6
-
-
 // values for the `flags' parameter of wxTreeCtrl::HitTest() which determine
 // where exactly the specified point is situated:
 

include/wx/txtstrm.h

@@ -75,10 +75,6 @@ public:
 
     wxTextInputStream& operator>>( __wxTextInputManip func) { return func(*this); }
 
-#if WXWIN_COMPATIBILITY_2_6
-    wxDEPRECATED( wxString ReadString() );  // use ReadLine or ReadWord instead
-#endif // WXWIN_COMPATIBILITY_2_6
-
 protected:
     wxInputStream &m_input;
     wxString m_separators;

include/wx/univ/setup0.h

@@ -25,16 +25,6 @@
 // compatibility settings
 // ----------------------------------------------------------------------------
 
-// This setting determines the compatibility with 2.6 API: set it to 0 to
-// flag all cases of using deprecated functions.
-//
-// Default is 1 but please try building your code with 0 as the default will
-// change to 0 in the next version and the deprecated functions will disappear
-// in the version after it completely.
-//
-// Recommended setting: 0 (please update your code)
-#define WXWIN_COMPATIBILITY_2_6 0
-
 // This setting determines the compatibility with 2.8 API: set it to 0 to
 // flag all cases of using deprecated functions.
 //
@@ -43,7 +33,17 @@
 // in the version after it completely.
 //
 // Recommended setting: 0 (please update your code)
-#define WXWIN_COMPATIBILITY_2_8 1
+#define WXWIN_COMPATIBILITY_2_8 0
+
+// This setting determines the compatibility with 3.0 API: set it to 0 to
+// flag all cases of using deprecated functions.
+//
+// Default is 1 but please try building your code with 0 as the default will
+// change to 0 in the next version and the deprecated functions will disappear
+// in the version after it completely.
+//
+// Recommended setting: 0 (please update your code)
+#define WXWIN_COMPATIBILITY_3_0 1
 
 // MSW-only: Set to 0 for accurate dialog units, else 1 for old behaviour when
 // default system font is used for wxWindow::GetCharWidth/Height() instead of

include/wx/utils.h

@@ -643,23 +643,6 @@ enum
 WXDLLIMPEXP_CORE wxString
 wxStripMenuCodes(const wxString& str, int flags = wxStrip_All);
 
-#if WXWIN_COMPATIBILITY_2_6
-// obsolete and deprecated version, do not use, use the above overload instead
-wxDEPRECATED(
-    WXDLLIMPEXP_CORE wxChar* wxStripMenuCodes(const wxChar *in, wxChar *out = NULL)
-);
-
-#if wxUSE_ACCEL
-class WXDLLIMPEXP_FWD_CORE wxAcceleratorEntry;
-
-// use wxAcceleratorEntry::Create() or FromString() methods instead
-wxDEPRECATED(
-    WXDLLIMPEXP_CORE wxAcceleratorEntry *wxGetAccelFromString(const wxString& label)
-);
-#endif // wxUSE_ACCEL
-
-#endif // WXWIN_COMPATIBILITY_2_6
-
 // ----------------------------------------------------------------------------
 // Window search
 // ----------------------------------------------------------------------------

include/wx/window.h

@@ -1966,11 +1966,6 @@ extern WXDLLIMPEXP_CORE wxWindow *wxGetActiveWindow();
 // get the (first) top level parent window
 WXDLLIMPEXP_CORE wxWindow* wxGetTopLevelParent(wxWindow *win);
 
-#if WXWIN_COMPATIBILITY_2_6
-    wxDEPRECATED_MSG("use wxWindow::NewControlId() instead")
-    inline wxWindowID NewControlId() { return wxWindowBase::NewControlId(); }
-#endif // WXWIN_COMPATIBILITY_2_6
-
 #if wxUSE_ACCESSIBILITY
 // ----------------------------------------------------------------------------
 // accessible object for windows

include/wx/x11/brush.h

@@ -31,8 +31,8 @@ public:
     wxBrush() { }
 
     wxBrush( const wxColour &colour, wxBrushStyle style = wxBRUSHSTYLE_SOLID );
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
+#if WXWIN_COMPATIBILITY_3_0
-    wxDEPRECATED_FUTURE( wxBrush(const wxColour& col, int style) );
+    wxDEPRECATED( wxBrush(const wxColour& col, int style) );
 #endif
     wxBrush( const wxBitmap &stippleBitmap );
     virtual ~wxBrush();
@@ -49,8 +49,8 @@ public:
     void SetStyle( wxBrushStyle style );
     void SetStipple( const wxBitmap& stipple );
 
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
+#if WXWIN_COMPATIBILITY_3_0
-    wxDEPRECATED_FUTURE( void SetStyle(int style) )
+    wxDEPRECATED( void SetStyle(int style) )
         { SetStyle((wxBrushStyle)style); }
 #endif
 

include/wx/x11/font.h

@@ -34,7 +34,7 @@ public:
             SetPixelSize(info.GetPixelSize());
     }
 
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
+#if WXWIN_COMPATIBILITY_3_0
     wxFont(int size,
            int family,
            int style,

include/wx/x11/pen.h

@@ -34,8 +34,8 @@ public:
     wxPen() { }
 
     wxPen( const wxColour &colour, int width = 1, wxPenStyle style = wxPENSTYLE_SOLID );
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
+#if WXWIN_COMPATIBILITY_3_0
-    wxDEPRECATED_FUTURE( wxPen(const wxColour& col, int width, int style) );
+    wxDEPRECATED( wxPen(const wxColour& col, int width, int style) );
 #endif
 
     wxPen( const wxBitmap &stipple, int width );
@@ -63,8 +63,8 @@ public:
     wxDash* GetDash() const;
     wxBitmap* GetStipple() const;
 
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
+#if WXWIN_COMPATIBILITY_3_0
-    wxDEPRECATED_FUTURE( void SetStyle(int style) )
+    wxDEPRECATED( void SetStyle(int style) )
         { SetStyle((wxPenStyle)style); }
 #endif
 

include/wx/zipstrm.h

@@ -362,11 +362,6 @@ public:
     wxZipInputStream(wxInputStream& stream, wxMBConv& conv = wxConvLocal);
     wxZipInputStream(wxInputStream *stream, wxMBConv& conv = wxConvLocal);
 
-#if WXWIN_COMPATIBILITY_2_6 && wxUSE_FFILE
-    wxZipInputStream(const wxString& archive, const wxString& file)
-     : wxArchiveInputStream(OpenFile(archive), wxConvLocal) { Init(file); }
-#endif
-
     virtual WXZIPFIX ~wxZipInputStream();
 
     bool OpenEntry(wxZipEntry& entry)   { return DoOpen(&entry); }
@@ -383,10 +378,6 @@ protected:
     size_t WXZIPFIX OnSysRead(void *buffer, size_t size);
     wxFileOffset OnSysTell() const { return m_decomp ? m_decomp->TellI() : 0; }
 
-#if WXWIN_COMPATIBILITY_2_6
-    wxFileOffset WXZIPFIX OnSysSeek(wxFileOffset seek, wxSeekMode mode);
-#endif
-
     // this protected interface isn't yet finalised
     virtual wxInputStream* WXZIPFIX OpenDecompressor(wxInputStream& stream);
     virtual bool WXZIPFIX CloseDecompressor(wxInputStream *decomp);
@@ -394,9 +385,6 @@ protected:
 private:
     void Init();
     void Init(const wxString& file);
-#if WXWIN_COMPATIBILITY_2_6 && wxUSE_FFILE
-    static wxInputStream *OpenFile(const wxString& archive);
-#endif
 
     wxArchiveEntry *DoGetNextEntry()    { return GetNextEntry(); }
 
@@ -440,11 +428,6 @@ private:
     friend bool wxZipOutputStream::CopyArchiveMetaData(
                     wxZipInputStream& inputStream);
 
-#if WXWIN_COMPATIBILITY_2_6
-    bool m_allowSeeking;
-    friend class wxArchiveFSHandler;
-#endif
-
     wxDECLARE_NO_COPY_CLASS(wxZipInputStream);
 };
 

interface/wx/zipstrm.h

@@ -384,16 +384,6 @@ public:
                      wxMBConv& conv = wxConvLocal);
     //@}
 
-    /**
-        @deprecated
-        Compatibility constructor (requires WXWIN_COMPATIBILITY_2_6).
-        When this constructor is used, an emulation of seeking is
-        switched on for compatibility with previous versions. Note however,
-        that it is deprecated.
-    */
-    wxZipInputStream(const wxString& archive,
-                     const wxString& file);
-
     /**
         Closes the current entry.
         On a non-seekable stream reads to the end of the current entry first.

samples/propgrid/propgrid.cpp

@@ -1641,18 +1641,12 @@ void FormMain::PopulateWithLibraryConfig ()
     ADD_WX_LIB_CONF( wxUSE_GUI )
 
     ADD_WX_LIB_CONF_GROUP(wxT("Compatibility Settings"))
-#if defined(WXWIN_COMPATIBILITY_2_2)
-    ADD_WX_LIB_CONF( WXWIN_COMPATIBILITY_2_2 )
-#endif
-#if defined(WXWIN_COMPATIBILITY_2_4)
-    ADD_WX_LIB_CONF( WXWIN_COMPATIBILITY_2_4 )
-#endif
-#if defined(WXWIN_COMPATIBILITY_2_6)
-    ADD_WX_LIB_CONF( WXWIN_COMPATIBILITY_2_6 )
-#endif
 #if defined(WXWIN_COMPATIBILITY_2_8)
     ADD_WX_LIB_CONF( WXWIN_COMPATIBILITY_2_8 )
 #endif
+#if defined(WXWIN_COMPATIBILITY_3_0)
+    ADD_WX_LIB_CONF( WXWIN_COMPATIBILITY_3_0 )
+#endif
 #ifdef wxFONT_SIZE_COMPATIBILITY
     ADD_WX_LIB_CONF( wxFONT_SIZE_COMPATIBILITY )
 #else

setup.h.in

@@ -152,10 +152,10 @@
 #endif
 
 
-#define WXWIN_COMPATIBILITY_2_6 0
-
 #define WXWIN_COMPATIBILITY_2_8 0
 
+#define WXWIN_COMPATIBILITY_3_0 0
+
 #define wxDIALOG_UNIT_COMPATIBILITY   0
 
 

setup.h_vms

@@ -187,10 +187,10 @@ typedef pid_t GPid;
     #define wxUSE_GUI            1
 #endif
 
-#define WXWIN_COMPATIBILITY_2_6 1
-
 #define WXWIN_COMPATIBILITY_2_8 1
 
+#define WXWIN_COMPATIBILITY_3_0 1
+
 #define wxEVENTS_COMPATIBILITY_2_8 1
 
 #define wxDIALOG_UNIT_COMPATIBILITY   1

src/common/artprov.cpp

@@ -397,32 +397,6 @@ bool wxArtProvider::HasNativeProvider()
 // deprecated wxArtProvider methods
 // ----------------------------------------------------------------------------
 
-#if WXWIN_COMPATIBILITY_2_6
-
-/* static */ void wxArtProvider::PushProvider(wxArtProvider *provider)
-{
-    Push(provider);
-}
-
-/* static */ void wxArtProvider::InsertProvider(wxArtProvider *provider)
-{
-    PushBack(provider);
-}
-
-/* static */ bool wxArtProvider::PopProvider()
-{
-    return Pop();
-}
-
-/* static */ bool wxArtProvider::RemoveProvider(wxArtProvider *provider)
-{
-    // RemoveProvider() used to delete the provider being removed so this is
-    // not a typo, we must call Delete() and not Remove() here
-    return Delete(provider);
-}
-
-#endif // WXWIN_COMPATIBILITY_2_6
-
 #if WXWIN_COMPATIBILITY_2_8
 /* static */ void wxArtProvider::Insert(wxArtProvider *provider)
 {

src/common/colourcmn.cpp

@@ -340,21 +340,6 @@ wxColour wxColourBase::ChangeLightness(int ialpha) const
     return wxColour(r,g,b);
 }
 
-#if WXWIN_COMPATIBILITY_2_6
-
-// static
-wxColour wxColourBase::CreateByName(const wxString& name)
-{
-    return wxColour(name);
-}
-
-void wxColourBase::InitFromName(const wxString& col)
-{
-    Set(col);
-}
-
-#endif // WXWIN_COMPATIBILITY_2_6
-
 // wxColour <-> wxString utilities, used by wxConfig
 wxString wxToString(const wxColourBase& col)
 {

src/common/datetime.cpp

@@ -1703,46 +1703,6 @@ wxDateTime::SetToWeekOfYear(int year, wxDateTime_t numWeek, WeekDay wd)
     return dt;
 }
 
-#if WXWIN_COMPATIBILITY_2_6
-// use a separate function to avoid warnings about using deprecated
-// SetToTheWeek in GetWeek below
-static wxDateTime
-SetToTheWeek(int year,
-             wxDateTime::wxDateTime_t numWeek,
-             wxDateTime::WeekDay weekday,
-             wxDateTime::WeekFlags flags)
-{
-    // Jan 4 always lies in the 1st week of the year
-    wxDateTime dt(4, wxDateTime::Jan, year);
-    dt.SetToWeekDayInSameWeek(weekday, flags);
-    dt += wxDateSpan::Weeks(numWeek - 1);
-
-    return dt;
-}
-
-bool wxDateTime::SetToTheWeek(wxDateTime_t numWeek,
-                              WeekDay weekday,
-                              WeekFlags flags)
-{
-    int year = GetYear();
-    *this = ::SetToTheWeek(year, numWeek, weekday, flags);
-    if ( GetYear() != year )
-    {
-        // oops... numWeek was too big
-        return false;
-    }
-
-    return true;
-}
-
-wxDateTime wxDateTime::GetWeek(wxDateTime_t numWeek,
-                               WeekDay weekday,
-                               WeekFlags flags) const
-{
-    return ::SetToTheWeek(GetYear(), numWeek, weekday, flags);
-}
-#endif // WXWIN_COMPATIBILITY_2_6
-
 wxDateTime& wxDateTime::SetToLastMonthDay(Month month,
                                           int year)
 {