X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e95f081682e00b5250d5d6a1ce5618f3dc3931cd..e1efca652844273c3e8d32c7e5f442b87e455ca7:/samples/treectrl/treetest.cpp diff --git a/samples/treectrl/treetest.cpp b/samples/treectrl/treetest.cpp index 70c37f8dd4..8bfb579636 100644 --- a/samples/treectrl/treetest.cpp +++ b/samples/treectrl/treetest.cpp @@ -6,7 +6,7 @@ // Created: 04/01/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // For compilers that support precompilation, includes "wx/wx.h". @@ -198,7 +198,6 @@ bool MyApp::OnInit() // Show the frame frame->Show(true); - SetTopWindow(frame); return true; } @@ -807,7 +806,7 @@ void MyFrame::OnDecSpacing(wxCommandEvent& WXUNUSED(event)) { m_treeCtrl->SetSpacing( indent-5 ); m_treeCtrl->Refresh(); - } + } } void MyFrame::OnToggleIcon(wxCommandEvent& WXUNUSED(event)) @@ -902,14 +901,14 @@ void MyFrame::OnSelectLast(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnSetFgColour(wxCommandEvent& WXUNUSED(event)) { wxColour col = wxGetColourFromUser(this, m_treeCtrl->GetForegroundColour()); - if ( col.Ok() ) + if ( col.IsOk() ) m_treeCtrl->SetForegroundColour(col); } void MyFrame::OnSetBgColour(wxCommandEvent& WXUNUSED(event)) { wxColour col = wxGetColourFromUser(this, m_treeCtrl->GetBackgroundColour()); - if ( col.Ok() ) + if ( col.IsOk() ) m_treeCtrl->SetBackgroundColour(col); } @@ -1024,10 +1023,10 @@ void MyTreeCtrl::CreateStateImageList(bool del) wxIcon icons[2]; icons[0] = wxIcon(unchecked_xpm); icons[1] = wxIcon(checked_xpm); - + int width = icons[0].GetWidth(), height = icons[0].GetHeight(); - + // Make an state image list containing small icons states = new wxImageList(width, height, true); @@ -1571,13 +1570,14 @@ void MyTreeCtrl::OnItemStateClick(wxTreeEvent& event) void MyTreeCtrl::OnItemMenu(wxTreeEvent& event) { wxTreeItemId itemId = event.GetItem(); - MyTreeItemData *item = itemId.IsOk() ? (MyTreeItemData *)GetItemData(itemId) - : NULL; + wxCHECK_RET( itemId.IsOk(), "should have a valid item" ); + + MyTreeItemData *item = (MyTreeItemData *)GetItemData(itemId); wxPoint clientpt = event.GetPoint(); wxPoint screenpt = ClientToScreen(clientpt); wxLogMessage(wxT("OnItemMenu for item \"%s\" at screen coords (%i, %i)"), - item ? item->GetDesc() : wxT(""), screenpt.x, screenpt.y); + item->GetDesc(), screenpt.x, screenpt.y); ShowMenu(itemId, clientpt); event.Skip(); @@ -1618,11 +1618,11 @@ void MyTreeCtrl::ShowMenu(wxTreeItemId id, const wxPoint& pt) void MyTreeCtrl::OnItemRClick(wxTreeEvent& event) { wxTreeItemId itemId = event.GetItem(); - MyTreeItemData *item = itemId.IsOk() ? (MyTreeItemData *)GetItemData(itemId) - : NULL; + wxCHECK_RET( itemId.IsOk(), "should have a valid item" ); + + MyTreeItemData *item = (MyTreeItemData *)GetItemData(itemId); - wxLogMessage(wxT("Item \"%s\" right clicked"), item ? item->GetDesc() - : wxT("")); + wxLogMessage(wxT("Item \"%s\" right clicked"), item->GetDesc()); event.Skip(); }