Warning fixes found under hardest mode of OpenWatcom. Seems clean in Borland, MinGW and DMC.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29684 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -363,9 +363,9 @@ void MyFrame::OnIdle(wxIdleEvent& event)
|
||||
|
||||
void MyFrame::OnSize(wxSizeEvent& event)
|
||||
{
|
||||
if ( m_treeCtrl
|
||||
if ( m_treeCtrl
|
||||
#if wxUSE_LOG
|
||||
&& m_textCtrl
|
||||
&& m_textCtrl
|
||||
#endif // wxUSE_LOG
|
||||
)
|
||||
{
|
||||
@@ -758,10 +758,6 @@ void MyTreeCtrl::CreateButtonsImageList(int WXUNUSED(size))
|
||||
#endif
|
||||
}
|
||||
|
||||
MyTreeCtrl::~MyTreeCtrl()
|
||||
{
|
||||
}
|
||||
|
||||
int MyTreeCtrl::OnCompareItems(const wxTreeItemId& item1,
|
||||
const wxTreeItemId& item2)
|
||||
{
|
||||
@@ -1168,7 +1164,7 @@ void MyTreeCtrl::OnContextMenu(wxContextMenuEvent& event)
|
||||
{
|
||||
//attempt to guess where to show the menu
|
||||
if (item.IsOk())
|
||||
{
|
||||
{
|
||||
//if an item was clicked, show menu to the right of it
|
||||
wxRect rect;
|
||||
GetBoundingRect(item, rect, true); //true = only the label
|
||||
@@ -1184,7 +1180,7 @@ void MyTreeCtrl::OnContextMenu(wxContextMenuEvent& event)
|
||||
//event was generated by mouse, use supplied coords
|
||||
pt = ScreenToClient(pt);
|
||||
}
|
||||
|
||||
|
||||
ShowMenu(item, pt);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user