Old API depreciated. Use of new API. Source cleaning.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31234 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -221,15 +221,6 @@ public:
|
||||
// get the parent of this item (may return NULL if root)
|
||||
wxTreeItemId GetItemParent(const wxTreeItemId& item) const;
|
||||
|
||||
#if WXWIN_COMPATIBILITY_2_2
|
||||
// deprecated: Use GetItemParent instead.
|
||||
wxTreeItemId GetParent(const wxTreeItemId& item) const
|
||||
{ return GetItemParent( item ); }
|
||||
|
||||
// Expose the base class method hidden by the one above.
|
||||
wxWindow *GetParent() const { return wxControl::GetParent(); }
|
||||
#endif // WXWIN_COMPATIBILITY_2_2
|
||||
|
||||
// for this enumeration function you must pass in a "cookie" parameter
|
||||
// which is opaque for the application but is necessary for the library
|
||||
// to make these functions reentrant (i.e. allow more than one
|
||||
|
@@ -180,7 +180,7 @@ class WXDLLEXPORT wxSystemSettings : public wxSystemSettingsNative
|
||||
public:
|
||||
#ifdef __WXUNIVERSAL__
|
||||
// in wxUniversal we want to use the theme standard colours instead of the
|
||||
// system ones, otherwuse wxSystemSettings is just the same as
|
||||
// system ones, otherwise wxSystemSettings is just the same as
|
||||
// wxSystemSettingsNative
|
||||
static wxColour GetColour(wxSystemColour index);
|
||||
#endif // __WXUNIVERSAL__
|
||||
@@ -195,15 +195,13 @@ public:
|
||||
// Value
|
||||
static wxSystemScreenType ms_screen;
|
||||
|
||||
|
||||
#if WXWIN_COMPATIBILITY_2_4
|
||||
// the backwards compatible versions of wxSystemSettingsNative functions,
|
||||
// don't use these methods in the new code!
|
||||
static wxColour GetSystemColour(int index)
|
||||
{ return GetColour((wxSystemColour)index); }
|
||||
static wxFont GetSystemFont(int index)
|
||||
{ return GetFont((wxSystemFont)index); }
|
||||
static int GetSystemMetric(int index)
|
||||
{ return GetMetric((wxSystemMetric)index); }
|
||||
wxDEPRECATED(static wxColour GetSystemColour(int index));
|
||||
wxDEPRECATED(static wxFont GetSystemFont(int index));
|
||||
wxDEPRECATED(static int GetSystemMetric(int index));
|
||||
#endif
|
||||
};
|
||||
|
||||
#endif
|
||||
|
@@ -286,7 +286,7 @@ public:
|
||||
|
||||
#if WXWIN_COMPATIBILITY_2_2
|
||||
// for compatibility only, don't use
|
||||
int GetCode() const { return m_evtKey.GetKeyCode(); }
|
||||
wxDEPRECATED( int GetCode() const);
|
||||
#endif // WXWIN_COMPATIBILITY_2_2
|
||||
|
||||
private:
|
||||
|
@@ -532,15 +532,15 @@ WXDLLIMPEXP_BASE bool wxYieldIfNeeded();
|
||||
|
||||
// Format a message on the standard error (UNIX) or the debugging
|
||||
// stream (Windows)
|
||||
WXDLLIMPEXP_BASE void wxDebugMsg(const wxChar *fmt ...) ATTRIBUTE_PRINTF_1;
|
||||
wxDEPRECATED( WXDLLIMPEXP_BASE void wxDebugMsg(const wxChar *fmt ...) ATTRIBUTE_PRINTF_1 );
|
||||
|
||||
// Non-fatal error (continues)
|
||||
WXDLLIMPEXP_DATA_BASE(extern const wxChar*) wxInternalErrorStr;
|
||||
WXDLLIMPEXP_BASE void wxError(const wxString& msg, const wxString& title = wxInternalErrorStr);
|
||||
wxDEPRECATED( WXDLLIMPEXP_BASE void wxError(const wxString& msg, const wxString& title = wxInternalErrorStr) );
|
||||
|
||||
// Fatal error (exits)
|
||||
WXDLLIMPEXP_DATA_BASE(extern const wxChar*) wxFatalErrorStr;
|
||||
WXDLLIMPEXP_BASE void wxFatalError(const wxString& msg, const wxString& title = wxFatalErrorStr);
|
||||
wxDEPRECATED( WXDLLIMPEXP_BASE void wxFatalError(const wxString& msg, const wxString& title = wxFatalErrorStr) );
|
||||
|
||||
#endif // WXWIN_COMPATIBILITY_2_2
|
||||
|
||||
|
Reference in New Issue
Block a user