Correctly stop the loading animation in the sample when we veto navigation.

[wxWidgets.git] / samples / treectrl / treetest.cpp

diff --git a/samples/treectrl/treetest.cpp b/samples/treectrl/treetest.cpp
index 6ea0f3465d9d50a1db2a6ce735d22ec1329ab0a6..8bfb579636cb7394e4c94ec73129cce62d468112 100644 (file)
--- a/samples/treectrl/treetest.cpp
+++ b/samples/treectrl/treetest.cpp
@@ -198,7 +198,6 @@ bool MyApp::OnInit()
 
     // Show the frame
     frame->Show(true);
 
     // Show the frame
     frame->Show(true);

-    SetTopWindow(frame);

 
     return true;
 }
 
     return true;
 }


@@ -807,7 +806,7 @@ void MyFrame::OnDecSpacing(wxCommandEvent& WXUNUSED(event))
     {
         m_treeCtrl->SetSpacing( indent-5 );
         m_treeCtrl->Refresh();
     {
         m_treeCtrl->SetSpacing( indent-5 );
         m_treeCtrl->Refresh();

-    } 
+    }

 }
 
 void MyFrame::OnToggleIcon(wxCommandEvent& WXUNUSED(event))
 }
 
 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());
 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());
         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);
 }
 
         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);
         wxIcon icons[2];
         icons[0] = wxIcon(unchecked_xpm);
         icons[1] = wxIcon(checked_xpm);

-        
+

         int width  = icons[0].GetWidth(),
             height = icons[0].GetHeight();
         int width  = icons[0].GetWidth(),
             height = icons[0].GetHeight();

-            
+

         // Make an state image list containing small icons
         states = new wxImageList(width, height, true);
 
         // 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();
 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)"),
     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();
 
     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();
 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();
 }
 
     event.Skip();
 }