Mention that stock bitmaps are a wxGTK-only feature for now.

[wxWidgets.git] / samples / regtest / regtest.cpp

diff --git a/samples/regtest/regtest.cpp b/samples/regtest/regtest.cpp
index 76845feb09506282befaac326e0fd75064307434..3baae4694f75260b9a7f0f0cf4d3f4be1541fa59 100644 (file)
--- a/samples/regtest/regtest.cpp
+++ b/samples/regtest/regtest.cpp
@@ -114,17 +114,17 @@ private:
     public:
         RegTreeCtrl  *m_pTree;     // must be !NULL
         TreeNode     *m_pParent;    // NULL only for the root node
     public:
         RegTreeCtrl  *m_pTree;     // must be !NULL
         TreeNode     *m_pParent;    // NULL only for the root node

-        long          m_id;         // the id of the tree control item
+        wxTreeItemId  m_id;         // the id of the tree control item

         wxString      m_strName;    // name of the key/value
         TreeChildren  m_aChildren;  // array of subkeys/values
         bool          m_bKey;       // key or value?
         wxRegKey     *m_pKey;       // only may be !NULL if m_bKey == true
 
         // trivial accessors
         wxString      m_strName;    // name of the key/value
         TreeChildren  m_aChildren;  // array of subkeys/values
         bool          m_bKey;       // key or value?
         wxRegKey     *m_pKey;       // only may be !NULL if m_bKey == true
 
         // trivial accessors

-        long      Id()     const { return m_id;              }
-        bool      IsRoot() const { return m_pParent == NULL; }
-        bool      IsKey()  const { return m_bKey;            }
-        TreeNode *Parent() const { return m_pParent;         }
+        wxTreeItemId  Id()     const { return m_id;              }
+        bool          IsRoot() const { return m_pParent == NULL; }
+        bool          IsKey()  const { return m_bKey;            }
+        TreeNode     *Parent() const { return m_pParent;         }

 
         // notifications
         bool OnExpand();
 
         // notifications
         bool OnExpand();


@@ -156,7 +156,7 @@ private:
     wxString     m_nameOld;           // the initial value of item being renamed
 
     TreeNode *GetNode(const wxTreeEvent& event)
     wxString     m_nameOld;           // the initial value of item being renamed
 
     TreeNode *GetNode(const wxTreeEvent& event)

-        { return (TreeNode *)GetItemData((WXHTREEITEM)event.GetItem()); }
+        { return (TreeNode *)GetItemData(event.GetItem()); }

 
 public:
     // create a new node and insert it to the tree
 
 public:
     // create a new node and insert it to the tree


@@ -181,7 +181,7 @@ class RegFrame : public wxFrame
 {
 public:
     // ctor & dtor
 {
 public:
     // ctor & dtor

-    RegFrame(wxFrame *parent, wxChar *title, int x, int y, int w, int h);
+    RegFrame(wxFrame *parent, const wxChar *title, int x, int y, int w, int h);

     virtual ~RegFrame();
 
     // callbacks
     virtual ~RegFrame();
 
     // callbacks


@@ -233,7 +233,7 @@ enum
     Menu_Delete,
     Menu_Info,
 
     Menu_Delete,
     Menu_Info,
 

-    Ctrl_RegTree  = 200,
+    Ctrl_RegTree  = 200

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -259,9 +259,10 @@ END_EVENT_TABLE()
 #if DO_REGTEST
 
 BEGIN_EVENT_TABLE(RegTreeCtrl, wxTreeCtrl)
 #if DO_REGTEST
 
 BEGIN_EVENT_TABLE(RegTreeCtrl, wxTreeCtrl)

-    EVT_TREE_DELETE_ITEM   (Ctrl_RegTree, RegTreeCtrl::OnDeleteItem)
-    EVT_TREE_ITEM_EXPANDING(Ctrl_RegTree, RegTreeCtrl::OnItemExpanding)
-    EVT_TREE_SEL_CHANGED   (Ctrl_RegTree, RegTreeCtrl::OnSelChanged)
+    EVT_TREE_DELETE_ITEM    (Ctrl_RegTree, RegTreeCtrl::OnDeleteItem)
+    EVT_TREE_ITEM_EXPANDING (Ctrl_RegTree, RegTreeCtrl::OnItemExpanding)
+    EVT_TREE_ITEM_COLLAPSING(Ctrl_RegTree, RegTreeCtrl::OnItemExpanding)
+    EVT_TREE_SEL_CHANGED    (Ctrl_RegTree, RegTreeCtrl::OnSelChanged)

 
     EVT_TREE_BEGIN_LABEL_EDIT(Ctrl_RegTree, RegTreeCtrl::OnBeginEdit)
     EVT_TREE_END_LABEL_EDIT  (Ctrl_RegTree, RegTreeCtrl::OnEndEdit)
 
     EVT_TREE_BEGIN_LABEL_EDIT(Ctrl_RegTree, RegTreeCtrl::OnBeginEdit)
     EVT_TREE_END_LABEL_EDIT  (Ctrl_RegTree, RegTreeCtrl::OnEndEdit)


@@ -289,23 +290,23 @@ END_EVENT_TABLE()
 wxMenu *CreateRegistryMenu()
 {
     wxMenu *pMenuNew = new wxMenu;
 wxMenu *CreateRegistryMenu()
 {
     wxMenu *pMenuNew = new wxMenu;

-    pMenuNew->Append(Menu_NewKey,    _T("&Key"),          _T("Create a new key"));
+    pMenuNew->Append(Menu_NewKey,    wxT("&Key"),          wxT("Create a new key"));

     pMenuNew->AppendSeparator();
     pMenuNew->AppendSeparator();

-    pMenuNew->Append(Menu_NewText,   _T("&Text value"),   _T("Create a new text value"));
-    pMenuNew->Append(Menu_NewBinary, _T("&Binary value"), _T("Create a new binary value"));
+    pMenuNew->Append(Menu_NewText,   wxT("&Text value"),   wxT("Create a new text value"));
+    pMenuNew->Append(Menu_NewBinary, wxT("&Binary value"), wxT("Create a new binary value"));

 
     wxMenu *pMenuReg = new wxMenu;
 
     wxMenu *pMenuReg = new wxMenu;

-    pMenuReg->Append(Menu_New, _T("&New"), pMenuNew);
-    pMenuReg->Append(Menu_Delete,   _T("&Delete..."), _T("Delete selected key/value"));
+    pMenuReg->Append(Menu_New, wxT("&New"), pMenuNew);
+    pMenuReg->Append(Menu_Delete,   wxT("&Delete..."), wxT("Delete selected key/value"));

     pMenuReg->AppendSeparator();
     pMenuReg->AppendSeparator();

-    pMenuReg->Append(Menu_GoTo,     _T("&Go to...\tCtrl-G"),    _T("Go to registry key"));
-    pMenuReg->Append(Menu_Expand,   _T("&Expand"),    _T("Expand current key"));
-    pMenuReg->Append(Menu_Collapse, _T("&Collapse"),  _T("Collapse current key"));
-    pMenuReg->Append(Menu_Toggle,   _T("&Toggle"),    _T("Toggle current key"));
+    pMenuReg->Append(Menu_GoTo,     wxT("&Go to...\tCtrl-G"),    wxT("Go to registry key"));
+    pMenuReg->Append(Menu_Expand,   wxT("&Expand"),    wxT("Expand current key"));
+    pMenuReg->Append(Menu_Collapse, wxT("&Collapse"),  wxT("Collapse current key"));
+    pMenuReg->Append(Menu_Toggle,   wxT("&Toggle"),    wxT("Toggle current key"));

     pMenuReg->AppendSeparator();
     pMenuReg->AppendSeparator();

-    pMenuReg->Append(Menu_Refresh,  _T("&Refresh"),   _T("Refresh the subtree"));
+    pMenuReg->Append(Menu_Refresh,  wxT("&Refresh"),   wxT("Refresh the subtree"));

     pMenuReg->AppendSeparator();
     pMenuReg->AppendSeparator();

-    pMenuReg->Append(Menu_Info,     _T("&Properties"),_T("Information about current selection"));
+    pMenuReg->Append(Menu_Info,     wxT("&Properties"),wxT("Information about current selection"));

 
     return pMenuReg;
 }
 
     return pMenuReg;
 }


@@ -318,8 +319,11 @@ IMPLEMENT_APP(RegApp)
 // `Main program' equivalent, creating windows and returning main app frame
 bool RegApp::OnInit()
 {
 // `Main program' equivalent, creating windows and returning main app frame
 bool RegApp::OnInit()
 {

+    if ( !wxApp::OnInit() )
+        return false;
+

     // create the main frame window and show it
     // create the main frame window and show it

-    RegFrame *frame = new RegFrame(NULL, _T("wxRegTest"), 50, 50, 600, 350);
+    RegFrame *frame = new RegFrame(NULL, wxT("wxRegTest"), 50, 50, 600, 350);

     frame->Show(true);
 
     SetTopWindow(frame);
     frame->Show(true);
 
     SetTopWindow(frame);


@@ -331,28 +335,28 @@ bool RegApp::OnInit()
 // RegFrame
 // ----------------------------------------------------------------------------
 
 // RegFrame
 // ----------------------------------------------------------------------------
 

-RegFrame::RegFrame(wxFrame *parent, wxChar *title, int x, int y, int w, int h)
-        : wxFrame(parent, -1, title, wxPoint(x, y), wxSize(w, h))
+RegFrame::RegFrame(wxFrame *parent, const wxChar *title, int x, int y, int w, int h)
+        : wxFrame(parent, wxID_ANY, title, wxPoint(x, y), wxSize(w, h))

 {
     // this reduces flicker effects
     SetBackgroundColour(wxColour(255, 255, 255));
 
     // set the icon
     // ------------
 {
     // this reduces flicker effects
     SetBackgroundColour(wxColour(255, 255, 255));
 
     // set the icon
     // ------------

-    SetIcon(wxIcon(_T("app_icon")));
+    SetIcon(wxIcon(wxT("app_icon")));

 
     // create menu
     // -----------
     wxMenu *pMenuFile = new wxMenu;
 
     // create menu
     // -----------
     wxMenu *pMenuFile = new wxMenu;

-    pMenuFile->Append(Menu_Test, _T("Te&st"), _T("Test key creation"));
+    pMenuFile->Append(Menu_Test, wxT("Te&st"), wxT("Test key creation"));

     pMenuFile->AppendSeparator();
     pMenuFile->AppendSeparator();

-    pMenuFile->Append(Menu_About, _T("&About..."), _T("Show an extraordinarly beautiful dialog"));
+    pMenuFile->Append(Menu_About, wxT("&About..."), wxT("Show an extraordinarly beautiful dialog"));

     pMenuFile->AppendSeparator();
     pMenuFile->AppendSeparator();

-    pMenuFile->Append(Menu_Quit,  _T("E&xit"), _T("Quit this program"));
+    pMenuFile->Append(Menu_Quit,  wxT("E&xit"), wxT("Quit this program"));

 
     wxMenuBar *pMenu = new wxMenuBar;
 
     wxMenuBar *pMenu = new wxMenuBar;

-    pMenu->Append(pMenuFile, _T("&File"));
-    pMenu->Append(CreateRegistryMenu(),  _T("&Registry"));
+    pMenu->Append(pMenuFile, wxT("&File"));
+    pMenu->Append(CreateRegistryMenu(),  wxT("&Registry"));

     SetMenuBar(pMenu);
 
 #if DO_REGTEST
     SetMenuBar(pMenu);
 
 #if DO_REGTEST


@@ -361,9 +365,11 @@ RegFrame::RegFrame(wxFrame *parent, wxChar *title, int x, int y, int w, int h)
     m_treeCtrl = new RegTreeCtrl(this, Ctrl_RegTree);
 #endif
 
     m_treeCtrl = new RegTreeCtrl(this, Ctrl_RegTree);
 #endif
 

+#if wxUSE_STATUSBAR

     // create the status line
     // ----------------------
     CreateStatusBar(2);
     // create the status line
     // ----------------------
     CreateStatusBar(2);

+#endif // wxUSE_STATUSBAR

 }
 
 RegFrame::~RegFrame()
 }
 
 RegFrame::~RegFrame()


@@ -382,9 +388,9 @@ void RegFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 void RegFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
     wxMessageDialog dialog(this,
 void RegFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
     wxMessageDialog dialog(this,

-        _T("wxRegistry sample\n")
-        _T("© 1998, 2000 Vadim Zeitlin"),
-        _T("About wxRegTest"), wxOK);
+        wxT("wxRegistry sample\n")
+        wxT("(c) 1998, 2000 Vadim Zeitlin"),
+        wxT("About wxRegTest"), wxOK);

 
     dialog.ShowModal();
 }
 
     dialog.ShowModal();
 }


@@ -398,11 +404,11 @@ void RegFrame::OnTest(wxCommandEvent& WXUNUSED(event))
 
 void RegFrame::OnGoTo(wxCommandEvent& WXUNUSED(event))
 {
 
 void RegFrame::OnGoTo(wxCommandEvent& WXUNUSED(event))
 {

-    static wxString s_location = _T("HKEY_CURRENT_USER\\Software\\wxWindows");
+    static wxString s_location = wxT("HKEY_CURRENT_USER\\Software\\wxWidgets");

 
     wxString location = wxGetTextFromUser(
 
     wxString location = wxGetTextFromUser(

-        _T("Enter the location to go to:"),
-        _T("wxRegTest question"),
+        wxT("Enter the location to go to:"),
+        wxT("wxRegTest question"),

         s_location,
         this);
 
         s_location,
         this);
 


@@ -456,7 +462,7 @@ void RegFrame::OnNewKey(wxCommandEvent& WXUNUSED(event))
     if ( m_treeCtrl->IsKeySelected() )
     {
         m_treeCtrl->CreateNewKey(
     if ( m_treeCtrl->IsKeySelected() )
     {
         m_treeCtrl->CreateNewKey(

-            wxGetTextFromUser(_T("Enter the name of the new key")));
+            wxGetTextFromUser(wxT("Enter the name of the new key")));

     }
 #endif
 }
     }
 #endif
 }


@@ -467,7 +473,7 @@ void RegFrame::OnNewText(wxCommandEvent& WXUNUSED(event))
     if ( m_treeCtrl->IsKeySelected() )
     {
         m_treeCtrl->CreateNewTextValue(
     if ( m_treeCtrl->IsKeySelected() )
     {
         m_treeCtrl->CreateNewTextValue(

-            wxGetTextFromUser(_T("Enter the name for the new text value")));
+            wxGetTextFromUser(wxT("Enter the name for the new text value")));

     }
 #endif
 }
     }
 #endif
 }


@@ -478,7 +484,7 @@ void RegFrame::OnNewBinary(wxCommandEvent& WXUNUSED(event))
     if ( m_treeCtrl->IsKeySelected() )
     {
         m_treeCtrl->CreateNewBinaryValue(
     if ( m_treeCtrl->IsKeySelected() )
     {
         m_treeCtrl->CreateNewBinaryValue(

-            wxGetTextFromUser(_T("Enter the name for the new binary value")));
+            wxGetTextFromUser(wxT("Enter the name for the new binary value")));

     }
 #endif
 }
     }
 #endif
 }


@@ -496,8 +502,8 @@ void RegFrame::OnInfo(wxCommandEvent& WXUNUSED(event))
 RegImageList::RegImageList() : wxImageList(16, 16, true)
 {
     // should be in sync with enum RegImageList::RegIcon
 RegImageList::RegImageList() : wxImageList(16, 16, true)
 {
     // should be in sync with enum RegImageList::RegIcon

-    static const wxChar *aszIcons[] = { _T("key1"),_T("key2"),_T("key3"),_T("value1"),_T("value2") };
-    wxString str = _T("icon_");
+    static const wxChar *aszIcons[] = { wxT("key1"),wxT("key2"),wxT("key3"),wxT("value1"),wxT("value2") };
+    wxString str = wxT("icon_");

     for ( unsigned int n = 0; n < WXSIZEOF(aszIcons); n++ )
     {
         Add(wxIcon(str + aszIcons[n], wxBITMAP_TYPE_ICO_RESOURCE));
     for ( unsigned int n = 0; n < WXSIZEOF(aszIcons); n++ )
     {
         Add(wxIcon(str + aszIcons[n], wxBITMAP_TYPE_ICO_RESOURCE));


@@ -576,7 +582,7 @@ RegTreeCtrl::RegTreeCtrl(wxWindow *parent, wxWindowID id)
 
     // create root keys
     // ----------------
 
     // create root keys
     // ----------------

-    m_pRoot = InsertNewTreeNode(NULL, _T("Registry Root"), RegImageList::Root);
+    m_pRoot = InsertNewTreeNode(NULL, wxT("Registry Root"), RegImageList::Root);

 
     // create popup menu
     // -----------------
 
     // create popup menu
     // -----------------


@@ -617,7 +623,7 @@ void RegTreeCtrl::OnIdle(wxIdleEvent& WXUNUSED(event))
 void RegTreeCtrl::OnRightClick(wxMouseEvent& event)
 {
     int iFlags;
 void RegTreeCtrl::OnRightClick(wxMouseEvent& event)
 {
     int iFlags;

-    long lId = HitTest(wxPoint(event.GetX(), event.GetY()), iFlags);
+    wxTreeItemId lId = HitTest(wxPoint(event.GetX(), event.GetY()), iFlags);

     if ( iFlags & wxTREE_HITTEST_ONITEMLABEL )
     {
         // select the item first
     if ( iFlags & wxTREE_HITTEST_ONITEMLABEL )
     {
         // select the item first


@@ -636,7 +642,7 @@ void RegTreeCtrl::OnDeleteItem(wxTreeEvent& WXUNUSED(event))
 // test the key creation functions
 void RegTreeCtrl::OnMenuTest()
 {
 // test the key creation functions
 void RegTreeCtrl::OnMenuTest()
 {

-    long lId = GetSelection();
+    wxTreeItemId lId = GetSelection();

     TreeNode *pNode = (TreeNode *)GetItemData(lId);
 
     wxCHECK_RET( pNode != NULL, wxT("tree item without data?") );
     TreeNode *pNode = (TreeNode *)GetItemData(lId);
 
     wxCHECK_RET( pNode != NULL, wxT("tree item without data?") );


@@ -653,16 +659,16 @@ void RegTreeCtrl::OnMenuTest()
         return;
     }
 
         return;
     }
 

-    wxRegKey key1(pNode->Key(), _T("key1"));
+    wxRegKey key1(pNode->Key(), wxT("key1"));

     if ( key1.Create() )
     {
     if ( key1.Create() )
     {

-        wxRegKey key2a(key1, _T("key2a")), key2b(key1, _T("key2b"));
+        wxRegKey key2a(key1, wxT("key2a")), key2b(key1, wxT("key2b"));

         if ( key2a.Create() && key2b.Create() )
         {
             // put some values under the newly created keys
         if ( key2a.Create() && key2b.Create() )
         {
             // put some values under the newly created keys

-            key1.SetValue(wxT("first_term"), _T("10"));
-            key1.SetValue(wxT("second_term"), _T("7"));
-            key2a = _T("this is the unnamed value");
+            key1.SetValue(wxT("first_term"), wxT("10"));
+            key1.SetValue(wxT("second_term"), wxT("7"));
+            key2a = wxT("this is the unnamed value");

             key2b.SetValue(wxT("sum"), 17);
 
             // refresh tree
             key2b.SetValue(wxT("sum"), 17);
 
             // refresh tree


@@ -697,14 +703,18 @@ void RegTreeCtrl::OnChar(wxKeyEvent& event)
 
 void RegTreeCtrl::OnSelChanged(wxTreeEvent& event)
 {
 
 void RegTreeCtrl::OnSelChanged(wxTreeEvent& event)
 {

+#if wxUSE_STATUSBAR

     wxFrame *pFrame = (wxFrame *) wxWindow::GetParent();
     pFrame->SetStatusText(GetNode(event)->FullName(), 1);
     wxFrame *pFrame = (wxFrame *) wxWindow::GetParent();
     pFrame->SetStatusText(GetNode(event)->FullName(), 1);

+#else
+    wxUnusedVar(event);
+#endif // wxUSE_STATUSBAR

 }
 
 void RegTreeCtrl::OnItemExpanding(wxTreeEvent& event)
 {
     TreeNode *pNode = GetNode(event);
 }
 
 void RegTreeCtrl::OnItemExpanding(wxTreeEvent& event)
 {
     TreeNode *pNode = GetNode(event);

-    bool bExpanding = event.GetKeyCode() == wxTREE_EXPAND_EXPAND;
+    bool bExpanding = event.GetEventType() == wxEVT_COMMAND_TREE_ITEM_EXPANDING;

 
     // expansion might take some time
     wxSetCursor(*wxHOURGLASS_CURSOR);
 
     // expansion might take some time
     wxSetCursor(*wxHOURGLASS_CURSOR);


@@ -733,7 +743,7 @@ void RegTreeCtrl::OnBeginEdit(wxTreeEvent& event)
     TreeNode *pNode = GetNode(event);
     if ( pNode->IsRoot() || pNode->Parent()->IsRoot() )
     {
     TreeNode *pNode = GetNode(event);
     if ( pNode->IsRoot() || pNode->Parent()->IsRoot() )
     {

-        wxLogStatus(_T("This registry key can't be renamed."));
+        wxLogStatus(wxT("This registry key can't be renamed."));

 
         event.Veto();
     }
 
         event.Veto();
     }


@@ -765,7 +775,7 @@ void RegTreeCtrl::OnEndEdit(wxTreeEvent& event)
 
     if ( !ok )
     {
 
     if ( !ok )
     {

-        wxLogError(_T("Failed to rename '%s' to '%s'."),
+        wxLogError(wxT("Failed to rename '%s' to '%s'."),

             m_nameOld.c_str(), name.c_str());
     }
 #if 0   // MSW tree ctrl doesn't like this at all, it hangs
             m_nameOld.c_str(), name.c_str());
     }
 #if 0   // MSW tree ctrl doesn't like this at all, it hangs


@@ -835,8 +845,8 @@ void RegTreeCtrl::OnEndDrag(wxTreeEvent& event)
     nameDst << wxString(dst->FullName()).AfterFirst('\\') << '\\'
             << wxString(src->FullName()).AfterLast('\\');
 
     nameDst << wxString(dst->FullName()).AfterFirst('\\') << '\\'
             << wxString(src->FullName()).AfterLast('\\');
 

-    wxString verb = m_copyOnDrop ? _T("copy") : _T("move");
-    wxString what = isKey ? _T("key") : _T("value");
+    wxString verb = m_copyOnDrop ? wxT("copy") : wxT("move");
+    wxString what = isKey ? wxT("key") : wxT("value");

 
     if ( wxMessageBox(wxString::Format
                         (
 
     if ( wxMessageBox(wxString::Format
                         (


@@ -846,7 +856,7 @@ void RegTreeCtrl::OnEndDrag(wxTreeEvent& event)
                          nameSrc.c_str(),
                          nameDst.c_str()
                         ),
                          nameSrc.c_str(),
                          nameDst.c_str()
                         ),

-                      _T("RegTest Confirm"),
+                      wxT("RegTest Confirm"),

                       wxICON_QUESTION | wxYES_NO | wxCANCEL, this) != wxYES ) {
       return;
     }
                       wxICON_QUESTION | wxYES_NO | wxCANCEL, this) != wxYES ) {
       return;
     }


@@ -958,11 +968,11 @@ bool RegTreeCtrl::TreeNode::OnExpand()
     while ( bCont )
     {
         wxString strItem;
     while ( bCont )
     {
         wxString strItem;

-        if (str.IsEmpty())
-            strItem = _T("<default>");
+        if (str.empty())
+            strItem = wxT("<default>");

         else
             strItem = str;
         else
             strItem = str;

-        strItem += _T(" = ");
+        strItem += wxT(" = ");

 
         // determine the appropriate icon
         RegImageList::Icon icon;
 
         // determine the appropriate icon
         RegImageList::Icon icon;


@@ -1082,11 +1092,8 @@ void RegTreeCtrl::TreeNode::DestroyChildren()
     size_t nCount = m_aChildren.GetCount();
     for ( size_t n = 0; n < nCount; n++ )
     {
     size_t nCount = m_aChildren.GetCount();
     for ( size_t n = 0; n < nCount; n++ )
     {

-        long lId = m_aChildren[n]->Id();
-        // no, wxTreeCtrl will do it
-        //delete m_aChildren[n];
-        wxTreeItemId theId(lId); // Temp variable seems necessary for BC++
-        m_pTree->Delete(theId);
+        wxTreeItemId lId = m_aChildren[n]->Id();
+        m_pTree->Delete(lId);

     }
 
     m_aChildren.Empty();
     }
 
     m_aChildren.Empty();


@@ -1122,7 +1129,7 @@ const wxChar *RegTreeCtrl::TreeNode::FullName() const
 
 void RegTreeCtrl::GoTo(const wxString& location)
 {
 
 void RegTreeCtrl::GoTo(const wxString& location)
 {

-    wxStringTokenizer tk(location, _T("\\"));
+    wxStringTokenizer tk(location, wxT("\\"));

 
     wxTreeItemId id = GetRootItem();
 
 
     wxTreeItemId id = GetRootItem();
 


@@ -1165,7 +1172,7 @@ void RegTreeCtrl::GoTo(const wxString& location)
 
         if ( !id.IsOk() )
         {
 
         if ( !id.IsOk() )
         {

-            wxLogError(_T("No such key '%s'."), location.c_str());
+            wxLogError(wxT("No such key '%s'."), location.c_str());

 
             return;
         }
 
             return;
         }


@@ -1177,17 +1184,17 @@ void RegTreeCtrl::GoTo(const wxString& location)
 
 void RegTreeCtrl::DeleteSelected()
 {
 
 void RegTreeCtrl::DeleteSelected()
 {

-    long lCurrent = GetSelection(),
-        lParent  = GetItemParent(lCurrent);
+    wxTreeItemId lCurrent = GetSelection(),
+                 lParent  = GetItemParent(lCurrent);

 
 

-    if ( lParent == 0 )
+    if ( lParent == GetRootItem() )

     {
         wxLogError(wxT("Can't delete root key."));
         return;
     }
 
     TreeNode *pCurrent = (TreeNode *)GetItemData(lCurrent),
     {
         wxLogError(wxT("Can't delete root key."));
         return;
     }
 
     TreeNode *pCurrent = (TreeNode *)GetItemData(lCurrent),

-        *pParent  = (TreeNode *)GetItemData(lParent);
+             *pParent  = (TreeNode *)GetItemData(lParent);

 
     wxCHECK_RET(pCurrent && pParent, wxT("either node or parent without data?"));
 
 
     wxCHECK_RET(pCurrent && pParent, wxT("either node or parent without data?"));
 


@@ -1197,13 +1204,13 @@ void RegTreeCtrl::DeleteSelected()
         return;
     }
 
         return;
     }
 

-    wxString what = pCurrent->IsKey() ? _T("key") : _T("value");
+    wxString what = pCurrent->IsKey() ? wxT("key") : wxT("value");

     if ( wxMessageBox(wxString::Format
         (
             wxT("Do you really want to delete this %s?"),
             what.c_str()
         ),
     if ( wxMessageBox(wxString::Format
         (
             wxT("Do you really want to delete this %s?"),
             what.c_str()
         ),

-        _T("Confirmation"),
+        wxT("Confirmation"),

         wxICON_QUESTION | wxYES_NO | wxCANCEL, this) != wxYES )
     {
         return;
         wxICON_QUESTION | wxYES_NO | wxCANCEL, this) != wxYES )
     {
         return;


@@ -1214,7 +1221,7 @@ void RegTreeCtrl::DeleteSelected()
 
 void RegTreeCtrl::CreateNewKey(const wxString& strName)
 {
 
 void RegTreeCtrl::CreateNewKey(const wxString& strName)
 {

-    long lCurrent = GetSelection();
+    wxTreeItemId lCurrent = GetSelection();

     TreeNode *pCurrent = (TreeNode *)GetItemData(lCurrent);
 
     wxCHECK_RET( pCurrent != NULL, wxT("node without data?") );
     TreeNode *pCurrent = (TreeNode *)GetItemData(lCurrent);
 
     wxCHECK_RET( pCurrent != NULL, wxT("node without data?") );


@@ -1234,7 +1241,7 @@ void RegTreeCtrl::CreateNewKey(const wxString& strName)
 
 void RegTreeCtrl::CreateNewTextValue(const wxString& strName)
 {
 
 void RegTreeCtrl::CreateNewTextValue(const wxString& strName)
 {

-    long lCurrent = GetSelection();
+    wxTreeItemId lCurrent = GetSelection();

     TreeNode *pCurrent = (TreeNode *)GetItemData(lCurrent);
 
     wxCHECK_RET( pCurrent != NULL, wxT("node without data?") );
     TreeNode *pCurrent = (TreeNode *)GetItemData(lCurrent);
 
     wxCHECK_RET( pCurrent != NULL, wxT("node without data?") );


@@ -1253,7 +1260,7 @@ void RegTreeCtrl::CreateNewTextValue(const wxString& strName)
 
 void RegTreeCtrl::CreateNewBinaryValue(const wxString& strName)
 {
 
 void RegTreeCtrl::CreateNewBinaryValue(const wxString& strName)
 {

-    long lCurrent = GetSelection();
+    wxTreeItemId lCurrent = GetSelection();

     TreeNode *pCurrent = (TreeNode *)GetItemData(lCurrent);
 
     wxCHECK_RET( pCurrent != NULL, wxT("node without data?") );
     TreeNode *pCurrent = (TreeNode *)GetItemData(lCurrent);
 
     wxCHECK_RET( pCurrent != NULL, wxT("node without data?") );


@@ -1272,7 +1279,7 @@ void RegTreeCtrl::CreateNewBinaryValue(const wxString& strName)
 
 void RegTreeCtrl::ShowProperties()
 {
 
 void RegTreeCtrl::ShowProperties()
 {

-    long lCurrent = GetSelection();
+    wxTreeItemId lCurrent = GetSelection();

     TreeNode *pCurrent = (TreeNode *)GetItemData(lCurrent);
 
     if ( !pCurrent || pCurrent->IsRoot() )
     TreeNode *pCurrent = (TreeNode *)GetItemData(lCurrent);
 
     if ( !pCurrent || pCurrent->IsRoot() )


@@ -1315,7 +1322,7 @@ void RegTreeCtrl::ShowProperties()
 
 bool RegTreeCtrl::IsKeySelected() const
 {
 
 bool RegTreeCtrl::IsKeySelected() const
 {

-    long lCurrent = GetSelection();
+    wxTreeItemId lCurrent = GetSelection();

     TreeNode *pCurrent = (TreeNode *) GetItemData(lCurrent);
 
     wxCHECK( pCurrent != NULL, false );
     TreeNode *pCurrent = (TreeNode *) GetItemData(lCurrent);
 
     wxCHECK( pCurrent != NULL, false );


@@ -1325,7 +1332,7 @@ bool RegTreeCtrl::IsKeySelected() const
 
 void RegTreeCtrl::DoRefresh()
 {
 
 void RegTreeCtrl::DoRefresh()
 {

-    long lId = GetSelection();
+    wxTreeItemId lId = GetSelection();

     if ( !lId )
         return;
 
     if ( !lId )
         return;