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

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
-    wxDEPRECATED_FUTURE( wxBrush(const wxColour& col, int style) );
+#if WXWIN_COMPATIBILITY_3_0
+    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
-    wxDEPRECATED_FUTURE( void SetStyle(int style) )
+#if WXWIN_COMPATIBILITY_3_0
+    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
-    wxDEPRECATED_FUTURE( wxPen(const wxColour& col, int width, int style) );
+#if WXWIN_COMPATIBILITY_3_0
+    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
-    wxDEPRECATED_FUTURE( void SetStyle(int style) )
+#if WXWIN_COMPATIBILITY_3_0
+    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(); }