AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Old API clearly deprecated.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31248 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba 2005-01-05 19:25:02 +00:00
parent e32d4b8f07
commit 1729813a8d
10 changed files with 97 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/frame.h
View File

@ -179,7 +179,7 @@ public:
#if WXWIN_COMPATIBILITY_2_2
// call this to simulate a menu command
bool Command(int winid) { return ProcessCommand(winid); }
wxDEPRECATED( bool Command(int winid) );
#endif // WXWIN_COMPATIBILITY_2_2
protected:

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

@ -207,10 +207,9 @@ public:
#if WXWIN_COMPATIBILITY_2_2
// deprecated: Use GetItemParent instead.
wxTreeItemId GetParent(const wxTreeItemId& item) const
{ return GetItemParent( item ); }
wxDEPRECATED( wxTreeItemId GetParent(const wxTreeItemId& item) const);
// Expose the base class method hidden by the one above.
// Expose the base class method hidden by the one above. Not deprecatable.
wxWindow *GetParent() const { return wxScrolledWindow::GetParent(); }
#endif // WXWIN_COMPATIBILITY_2_2

2
include/wx/html/htmltag.h
View File

@ -118,7 +118,7 @@ public:
#if WXWIN_COMPATIBILITY_2_2
// return true if this is ending tag (</something>) or false
// if it isn't (<something>)
inline bool IsEnding() const {return false;}
wxDEPRECATED( bool IsEnding() const );
#endif
// return true if this there is matching ending tag

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

@ -224,10 +224,9 @@ public:
#if WXWIN_COMPATIBILITY_2_2
// deprecated: Use GetItemParent instead.
wxTreeItemId GetParent(const wxTreeItemId& item) const
{ return GetItemParent( item ); }
wxDEPRECATED( wxTreeItemId GetParent(const wxTreeItemId& item) const);
// Expose the base class method hidden by the one above.
// Expose the base class method hidden by the one above. Not deprecatable.
wxWindow *GetParent() const { return wxControl::GetParent(); }
#endif // WXWIN_COMPATIBILITY_2_2

27
include/wx/os2/treectrl.h
View File

@ -201,21 +201,21 @@ public:
// usage and loading time.
//
void SetItemHasChildren( const wxTreeItemId& rItem
,bool bHas = TRUE
,bool bHas = true
);
//
// The item will be shown in bold
//
void SetItemBold( const wxTreeItemId& rItem
,bool bBold = TRUE
,bool bBold = true
);
//
// The item will be shown with a drop highlight
//
void SetItemDropHighlight( const wxTreeItemId& rItem
,bool bHighlight = TRUE
,bool bHighlight = true
);
//
@ -254,11 +254,11 @@ public:
//
//
// If 'recursively' is FALSE, only immediate children count, otherwise
// If 'bRecursively' is false, only immediate children count, otherwise
// the returned number is the number of all items in this branch
//
size_t GetChildrenCount( const wxTreeItemId& rItem
,bool bRecursively = TRUE
,bool bRecursively = true
) const;
//
@ -287,12 +287,11 @@ public:
wxTreeItemId GetItemParent(const wxTreeItemId& rItem) const;
#if WXWIN_COMPATIBILITY_2_2
// deprecated: Use GetItemParent instead.
wxTreeItemId GetParent(const wxTreeItemId& rItem) const
{ return GetItemParent(rItem); }
// deprecated: Use GetItemParent instead.
wxDEPRECATED( wxTreeItemId GetParent(const wxTreeItemId& item) const);
// Expose the base class method hidden by the one above.
wxWindow* GetParent(void) const { return wxControl::GetParent(); }
// Expose the base class method hidden by the one above. Not deprecatable.
wxWindow *GetParent() const { return wxControl::GetParent(); }
#endif // WXWIN_COMPATIBILITY_2_2
// for this enumeration function you must pass in a "cookie" parameter
@ -474,7 +473,7 @@ public:
// End editing and accept or discard the changes to item label
//
void EndEditLabel( const wxTreeItemId& rItem
,bool bDiscardChanges = FALSE
,bool bDiscardChanges = false
);
//
@ -523,7 +522,7 @@ public:
//
bool GetBoundingRect( const wxTreeItemId& rItem
,wxRect& rRect
,bool bTextOnly = FALSE
,bool bTextOnly = false
) const;
//
@ -618,7 +617,7 @@ public:
//
bool IsItemChecked(const wxTreeItemId& rItem) const;
void SetItemCheck( const wxTreeItemId& rItem
,bool bCheck = TRUE
,bool bCheck = true
);
protected:
@ -692,7 +691,7 @@ private:
wxMapTreeAttr m_vAttrs;
//
// TRUE if the hash above is not empty
// true if the hash above is not empty
//
bool m_bHasAnyAttr;

11
src/common/framecmn.cpp
View File

@ -387,7 +387,7 @@ bool wxFrameBase::ShowMenuHelp(wxStatusBar *WXUNUSED(statbar), int menuId)
DoGiveHelp(helpString, show);
return !helpString.IsEmpty();
return !helpString.empty();
#else // !wxUSE_MENUS
return false;
#endif // wxUSE_MENUS/!wxUSE_MENUS
@ -563,3 +563,12 @@ void wxFrameBase::SetMenuBar(wxMenuBar *menubar)
}
#endif // wxUSE_MENUS
#if WXWIN_COMPATIBILITY_2_2
bool wxFrameBase::Command(int winid)
{
return ProcessCommand(winid);
}
#endif // WXWIN_COMPATIBILITY_2_2

13
src/generic/treectlg.cpp
View File

@ -760,7 +760,7 @@ void wxGenericTreeCtrl::Init()
m_lastOnSame = false;
#ifdef __WXMAC_CARBON__
#ifdef __WXMAC_CARBON__
m_normalFont.MacCreateThemeFont( kThemeViewsFont ) ;
#else
m_normalFont = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT );
@ -1586,7 +1586,7 @@ void wxGenericTreeCtrl::Delete(const wxTreeItemId& itemId)
if (item == m_select_me)
m_select_me = NULL;
delete item;
}
@ -3561,4 +3561,13 @@ wxGenericTreeCtrl::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
#endif
}
#if WXWIN_COMPATIBILITY_2_2
wxTreeItemId wxGenericTreeCtrl::GetParent(const wxTreeItemId& item) const
{
return GetItemParent( item );
}
#endif // WXWIN_COMPATIBILITY_2_2
#endif // wxUSE_TREECTRL

11
src/html/htmltag.cpp
View File

@ -392,7 +392,7 @@ bool wxHtmlTag::GetParamAsColour(const wxString& par, wxColour *clr) const
{
wxString str = GetParam(par);
if (str.IsEmpty()) return false;
if (str.empty()) return false;
if (str.GetChar(0) == wxT('#'))
{
unsigned long tmp;
@ -495,4 +495,13 @@ wxHtmlTag *wxHtmlTag::GetNextTag() const
return cur->m_Next;
}
#if WXWIN_COMPATIBILITY_2_2
bool wxHtmlTag::IsEnding() const
{
return false;
}
#endif // WXWIN_COMPATIBILITY_2_2
#endif

9
src/msw/treectrl.cpp
View File

@ -3069,5 +3069,14 @@ int wxTreeCtrl::GetState(const wxTreeItemId& node)
return STATEIMAGEMASKTOINDEX(tvi.state);
}
#if WXWIN_COMPATIBILITY_2_2
wxTreeItemId wxTreeCtrl::GetParent(const wxTreeItemId& item) const
{
return GetItemParent( item );
}
#endif // WXWIN_COMPATIBILITY_2_2
#endif // wxUSE_TREECTRL

67
src/os2/treectrl.cpp
View File

@ -160,16 +160,16 @@ public:
//
// Do traverse the tree: visit all items (recursively by default) under the
// given one; return TRUE if all items were traversed or FALSE if the
// traversal was aborted because OnVisit returned FALSE
// given one; return true if all items were traversed or false if the
// traversal was aborted because OnVisit returned false
//
bool DoTraverse( const wxTreeItemId& rRoot
,bool bRecursively = TRUE
,bool bRecursively = true
);
//
// Override this function to do whatever is needed for each item, return
// FALSE to stop traversing
// false to stop traversing
//
virtual bool OnVisit(const wxTreeItemId& rItem) = 0;
@ -208,7 +208,7 @@ public:
//
if ((GetTree()->GetRootItem() == rItem) && (GetTree()->GetWindowStyle() & wxTR_HIDE_ROOT))
{
return TRUE;
return true;
}
PMYRECORD pRecord = FindOS2TreeRecordByID( GetTree()->GetHWND()
,rItem.m_pItem
@ -217,7 +217,7 @@ public:
{
m_aSelections.Add(rItem);
}
return TRUE;
return true;
}
size_t GetCount(void) const { return m_aSelections.GetCount(); }
@ -245,7 +245,7 @@ public:
virtual bool OnVisit(const wxTreeItemId& WXUNUSED(rItem))
{
m_nCount++;
return TRUE;
return true;
}
size_t GetCount(void) const { return m_nCount; }
@ -306,7 +306,7 @@ bool wxTreeTraversal::DoTraverse (
)
{
if (!OnVisit(rRoot))
return FALSE;
return false;
return Traverse( rRoot
,bRecursively
@ -327,15 +327,15 @@ bool wxTreeTraversal::Traverse (
//
// Depth first traversal
//
if (bRecursively && !Traverse(vChild, TRUE))
return FALSE;
if (bRecursively && !Traverse(vChild, true))
return false;
if (!OnVisit(vChild))
return FALSE;
return false;
vChild = m_pTree->GetNextChild( rRoot
,lCookie
);
}
return TRUE;
return true;
} // end of wxTreeTraversal::Traverse
// ----------------------------------------------------------------------------
@ -382,7 +382,7 @@ bool wxTreeCtrl::Create (
,rValidator
,rsName
))
return FALSE;
return false;
DWORD dwStyle = WS_VISIBLE | WS_TABSTOP;
@ -393,7 +393,7 @@ bool wxTreeCtrl::Create (
if (!OS2CreateControl( "CONTAINER"
,dwStyle
))
return FALSE;
return false;
//
// Now set the display attributes to show a TREE/ICON view of the
@ -426,7 +426,7 @@ bool wxTreeCtrl::Create (
,rSize.x
,rSize.y
);
return TRUE;
return true;
} // end of wxTreeCtrl::Create
wxTreeCtrl::~wxTreeCtrl ()
@ -474,9 +474,9 @@ bool wxTreeCtrl::DoGetItem (
if (!pRecord)
{
wxLogLastError(wxT("Item not obtained"));
return FALSE;
return false;
}
return TRUE;
return true;
} // end of wxTreeCtrl::DoGetItem
void wxTreeCtrl::DoSetItem (
@ -617,13 +617,13 @@ bool wxTreeCtrl::SetBackgroundColour (
ULONG ulColor = wxColourToRGB(rColour);
if ( !wxWindowBase::SetBackgroundColour(rColour) )
return FALSE;
return false;
::WinSetPresParam( GetHWND()
,PP_BACKGROUNDCOLOR
,sizeof(ULONG)
,&ulColor
);
return TRUE;
return true;
} // end of wxTreeCtrl::SetBackgroundColour
bool wxTreeCtrl::SetForegroundColour (
@ -633,13 +633,13 @@ bool wxTreeCtrl::SetForegroundColour (
ULONG ulColor = wxColourToRGB(rColour);
if (!wxWindowBase::SetForegroundColour(rColour))
return FALSE;
return false;
::WinSetPresParam( GetHWND()
,PP_FOREGROUNDCOLOR
,sizeof(ULONG)
,&ulColor
);
return TRUE;
return true;
} // end of wxTreeCtrl::SetForegroundColour
// ----------------------------------------------------------------------------
@ -881,7 +881,7 @@ bool wxTreeCtrl::HasIndirectData (
const wxTreeItemId& WXUNUSED(rItem)
) const
{
return FALSE;
return false;
} // end of wxTreeCtrl::HasIndirectData
// Irreleveant under OS/2 --- item either has child records or it doesn't.
@ -1110,7 +1110,7 @@ bool wxTreeCtrl::IsBold (
const wxTreeItemId& rItem
) const
{
return FALSE;
return false;
} // end of wxTreeCtrl::IsBold
// ----------------------------------------------------------------------------
@ -1923,12 +1923,12 @@ bool wxTreeCtrl::GetBoundingRect (
,MPFROMP(&vRectRecord)
,MPFROMP(&vQuery)
))
return FALSE;
return false;
rRect.SetLeft(vRectRecord.xLeft);
rRect.SetTop(vRectRecord.yTop);
rRect.SetRight(vRectRecord.xRight);
rRect.SetBottom(vRectRecord.yBottom);
return TRUE;
return true;
} // end of wxTreeCtrl::GetBoundingRect
// ----------------------------------------------------------------------------
@ -1989,7 +1989,7 @@ bool wxTreeCtrl::OS2Command (
vEvent.SetEventObject( this );
ProcessCommand(vEvent);
return TRUE;
return true;
}
else if (uCmd == CN_KILLFOCUS)
{
@ -1998,10 +1998,10 @@ bool wxTreeCtrl::OS2Command (
);
vEvent.SetEventObject( this );
ProcessCommand(vEvent);
return TRUE;
return true;
}
else
return FALSE;
return false;
} // end of wxTreeCtrl::OS2Command
//
@ -2013,7 +2013,7 @@ MRESULT wxTreeCtrl::OS2WindowProc (
, WXLPARAM lParam
)
{
bool bProcessed = FALSE;
bool bProcessed = false;
MRESULT mRc = 0;
wxTreeEvent vEvent( wxEVT_NULL
,m_windowId
@ -2096,4 +2096,13 @@ MRESULT wxTreeCtrl::OS2WindowProc (
return mRc;
} // end of wxTreeCtrl::OS2WindowProc
#if WXWIN_COMPATIBILITY_2_2
wxTreeItemId wxTreeCtrl::GetParent(const wxTreeItemId& item) const
{
return GetItemParent( item );
}
#endif // WXWIN_COMPATIBILITY_2_2
#endif // wxUSE_TREECTRL