Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove WXWIN_COMPATIBILITY_2_6, add WXWIN_COMPATIBILITY_3_0

Browse Source 
closes #15792

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75532 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2014-01-04 20:07:33 +00:00
parent 61728d5d54
commit 967a94c91a
140 changed files with 291 additions and 1561 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/msw/brush.h
View File

@@ -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
wxDEPRECATED_FUTURE( wxBrush(const wxColour& col, int style) );
#if WXWIN_COMPATIBILITY_3_0
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
wxDEPRECATED_FUTURE( void SetStyle(int style) )
#if WXWIN_COMPATIBILITY_3_0
wxDEPRECATED( void SetStyle(int style) )
{ SetStyle((wxBrushStyle)style); }
#endif

4
include/wx/msw/font.h
View File

@@ -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,

11
include/wx/msw/fontdlg.h
View File

@@ -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_

6
include/wx/msw/listctrl.h
View File

@@ -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;

8
include/wx/msw/pen.h
View File

@@ -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
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& stipple, int width);
@@ -54,8 +54,8 @@ public:
int GetDashCount() 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

22
include/wx/msw/setup0.h
View File

@@ -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

9
include/wx/msw/treectrl.h
View File

@@ -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);

22
include/wx/msw/wince/setup.h
View File

@@ -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