Added wxSHOW_EFFECT_NONE.

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

diff --git a/samples/treectrl/treetest.cpp b/samples/treectrl/treetest.cpp
index edc685a3074fb6224a3e70baebae7568ca3a2111..41a86c466c83e229985dae9e9527b589a726b6b1 100644 (file)
--- a/samples/treectrl/treetest.cpp
+++ b/samples/treectrl/treetest.cpp
@@ -419,13 +419,13 @@ void MyFrame::OnIdle(wxIdleEvent& event)
         {
             wxTreeItemId idLast = m_treeCtrl->GetLastChild(idRoot);
             status = wxString::Format(
         {
             wxTreeItemId idLast = m_treeCtrl->GetLastChild(idRoot);
             status = wxString::Format(

-                _T("Root/last item is %svisible/%svisible"),
-                m_treeCtrl->IsVisible(idRoot) ? _T("") : _T("not "),
+                wxT("Root/last item is %svisible/%svisible"),
+                m_treeCtrl->IsVisible(idRoot) ? wxT("") : wxT("not "),

                 idLast.IsOk() && m_treeCtrl->IsVisible(idLast)
                 idLast.IsOk() && m_treeCtrl->IsVisible(idLast)

-                    ? _T("") : _T("not "));
+                    ? wxT("") : wxT("not "));

         }
         else
         }
         else

-            status = _T("No root item");
+            status = wxT("No root item");

 
         SetStatusText(status, 1);
     }
 
         SetStatusText(status, 1);
     }


@@ -538,7 +538,7 @@ void MyFrame::OnHighlight(wxCommandEvent& WXUNUSED(event))
     wxRect r;
     if ( !m_treeCtrl->GetBoundingRect(id, r, true /* text, not full row */) )
     {
     wxRect r;
     if ( !m_treeCtrl->GetBoundingRect(id, r, true /* text, not full row */) )
     {

-        wxLogMessage(_T("Failed to get bounding item rect"));
+        wxLogMessage(wxT("Failed to get bounding item rect"));

         return;
     }
 
         return;
     }
 


@@ -802,10 +802,14 @@ void MyFrame::DoShowFirstOrLast(TreeFunc0_t pfn, const wxString& label)
     const wxTreeItemId item = (m_treeCtrl->*pfn)();
 
     if ( !item.IsOk() )
     const wxTreeItemId item = (m_treeCtrl->*pfn)();
 
     if ( !item.IsOk() )

+    {

         wxLogMessage("There is no %s item", label);
         wxLogMessage("There is no %s item", label);

+    }

     else
     else

+    {

         wxLogMessage("The %s item is \"%s\"",
                      label, m_treeCtrl->GetItemText(item));
         wxLogMessage("The %s item is \"%s\"",
                      label, m_treeCtrl->GetItemText(item));

+    }

 }
 
 void MyFrame::DoShowRelativeItem(TreeFunc1_t pfn, const wxString& label)
 }
 
 void MyFrame::DoShowRelativeItem(TreeFunc1_t pfn, const wxString& label)


@@ -825,10 +829,14 @@ void MyFrame::DoShowRelativeItem(TreeFunc1_t pfn, const wxString& label)
     wxTreeItemId new_item = (m_treeCtrl->*pfn)(item);
 
     if ( !new_item.IsOk() )
     wxTreeItemId new_item = (m_treeCtrl->*pfn)(item);
 
     if ( !new_item.IsOk() )

+    {

         wxLogMessage("There is no %s item", label);
         wxLogMessage("There is no %s item", label);

+    }

     else
     else

+    {

         wxLogMessage("The %s item is \"%s\"",
                      label, m_treeCtrl->GetItemText(new_item));
         wxLogMessage("The %s item is \"%s\"",
                      label, m_treeCtrl->GetItemText(new_item));

+    }

 }
 
 void MyFrame::OnScrollTo(wxCommandEvent& WXUNUSED(event))
 }
 
 void MyFrame::OnScrollTo(wxCommandEvent& WXUNUSED(event))


@@ -1220,9 +1228,9 @@ void MyTreeCtrl::LogEvent(const wxChar *name, const wxTreeEvent& event)
     wxTreeItemId item = event.GetItem();
     wxString text;
     if ( item.IsOk() )
     wxTreeItemId item = event.GetItem();
     wxString text;
     if ( item.IsOk() )

-        text << _T('"') << GetItemText(item).c_str() << _T('"');
+        text << wxT('"') << GetItemText(item).c_str() << wxT('"');

     else
     else

-        text = _T("invalid item");
+        text = wxT("invalid item");

     wxLogMessage(wxT("%s(%s)"), name, text.c_str());
 }
 
     wxLogMessage(wxT("%s(%s)"), name, text.c_str());
 }
 


@@ -1230,7 +1238,7 @@ void MyTreeCtrl::LogEvent(const wxChar *name, const wxTreeEvent& event)
 #define TREE_EVENT_HANDLER(name)                                 \
 void MyTreeCtrl::name(wxTreeEvent& event)                        \
 {                                                                \
 #define TREE_EVENT_HANDLER(name)                                 \
 void MyTreeCtrl::name(wxTreeEvent& event)                        \
 {                                                                \

-    LogEvent(_T(#name), event);                                  \
+    LogEvent(wxT(#name), event);                                  \

     SetLastItem(wxTreeItemId());                                 \
     event.Skip();                                                \
 }
     SetLastItem(wxTreeItemId());                                 \
     event.Skip();                                                \
 }


@@ -1456,7 +1464,7 @@ void MyTreeCtrl::OnBeginLabelEdit(wxTreeEvent& event)
     else if ( itemId == GetRootItem() )
     {
         // test that it is possible to change the text of the item being edited
     else if ( itemId == GetRootItem() )
     {
         // test that it is possible to change the text of the item being edited

-        SetItemText(itemId, _T("Editing root item"));
+        SetItemText(itemId, wxT("Editing root item"));

     }
 }
 
     }
 }
 


@@ -1520,7 +1528,7 @@ void MyTreeCtrl::OnItemMenu(wxTreeEvent& event)
     wxPoint screenpt = ClientToScreen(clientpt);
 
     wxLogMessage(wxT("OnItemMenu for item \"%s\" at screen coords (%i, %i)"),
     wxPoint screenpt = ClientToScreen(clientpt);
 
     wxLogMessage(wxT("OnItemMenu for item \"%s\" at screen coords (%i, %i)"),

-                 item ? item->GetDesc() : _T(""), screenpt.x, screenpt.y);
+                 item ? item->GetDesc() : wxT(""), screenpt.x, screenpt.y);

 
     ShowMenu(itemId, clientpt);
     event.Skip();
 
     ShowMenu(itemId, clientpt);
     event.Skip();


@@ -1565,7 +1573,7 @@ void MyTreeCtrl::OnItemRClick(wxTreeEvent& event)
                                          : NULL;
 
     wxLogMessage(wxT("Item \"%s\" right clicked"), item ? item->GetDesc()
                                          : NULL;
 
     wxLogMessage(wxT("Item \"%s\" right clicked"), item ? item->GetDesc()

-                                                        : _T(""));
+                                                        : wxT(""));

 
     event.Skip();
 }
 
     event.Skip();
 }


@@ -1588,12 +1596,16 @@ void MyTreeCtrl::OnRMouseDClick(wxMouseEvent& event)
 {
     wxTreeItemId id = HitTest(event.GetPosition());
     if ( !id )
 {
     wxTreeItemId id = HitTest(event.GetPosition());
     if ( !id )

+    {

         wxLogMessage(wxT("No item under mouse"));
         wxLogMessage(wxT("No item under mouse"));

+    }

     else
     {
         MyTreeItemData *item = (MyTreeItemData *)GetItemData(id);
         if ( item )
     else
     {
         MyTreeItemData *item = (MyTreeItemData *)GetItemData(id);
         if ( item )

+        {

             wxLogMessage(wxT("Item '%s' under mouse"), item->GetDesc());
             wxLogMessage(wxT("Item '%s' under mouse"), item->GetDesc());

+        }

     }
 
     event.Skip();
     }
 
     event.Skip();