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

16
include/wx/fontdlg.h
View File

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