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/cocoa/brush.h
View File

@@ -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
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();
@@ -54,8 +54,8 @@ public:
virtual 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

14
include/wx/cocoa/dialog.h
View File

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

2
include/wx/cocoa/font.h
View File

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

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

@@ -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
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);
virtual ~wxPen();
@@ -53,8 +53,8 @@ public:
int GetDashes(wxDash **ptr) 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