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

12
include/wx/generic/dragimgg.h
View File

@@ -121,18 +121,6 @@ public:
Create(str, cursor);
}
#if WXWIN_COMPATIBILITY_2_6
// don't use in new code, use versions without hot spot parameter
wxDEPRECATED( wxGenericDragImage(const wxCursor& cursor, const wxPoint& cursorHotspot) );
wxDEPRECATED( wxGenericDragImage(const wxBitmap& image, const wxCursor& cursor, const wxPoint& cursorHotspot) );
wxDEPRECATED( wxGenericDragImage(const wxIcon& image, const wxCursor& cursor, const wxPoint& cursorHotspot) );
wxDEPRECATED( wxGenericDragImage(const wxString& str, const wxCursor& cursor, const wxPoint& cursorHotspot) );
wxDEPRECATED( bool Create(const wxCursor& cursor, const wxPoint& cursorHotspot) );
wxDEPRECATED( bool Create(const wxBitmap& image, const wxCursor& cursor, const wxPoint& cursorHotspot) );
wxDEPRECATED( bool Create(const wxIcon& image, const wxCursor& cursor, const wxPoint& cursorHotspot) );
wxDEPRECATED( bool Create(const wxString& str, const wxCursor& cursor, const wxPoint& cursorHotspot) );
#endif // WXWIN_COMPATIBILITY_2_6
#if wxUSE_TREECTRL
wxGenericDragImage(const wxTreeCtrl& treeCtrl, wxTreeItemId& id)
{

11
include/wx/generic/fontdlgg.h
View File

@@ -52,11 +52,6 @@ public:
virtual int ShowModal();
#if WXWIN_COMPATIBILITY_2_6
// deprecated, for backwards compatibility only
wxDEPRECATED( wxGenericFontDialog(wxWindow *parent, const wxFontData *data) );
#endif // WXWIN_COMPATIBILITY_2_6
// Internal functions
void OnCloseWindow(wxCloseEvent& event);
@@ -100,10 +95,4 @@ private:
DECLARE_DYNAMIC_CLASS(wxGenericFontDialog)
};
#if WXWIN_COMPATIBILITY_2_6
// deprecated, for backwards compatibility only
inline wxGenericFontDialog::wxGenericFontDialog(wxWindow *parent, const wxFontData *data)
:wxFontDialogBase(parent) { Init(); InitFontData(data); Create(parent); }
#endif // WXWIN_COMPATIBILITY_2_6
#endif // _WX_GENERIC_FONTDLGG_H

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

@@ -145,12 +145,6 @@ public:
virtual void EnableBellOnNoMatch(bool on = true);
#if WXWIN_COMPATIBILITY_2_6
// obsolete, don't use
wxDEPRECATED( int GetItemSpacing( bool isSmall ) const );
#endif // WXWIN_COMPATIBILITY_2_6
// overridden base class virtuals
// ------------------------------

16
include/wx/generic/sashwin.h
View File

@@ -40,15 +40,9 @@ class WXDLLIMPEXP_ADV wxSashEdge
public:
wxSashEdge()
{ m_show = false;
#if WXWIN_COMPATIBILITY_2_6
m_border = false;
#endif
m_margin = 0; }
bool m_show; // Is the sash showing?
#if WXWIN_COMPATIBILITY_2_6
bool m_border; // Do we draw a border?
#endif
int m_margin; // The margin size
};
@@ -97,16 +91,6 @@ public:
// Get whether there's a sash in this position
bool GetSashVisible(wxSashEdgePosition edge) const { return m_sashes[edge].m_show; }
#if WXWIN_COMPATIBILITY_2_6
// Set whether there's a border in this position
// This value is unused in wxSashWindow.
void SetSashBorder(wxSashEdgePosition edge, bool border) { m_sashes[edge].m_border = border; }
// Get whether there's a border in this position
// This value is unused in wxSashWindow.
bool HasBorder(wxSashEdgePosition edge) const { return m_sashes[edge].m_border; }
#endif
// Get border size
int GetEdgeMargin(wxSashEdgePosition edge) const { return m_sashes[edge].m_margin; }

5
include/wx/generic/treectlg.h
View File

@@ -191,11 +191,6 @@ public:
wxTreeItemId GetNext(const wxTreeItemId& item) const;
#if WXWIN_COMPATIBILITY_2_6
// use EditLabel() instead
void Edit( const wxTreeItemId& item ) { EditLabel(item); }
#endif // WXWIN_COMPATIBILITY_2_6
// implementation only from now on
// overridden base class virtuals