A few tweaks and cleanups

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

diff --git a/samples/regtest/regtest.cpp b/samples/regtest/regtest.cpp
index 79c3655f83e0812d1733cc2e7b48477b9f9d8522..d08d4a84591116ec11c884f8a475200d0aec7e8f 100644 (file)
--- a/samples/regtest/regtest.cpp
+++ b/samples/regtest/regtest.cpp
@@ -31,6 +31,8 @@
 #include "wx/msw/registry.h"
 #include "wx/msw/imaglist.h"
 
 #include "wx/msw/registry.h"
 #include "wx/msw/imaglist.h"
 

+#include "wx/tokenzr.h"
+

 // ----------------------------------------------------------------------------
 // application type
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // application type
 // ----------------------------------------------------------------------------


@@ -73,6 +75,9 @@ public:
   void OnItemExpanding(wxTreeEvent& event);
   void OnSelChanged   (wxTreeEvent& event);
 
   void OnItemExpanding(wxTreeEvent& event);
   void OnSelChanged   (wxTreeEvent& event);
 

+  void OnBeginEdit    (wxTreeEvent& event);
+  void OnEndEdit      (wxTreeEvent& event);
+

   void OnBeginDrag    (wxTreeEvent& event);
   void OnEndDrag      (wxTreeEvent& event);
 
   void OnBeginDrag    (wxTreeEvent& event);
   void OnEndDrag      (wxTreeEvent& event);
 


@@ -84,6 +89,7 @@ public:
   void OnMenuTest();
 
   // operations
   void OnMenuTest();
 
   // operations

+  void GoTo(const wxString& location);

   void Refresh();
   void DeleteSelected();
   void ShowProperties();
   void Refresh();
   void DeleteSelected();
   void ShowProperties();


@@ -122,7 +128,7 @@ private:
       void Refresh();
       bool DeleteChild(TreeNode *child);
       void DestroyChildren();
       void Refresh();
       bool DeleteChild(TreeNode *child);
       void DestroyChildren();

-      const char *FullName() const;
+      const wxChar *FullName() const;

 
       // get the associated key: make sure the pointer is !NULL
       wxRegKey& Key() { if ( !m_pKey ) OnExpand(); return *m_pKey; }
 
       // get the associated key: make sure the pointer is !NULL
       wxRegKey& Key() { if ( !m_pKey ) OnExpand(); return *m_pKey; }


@@ -141,6 +147,8 @@ private:
 
   bool         m_restoreStatus;     // after OnItemExpanding()
 
 
   bool         m_restoreStatus;     // after OnItemExpanding()
 

+  wxString     m_nameOld;           // the initial value of item being renamed
+

   TreeNode *GetNode(const wxTreeEvent& event)
     { return (TreeNode *)GetItemData((WXHTREEITEM)event.GetItem()); }
 
   TreeNode *GetNode(const wxTreeEvent& event)
     { return (TreeNode *)GetItemData((WXHTREEITEM)event.GetItem()); }
 


@@ -154,7 +162,7 @@ public:
   void AddStdKeys();
 
 private:
   void AddStdKeys();
 
 private:

-  DECLARE_EVENT_TABLE();
+  DECLARE_EVENT_TABLE()

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


@@ -172,6 +180,8 @@ public:
   void OnAbout(wxCommandEvent& event);
   void OnTest (wxCommandEvent& event);
 
   void OnAbout(wxCommandEvent& event);
   void OnTest (wxCommandEvent& event);
 

+  void OnGoTo (wxCommandEvent& event);
+

   void OnExpand  (wxCommandEvent& event);
   void OnCollapse(wxCommandEvent& event);
   void OnToggle  (wxCommandEvent& event);
   void OnExpand  (wxCommandEvent& event);
   void OnCollapse(wxCommandEvent& event);
   void OnToggle  (wxCommandEvent& event);


@@ -184,7 +194,7 @@ public:
 
   void OnInfo     (wxCommandEvent& event);
 
 
   void OnInfo     (wxCommandEvent& event);
 

-  DECLARE_EVENT_TABLE();
+  DECLARE_EVENT_TABLE()

 
 private:
   RegTreeCtrl *m_treeCtrl;
 
 private:
   RegTreeCtrl *m_treeCtrl;


@@ -199,6 +209,7 @@ enum
   Menu_Quit     = 100,
   Menu_About,
   Menu_Test,
   Menu_Quit     = 100,
   Menu_About,
   Menu_Test,

+  Menu_GoTo,

   Menu_Expand,
   Menu_Collapse,
   Menu_Toggle,
   Menu_Expand,
   Menu_Collapse,
   Menu_Toggle,


@@ -221,6 +232,7 @@ BEGIN_EVENT_TABLE(RegFrame, wxFrame)
   EVT_MENU(Menu_Test,     RegFrame::OnTest)
   EVT_MENU(Menu_About,    RegFrame::OnAbout)
   EVT_MENU(Menu_Quit,     RegFrame::OnQuit)
   EVT_MENU(Menu_Test,     RegFrame::OnTest)
   EVT_MENU(Menu_About,    RegFrame::OnAbout)
   EVT_MENU(Menu_Quit,     RegFrame::OnQuit)

+  EVT_MENU(Menu_GoTo,     RegFrame::OnGoTo)

   EVT_MENU(Menu_Expand,   RegFrame::OnExpand)
   EVT_MENU(Menu_Collapse, RegFrame::OnCollapse)
   EVT_MENU(Menu_Toggle,   RegFrame::OnToggle)
   EVT_MENU(Menu_Expand,   RegFrame::OnExpand)
   EVT_MENU(Menu_Collapse, RegFrame::OnCollapse)
   EVT_MENU(Menu_Toggle,   RegFrame::OnToggle)


@@ -236,6 +248,10 @@ 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_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_DRAG    (Ctrl_RegTree, RegTreeCtrl::OnBeginDrag)
   EVT_TREE_BEGIN_RDRAG   (Ctrl_RegTree, RegTreeCtrl::OnBeginDrag)
   EVT_TREE_END_DRAG      (Ctrl_RegTree, RegTreeCtrl::OnEndDrag)
   EVT_TREE_BEGIN_DRAG    (Ctrl_RegTree, RegTreeCtrl::OnBeginDrag)
   EVT_TREE_BEGIN_RDRAG   (Ctrl_RegTree, RegTreeCtrl::OnBeginDrag)
   EVT_TREE_END_DRAG      (Ctrl_RegTree, RegTreeCtrl::OnEndDrag)


@@ -266,6 +282,7 @@ wxMenu *CreateRegistryMenu()
   pMenuReg->Append(Menu_New, "&New", pMenuNew);
   pMenuReg->Append(Menu_Delete,   "&Delete...", "Delete selected key/value");
   pMenuReg->AppendSeparator();
   pMenuReg->Append(Menu_New, "&New", pMenuNew);
   pMenuReg->Append(Menu_Delete,   "&Delete...", "Delete selected key/value");
   pMenuReg->AppendSeparator();

+  pMenuReg->Append(Menu_GoTo,     "&Go to...\tCtrl-G",    "Go to registry key");

   pMenuReg->Append(Menu_Expand,   "&Expand",    "Expand current key");
   pMenuReg->Append(Menu_Collapse, "&Collapse",  "Collapse current key");
   pMenuReg->Append(Menu_Toggle,   "&Toggle",    "Toggle current key");
   pMenuReg->Append(Menu_Expand,   "&Expand",    "Expand current key");
   pMenuReg->Append(Menu_Collapse, "&Collapse",  "Collapse current key");
   pMenuReg->Append(Menu_Toggle,   "&Toggle",    "Toggle current key");


@@ -352,37 +369,55 @@ void RegFrame::OnAbout(wxCommandEvent& event)
   dialog.ShowModal();
 }
 
   dialog.ShowModal();
 }
 

-void RegFrame::OnTest(wxCommandEvent& event)
+void RegFrame::OnTest(wxCommandEvent& WXUNUSED(event))

 {
   m_treeCtrl->OnMenuTest();
 }
 
 {
   m_treeCtrl->OnMenuTest();
 }
 

-void RegFrame::OnExpand(wxCommandEvent& event)
+void RegFrame::OnGoTo(wxCommandEvent& WXUNUSED(event))
+{
+    static wxString s_location = _T("HKEY_CURRENT_USER\\Software\\wxWindows");
+
+    wxString location = wxGetTextFromUser
+                        (
+                         _T("Enter the location to go to:"),
+                         _T("wxRegTest question"),
+                         s_location,
+                         this
+                        );
+    if ( !location )
+        return;
+
+    s_location = location;
+    m_treeCtrl->GoTo(location);
+}
+
+void RegFrame::OnExpand(wxCommandEvent& WXUNUSED(event))

 {
   m_treeCtrl->ExpandItem(m_treeCtrl->GetSelection(), wxTREE_EXPAND_EXPAND);
 }
 
 {
   m_treeCtrl->ExpandItem(m_treeCtrl->GetSelection(), wxTREE_EXPAND_EXPAND);
 }
 

-void RegFrame::OnCollapse(wxCommandEvent& event)
+void RegFrame::OnCollapse(wxCommandEvent& WXUNUSED(event))

 {
   m_treeCtrl->ExpandItem(m_treeCtrl->GetSelection(), wxTREE_EXPAND_COLLAPSE);
 }
 
 {
   m_treeCtrl->ExpandItem(m_treeCtrl->GetSelection(), wxTREE_EXPAND_COLLAPSE);
 }
 

-void RegFrame::OnToggle(wxCommandEvent& event)
+void RegFrame::OnToggle(wxCommandEvent& WXUNUSED(event))

 {
   m_treeCtrl->ExpandItem(m_treeCtrl->GetSelection(), wxTREE_EXPAND_TOGGLE);
 }
 
 {
   m_treeCtrl->ExpandItem(m_treeCtrl->GetSelection(), wxTREE_EXPAND_TOGGLE);
 }
 

-void RegFrame::OnRefresh(wxCommandEvent& event)
+void RegFrame::OnRefresh(wxCommandEvent& WXUNUSED(event))

 {
   m_treeCtrl->Refresh();
 }
 
 {
   m_treeCtrl->Refresh();
 }
 

-void RegFrame::OnDelete(wxCommandEvent& event)
+void RegFrame::OnDelete(wxCommandEvent& WXUNUSED(event))

 {
   m_treeCtrl->DeleteSelected();
 }
 
 {
   m_treeCtrl->DeleteSelected();
 }
 

-void RegFrame::OnNewKey(wxCommandEvent& event)
+void RegFrame::OnNewKey(wxCommandEvent& WXUNUSED(event))

 {
   if ( m_treeCtrl->IsKeySelected() ) {
     m_treeCtrl->CreateNewKey(
 {
   if ( m_treeCtrl->IsKeySelected() ) {
     m_treeCtrl->CreateNewKey(


@@ -390,7 +425,7 @@ void RegFrame::OnNewKey(wxCommandEvent& event)
   }
 }
 
   }
 }
 

-void RegFrame::OnNewText(wxCommandEvent& event)
+void RegFrame::OnNewText(wxCommandEvent& WXUNUSED(event))

 {
   if ( m_treeCtrl->IsKeySelected() ) {
     m_treeCtrl->CreateNewTextValue(
 {
   if ( m_treeCtrl->IsKeySelected() ) {
     m_treeCtrl->CreateNewTextValue(


@@ -398,7 +433,7 @@ void RegFrame::OnNewText(wxCommandEvent& event)
   }
 }
 
   }
 }
 

-void RegFrame::OnNewBinary(wxCommandEvent& event)
+void RegFrame::OnNewBinary(wxCommandEvent& WXUNUSED(event))

 {
   if ( m_treeCtrl->IsKeySelected() ) {
     m_treeCtrl->CreateNewBinaryValue(
 {
   if ( m_treeCtrl->IsKeySelected() ) {
     m_treeCtrl->CreateNewBinaryValue(


@@ -406,7 +441,7 @@ void RegFrame::OnNewBinary(wxCommandEvent& event)
   }
 }
 
   }
 }
 

-void RegFrame::OnInfo(wxCommandEvent& event)
+void RegFrame::OnInfo(wxCommandEvent& WXUNUSED(event))

 {
     m_treeCtrl->ShowProperties();
 }
 {
     m_treeCtrl->ShowProperties();
 }


@@ -445,7 +480,7 @@ RegTreeCtrl::TreeNode *RegTreeCtrl::InsertNewTreeNode(TreeNode *pParent,
                                    pNewNode->IsKey() ? strName : *pstrValue,
                                    idImage);
 
                                    pNewNode->IsKey() ? strName : *pstrValue,
                                    idImage);
 

-  wxASSERT_MSG( pNewNode->m_id, "can't create tree control item!");
+  wxASSERT_MSG( pNewNode->m_id, wxT("can't create tree control item!"));

 
   // save the pointer in the item
   SetItemData(pNewNode->m_id, pNewNode);
 
   // save the pointer in the item
   SetItemData(pNewNode->m_id, pNewNode);


@@ -471,7 +506,7 @@ RegTreeCtrl::TreeNode *RegTreeCtrl::InsertNewTreeNode(TreeNode *pParent,
 
 RegTreeCtrl::RegTreeCtrl(wxWindow *parent, wxWindowID id)
            : wxTreeCtrl(parent, id, wxDefaultPosition, wxDefaultSize,
 
 RegTreeCtrl::RegTreeCtrl(wxWindow *parent, wxWindowID id)
            : wxTreeCtrl(parent, id, wxDefaultPosition, wxDefaultSize,

-                        wxTR_HAS_BUTTONS | wxSUNKEN_BORDER)
+                        wxTR_HAS_BUTTONS | wxTR_EDIT_LABELS | wxSUNKEN_BORDER)

 {
   // init members
   m_draggedItem = NULL;
 {
   // init members
   m_draggedItem = NULL;


@@ -513,7 +548,7 @@ void RegTreeCtrl::OnIdle(wxIdleEvent& WXUNUSED(event))
 {
     if ( m_restoreStatus ) {
         // restore it after OnItemExpanding()
 {
     if ( m_restoreStatus ) {
         // restore it after OnItemExpanding()

-        wxLogStatus("Ok");
+        wxLogStatus(wxT("Ok"));

         wxSetCursor(*wxSTANDARD_CURSOR);
 
         m_restoreStatus = FALSE;
         wxSetCursor(*wxSTANDARD_CURSOR);
 
         m_restoreStatus = FALSE;


@@ -544,14 +579,14 @@ void RegTreeCtrl::OnMenuTest()
   long lId = GetSelection();
   TreeNode *pNode = (TreeNode *)GetItemData(lId);
 
   long lId = GetSelection();
   TreeNode *pNode = (TreeNode *)GetItemData(lId);
 

-  wxCHECK_RET( pNode != NULL, "tree item without data?" );
+  wxCHECK_RET( pNode != NULL, wxT("tree item without data?") );

 
   if ( pNode->IsRoot() ) {
 
   if ( pNode->IsRoot() ) {

-    wxLogError("Can't create a subkey under the root key.");
+    wxLogError(wxT("Can't create a subkey under the root key."));

     return;
   }
   if ( !pNode->IsKey() ) {
     return;
   }
   if ( !pNode->IsKey() ) {

-    wxLogError("Can't create a subkey under a value!");
+    wxLogError(wxT("Can't create a subkey under a value!"));

     return;
   }
 
     return;
   }
 


@@ -560,19 +595,19 @@ void RegTreeCtrl::OnMenuTest()
     wxRegKey key2a(key1, "key2a"), key2b(key1, "key2b");
     if ( key2a.Create() && key2b.Create() ) {
       // put some values under the newly created keys
     wxRegKey key2a(key1, "key2a"), key2b(key1, "key2b");
     if ( key2a.Create() && key2b.Create() ) {
       // put some values under the newly created keys

-      key1.SetValue("first_term", "10");
-      key1.SetValue("second_term", "7");
+      key1.SetValue(wxT("first_term"), "10");
+      key1.SetValue(wxT("second_term"), "7");

       key2a = "this is the unnamed value";
       key2a = "this is the unnamed value";

-      key2b.SetValue("sum", 17);
+      key2b.SetValue(wxT("sum"), 17);

 
       // refresh tree
       pNode->Refresh();
 
       // refresh tree
       pNode->Refresh();

-      wxLogStatus("Test keys successfully added.");
+      wxLogStatus(wxT("Test keys successfully added."));

       return;
     }
   }
 
       return;
     }
   }
 

-  wxLogError("Creation of test keys failed.");
+  wxLogError(wxT("Creation of test keys failed."));

 }
 
 void RegTreeCtrl::OnChar(wxKeyEvent& event)
 }
 
 void RegTreeCtrl::OnChar(wxKeyEvent& event)


@@ -608,7 +643,7 @@ void RegTreeCtrl::OnItemExpanding(wxTreeEvent& event)
 
   // expansion might take some time
   wxSetCursor(*wxHOURGLASS_CURSOR);
 
   // expansion might take some time
   wxSetCursor(*wxHOURGLASS_CURSOR);

-  wxLogStatus("Working...");
+  wxLogStatus(wxT("Working..."));

   wxYield();  // to give the status line a chance to refresh itself
   m_restoreStatus = TRUE;   // some time later...
 
   wxYield();  // to give the status line a chance to refresh itself
   m_restoreStatus = TRUE;   // some time later...
 


@@ -625,6 +660,50 @@ void RegTreeCtrl::OnItemExpanding(wxTreeEvent& event)
   }
 }
 
   }
 }
 

+void RegTreeCtrl::OnBeginEdit(wxTreeEvent& event)
+{
+    TreeNode *pNode = GetNode(event);
+    if ( pNode->IsRoot() || pNode->Parent()->IsRoot() ) {
+        wxLogStatus(_T("This registry key can't be renamed."));
+
+        event.Veto();
+    }
+    else {
+        m_nameOld = pNode->m_strName;
+    }
+}
+
+void RegTreeCtrl::OnEndEdit(wxTreeEvent& event)
+{
+    bool ok;
+
+    wxString name = event.GetLabel();
+
+    TreeNode *pNode = GetNode(event);
+    if ( pNode->IsKey() )
+    {
+        wxRegKey& key = pNode->Key();
+        ok = key.Rename(name);
+    }
+    else
+    {
+        pNode = pNode->Parent();
+        wxRegKey& key = pNode->Key();
+
+        ok = key.RenameValue(m_nameOld, name);
+    }
+
+    if ( !ok ) {
+        wxLogError(_T("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
+    else {
+        pNode->Refresh();
+    }
+#endif // 0
+}
+

 void RegTreeCtrl::OnBeginDrag(wxTreeEvent& event)
 {
     m_copyOnDrop = event.GetEventType() == wxEVT_COMMAND_TREE_BEGIN_DRAG;
 void RegTreeCtrl::OnBeginDrag(wxTreeEvent& event)
 {
     m_copyOnDrop = event.GetEventType() == wxEVT_COMMAND_TREE_BEGIN_DRAG;


@@ -632,13 +711,13 @@ void RegTreeCtrl::OnBeginDrag(wxTreeEvent& event)
     TreeNode *pNode = GetNode(event);
     if ( pNode->IsRoot() || pNode->Parent()->IsRoot() )
     {
     TreeNode *pNode = GetNode(event);
     if ( pNode->IsRoot() || pNode->Parent()->IsRoot() )
     {

-        wxLogStatus("This registry key can't be %s.",
-                    m_copyOnDrop ? "copied" : "moved");
+        wxLogStatus(wxT("This registry key can't be %s."),
+                    m_copyOnDrop ? wxT("copied") : wxT("moved"));

     }
     else
     {
     }
     else
     {

-        wxLogStatus("%s item %s...",
-                    m_copyOnDrop ? "Copying" : "Moving",
+        wxLogStatus(wxT("%s item %s..."),
+                    m_copyOnDrop ? wxT("Copying") : wxT("Moving"),

                     pNode->FullName());
 
         m_draggedItem = pNode;
                     pNode->FullName());
 
         m_draggedItem = pNode;


@@ -649,7 +728,7 @@ void RegTreeCtrl::OnBeginDrag(wxTreeEvent& event)
 
 void RegTreeCtrl::OnEndDrag(wxTreeEvent& event)
 {
 
 void RegTreeCtrl::OnEndDrag(wxTreeEvent& event)
 {

-    wxCHECK_RET( m_draggedItem, "end drag without begin drag?" );
+    wxCHECK_RET( m_draggedItem, wxT("end drag without begin drag?") );

 
     // clear the pointer anyhow
     TreeNode *src = m_draggedItem;
 
     // clear the pointer anyhow
     TreeNode *src = m_draggedItem;


@@ -662,7 +741,7 @@ void RegTreeCtrl::OnEndDrag(wxTreeEvent& event)
         dst = dst->Parent();
     }
     if ( !dst || dst->IsRoot() ) {
         dst = dst->Parent();
     }
     if ( !dst || dst->IsRoot() ) {

-        wxLogError("Can't create a key here.");
+        wxLogError(wxT("Can't create a key here."));

 
         return;
     }
 
         return;
     }


@@ -670,7 +749,7 @@ void RegTreeCtrl::OnEndDrag(wxTreeEvent& event)
     bool isKey = src->IsKey();
     if ( (isKey && (src == dst)) ||
          (!isKey && (dst->Parent() == src)) ) {
     bool isKey = src->IsKey();
     if ( (isKey && (src == dst)) ||
          (!isKey && (dst->Parent() == src)) ) {

-        wxLogStatus("Can't copy something on itself");
+        wxLogStatus(wxT("Can't copy something on itself"));

 
         return;
     }
 
         return;
     }


@@ -686,7 +765,7 @@ void RegTreeCtrl::OnEndDrag(wxTreeEvent& event)
 
     if ( wxMessageBox(wxString::Format
                         (
 
     if ( wxMessageBox(wxString::Format
                         (

-                         "Do you really want to %s the %s %s to %s?",
+                         wxT("Do you really want to %s the %s %s to %s?"),

                          verb.c_str(),
                          what.c_str(),
                          nameSrc.c_str(),
                          verb.c_str(),
                          what.c_str(),
                          nameSrc.c_str(),


@@ -697,23 +776,17 @@ void RegTreeCtrl::OnEndDrag(wxTreeEvent& event)
       return;
     }
 
       return;
     }
 

-    bool dstExpanded = IsExpanded(dst->Id());
-

     bool ok;
     if ( isKey ) {
         wxRegKey& key = src->Key();
         wxRegKey keyDst(dst->Key(), src->m_strName);
         ok = keyDst.Create(FALSE);
         if ( !ok ) {
     bool ok;
     if ( isKey ) {
         wxRegKey& key = src->Key();
         wxRegKey keyDst(dst->Key(), src->m_strName);
         ok = keyDst.Create(FALSE);
         if ( !ok ) {

-            wxLogError("Key '%s' already exists");
+            wxLogError(wxT("Key '%s' already exists"));

         }
         else {
             ok = key.Copy(keyDst);
         }
         }
         else {
             ok = key.Copy(keyDst);
         }

-        if ( ok && dstExpanded ) {
-            dst->OnCollapse();
-            dst->OnExpand();
-        }

 
         if ( ok && !m_copyOnDrop ) {
             // delete the old key
 
         if ( ok && !m_copyOnDrop ) {
             // delete the old key


@@ -729,15 +802,15 @@ void RegTreeCtrl::OnEndDrag(wxTreeEvent& event)
         if ( ok && !m_copyOnDrop ) {
             // we moved it, so delete the old one
             ok = key.DeleteValue(src->m_strName);
         if ( ok && !m_copyOnDrop ) {
             // we moved it, so delete the old one
             ok = key.DeleteValue(src->m_strName);

-            if ( ok ) {
-                // reexpand the key
-                dst->Refresh();
-            }

         }
     }
 
     if ( !ok ) {
         }
     }
 
     if ( !ok ) {

-        wxLogError("Failed to %s registry %s.", verb.c_str(), what.c_str());
+        wxLogError(wxT("Failed to %s registry %s."),
+                   verb.c_str(), what.c_str());
+    }
+    else {
+        dst->Refresh();

     }
 }
 
     }
 }
 


@@ -768,7 +841,7 @@ bool RegTreeCtrl::TreeNode::OnExpand()
   }
 
   if ( !m_pKey->Open() ) {
   }
 
   if ( !m_pKey->Open() ) {

-    wxLogError("The key '%s' can't be opened.", FullName());
+    wxLogError(wxT("The key '%s' can't be opened."), FullName());

     return FALSE;
   }
 
     return FALSE;
   }
 


@@ -841,10 +914,11 @@ bool RegTreeCtrl::TreeNode::OnExpand()
 
   if ( isEmpty ) {
     // this is for the case when our last child was just deleted
 
   if ( isEmpty ) {
     // this is for the case when our last child was just deleted

-    m_pTree->Collapse(Id());
+    wxTreeItemId theId(Id()); // Temp variable seems necessary for BC++
+    m_pTree->Collapse(theId);

 
     // we won't be expanded any more
 
     // we won't be expanded any more

-    m_pTree->SetItemHasChildren(Id(), FALSE);
+    m_pTree->SetItemHasChildren(theId, FALSE);

   }
 
   return TRUE;
   }
 
   return TRUE;


@@ -863,24 +937,24 @@ void RegTreeCtrl::TreeNode::Refresh()
     if ( !IsKey() )
         return;
 
     if ( !IsKey() )
         return;
 

-    if ( m_pTree->IsExpanded(Id()) ) {
-        m_pTree->Collapse(Id());
-        OnCollapse();
-        m_pTree->SetItemHasChildren(Id());
-        m_pTree->Expand(Id());
+    wxTreeItemId theId(Id()); // Temp variable seems necessary for BC++
+    bool wasExpanded = m_pTree->IsExpanded(theId);
+    if ( wasExpanded )
+        m_pTree->Collapse(theId);
+
+    OnCollapse();
+    m_pTree->SetItemHasChildren(theId);
+    if ( wasExpanded ) {
+        m_pTree->Expand(theId);

         OnExpand();
     }
         OnExpand();
     }

-    else {
-        // just allow it to be expanded
-        m_pTree->SetItemHasChildren(Id());
-    }

 }
 
 bool RegTreeCtrl::TreeNode::DeleteChild(TreeNode *child)
 {
     int index = m_aChildren.Index(child);
     wxCHECK_MSG( index != wxNOT_FOUND, FALSE,
 }
 
 bool RegTreeCtrl::TreeNode::DeleteChild(TreeNode *child)
 {
     int index = m_aChildren.Index(child);
     wxCHECK_MSG( index != wxNOT_FOUND, FALSE,

-                 "our child in tree should be in m_aChildren" );
+                 wxT("our child in tree should be in m_aChildren") );

 
     m_aChildren.RemoveAt((size_t)index);
 
 
     m_aChildren.RemoveAt((size_t)index);
 


@@ -896,7 +970,8 @@ bool RegTreeCtrl::TreeNode::DeleteChild(TreeNode *child)
     }
 
     if ( ok ) {
     }
 
     if ( ok ) {

-        m_pTree->Delete(child->Id());
+        wxTreeItemId theId(child->Id()); // Temp variable seems necessary for BC++
+        m_pTree->Delete(theId);

 
         Refresh();
     }
 
         Refresh();
     }


@@ -912,7 +987,8 @@ void RegTreeCtrl::TreeNode::DestroyChildren()
     long lId = m_aChildren[n]->Id();
     // no, wxTreeCtrl will do it
     //delete m_aChildren[n];
     long lId = m_aChildren[n]->Id();
     // no, wxTreeCtrl will do it
     //delete m_aChildren[n];

-    m_pTree->Delete(lId);
+    wxTreeItemId theId(lId); // Temp variable seems necessary for BC++
+    m_pTree->Delete(theId);

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


@@ -923,18 +999,18 @@ RegTreeCtrl::TreeNode::~TreeNode()
   delete m_pKey;
 }
 
   delete m_pKey;
 }
 

-const char *RegTreeCtrl::TreeNode::FullName() const
+const wxChar *RegTreeCtrl::TreeNode::FullName() const

 {
   static wxString s_strName;
 
   if ( IsRoot() ) {
 {
   static wxString s_strName;
 
   if ( IsRoot() ) {

-    return "Registry Root";
+    return wxT("Registry Root");

   }
   else {
     // our own registry key might not (yet) exist or we might be a value,
     // so just use the parent's and concatenate
     s_strName = Parent()->FullName();
   }
   else {
     // our own registry key might not (yet) exist or we might be a value,
     // so just use the parent's and concatenate
     s_strName = Parent()->FullName();

-    s_strName << '\\' << m_strName;
+    s_strName << wxT('\\') << m_strName;

 
     return s_strName;
   }
 
     return s_strName;
   }


@@ -944,30 +1020,78 @@ const char *RegTreeCtrl::TreeNode::FullName() const
 // operations on RegTreeCtrl
 // ----------------------------------------------------------------------------
 
 // operations on RegTreeCtrl
 // ----------------------------------------------------------------------------
 

+void RegTreeCtrl::GoTo(const wxString& location)
+{
+    wxStringTokenizer tk(location, _T("\\"));
+
+    wxTreeItemId id = GetRootItem();
+
+    while ( tk.HasMoreTokens() ) {
+        wxString subkey = tk.GetNextToken();
+
+        wxTreeItemId idCurrent = id;
+        if ( !IsExpanded(idCurrent) )
+            Expand(idCurrent);
+
+        long dummy;
+        id = GetFirstChild(idCurrent, dummy);
+
+        if ( idCurrent == GetRootItem() ) {
+            // special case: we understand both HKCU and HKEY_CURRENT_USER here
+            for ( size_t key = 0; key < wxRegKey::nStdKeys; key++ ) {
+                if ( subkey == wxRegKey::GetStdKeyName(key) ||
+                     subkey == wxRegKey::GetStdKeyShortName(key) ) {
+                    break;
+                }
+
+                id = GetNextChild(idCurrent, dummy);
+            }
+        }
+        else {
+            // enum all children
+            while ( id.IsOk() ) {
+                if ( subkey == ((TreeNode *)GetItemData(id))->m_strName )
+                    break;
+
+                id = GetNextChild(idCurrent, dummy);
+            }
+        }
+
+        if ( !id.IsOk() ) {
+            wxLogError(_T("No such key '%s'."), location.c_str());
+
+            return;
+        }
+    }
+
+    if ( id.IsOk() )
+        SelectItem(id);
+}
+

 void RegTreeCtrl::DeleteSelected()
 {
   long lCurrent = GetSelection(),
        lParent  = GetParent(lCurrent);
 
   if ( lParent == 0 ) {
 void RegTreeCtrl::DeleteSelected()
 {
   long lCurrent = GetSelection(),
        lParent  = GetParent(lCurrent);
 
   if ( lParent == 0 ) {

-    wxLogError("Can't delete root key.");
+    wxLogError(wxT("Can't delete root key."));

     return;
   }
 
   TreeNode *pCurrent = (TreeNode *)GetItemData(lCurrent),
            *pParent  = (TreeNode *)GetItemData(lParent);
 
     return;
   }
 
   TreeNode *pCurrent = (TreeNode *)GetItemData(lCurrent),
            *pParent  = (TreeNode *)GetItemData(lParent);
 

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

 
   if ( pParent->IsRoot() ) {
 
   if ( pParent->IsRoot() ) {

-    wxLogError("Can't delete standard key.");
+    wxLogError(wxT("Can't delete standard key."));

     return;
   }
 
   wxString what = pCurrent->IsKey() ? "key" : "value";
   if ( wxMessageBox(wxString::Format
                     (
     return;
   }
 
   wxString what = pCurrent->IsKey() ? "key" : "value";
   if ( wxMessageBox(wxString::Format
                     (

-                      "Do you really want to delete this %s?",
+                      wxT("Do you really want to delete this %s?"),

                       what.c_str()
                     ),
                     "Confirmation",
                       what.c_str()
                     ),
                     "Confirmation",


@@ -983,12 +1107,12 @@ void RegTreeCtrl::CreateNewKey(const wxString& strName)
   long lCurrent = GetSelection();
   TreeNode *pCurrent = (TreeNode *)GetItemData(lCurrent);
 
   long lCurrent = GetSelection();
   TreeNode *pCurrent = (TreeNode *)GetItemData(lCurrent);
 

-  wxCHECK_RET( pCurrent != NULL, "node without data?" );
+  wxCHECK_RET( pCurrent != NULL, wxT("node without data?") );

 
   wxASSERT( pCurrent->IsKey() );  // check must have been done before
 
   if ( pCurrent->IsRoot() ) {
 
   wxASSERT( pCurrent->IsKey() );  // check must have been done before
 
   if ( pCurrent->IsRoot() ) {

-    wxLogError("Can't create a new key under the root key.");
+    wxLogError(wxT("Can't create a new key under the root key."));

     return;
   }
 
     return;
   }
 


@@ -1002,12 +1126,12 @@ void RegTreeCtrl::CreateNewTextValue(const wxString& strName)
   long lCurrent = GetSelection();
   TreeNode *pCurrent = (TreeNode *)GetItemData(lCurrent);
 
   long lCurrent = GetSelection();
   TreeNode *pCurrent = (TreeNode *)GetItemData(lCurrent);
 

-  wxCHECK_RET( pCurrent != NULL, "node without data?" );
+  wxCHECK_RET( pCurrent != NULL, wxT("node without data?") );

 
   wxASSERT( pCurrent->IsKey() );  // check must have been done before
 
   if ( pCurrent->IsRoot() ) {
 
   wxASSERT( pCurrent->IsKey() );  // check must have been done before
 
   if ( pCurrent->IsRoot() ) {

-    wxLogError("Can't create a new value under the root key.");
+    wxLogError(wxT("Can't create a new value under the root key."));

     return;
   }
 
     return;
   }
 


@@ -1020,12 +1144,12 @@ void RegTreeCtrl::CreateNewBinaryValue(const wxString& strName)
   long lCurrent = GetSelection();
   TreeNode *pCurrent = (TreeNode *)GetItemData(lCurrent);
 
   long lCurrent = GetSelection();
   TreeNode *pCurrent = (TreeNode *)GetItemData(lCurrent);
 

-  wxCHECK_RET( pCurrent != NULL, "node without data?" );
+  wxCHECK_RET( pCurrent != NULL, wxT("node without data?") );

 
   wxASSERT( pCurrent->IsKey() );  // check must have been done before
 
   if ( pCurrent->IsRoot() ) {
 
   wxASSERT( pCurrent->IsKey() );  // check must have been done before
 
   if ( pCurrent->IsRoot() ) {

-    wxLogError("Can't create a new value under the root key.");
+    wxLogError(wxT("Can't create a new value under the root key."));

     return;
   }
 
     return;
   }
 


@@ -1040,7 +1164,7 @@ void RegTreeCtrl::ShowProperties()
 
     if ( !pCurrent || pCurrent->IsRoot() )
     {
 
     if ( !pCurrent || pCurrent->IsRoot() )
     {

-        wxLogStatus("No properties");
+        wxLogStatus(wxT("No properties"));

 
         return;
     }
 
         return;
     }


@@ -1051,27 +1175,27 @@ void RegTreeCtrl::ShowProperties()
         size_t nSubKeys, nValues;
         if ( !key.GetKeyInfo(&nSubKeys, NULL, &nValues, NULL) )
         {
         size_t nSubKeys, nValues;
         if ( !key.GetKeyInfo(&nSubKeys, NULL, &nValues, NULL) )
         {

-            wxLogError("Couldn't get key info");
+            wxLogError(wxT("Couldn't get key info"));

         }
         else
         {
         }
         else
         {

-            wxLogMessage("Key '%s' has %u subkeys and %u values.",
+            wxLogMessage(wxT("Key '%s' has %u subkeys and %u values."),

                          key.GetName().c_str(), nSubKeys, nValues);
         }
     }
     else // it's a value
     {
         TreeNode *parent = pCurrent->Parent();
                          key.GetName().c_str(), nSubKeys, nValues);
         }
     }
     else // it's a value
     {
         TreeNode *parent = pCurrent->Parent();

-        wxCHECK_RET( parent, "reg value without key?" );
+        wxCHECK_RET( parent, wxT("reg value without key?") );

 
         const wxRegKey& key = parent->Key();
 
         const wxRegKey& key = parent->Key();

-        const char *value = pCurrent->m_strName.c_str();
-        wxLogMessage("Value '%s' under the key '%s' is of type "
-                     "%d (%s).",
+        const wxChar *value = pCurrent->m_strName.c_str();
+        wxLogMessage(wxT("Value '%s' under the key '%s' is of type ")
+                     wxT("%d (%s)."),

                      value,
                      parent->m_strName.c_str(),
                      key.GetValueType(value),
                      value,
                      parent->m_strName.c_str(),
                      key.GetValueType(value),

-                     key.IsNumericValue(value) ? "numeric" : "string");
+                     key.IsNumericValue(value) ? wxT("numeric") : wxT("string"));

 
     }
 }
 
     }
 }


@@ -1094,7 +1218,7 @@ void RegTreeCtrl::Refresh()
 
     TreeNode *pNode = (TreeNode *)GetItemData(lId);
 
 
     TreeNode *pNode = (TreeNode *)GetItemData(lId);
 

-    wxCHECK_RET( pNode != NULL, "tree item without data?" );
+    wxCHECK_RET( pNode != NULL, wxT("tree item without data?") );

 
     pNode->Refresh();
 }
 
     pNode->Refresh();
 }