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/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
-    wxDEPRECATED_FUTURE( wxBrush(const wxColour& col, int style) );
+#if WXWIN_COMPATIBILITY_3_0
+    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
-    wxDEPRECATED_FUTURE( void SetStyle(int style) )
+#if WXWIN_COMPATIBILITY_3_0
+    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
-    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
 
     wxPen( const wxBitmap& rStipple
@@ -68,8 +68,8 @@ public:
     int       GetDashCount() const;
     wxBitmap* GetStipple(void) 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/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);