Got the doubleclick of a room name working

diff --git a/daphne/includes.hpp b/daphne/includes.hpp
index 7959047127ef007521c41e816eb48ef0999e9b8b..3523e6210933241f68d6eb276d410d0896d65a13 100644 (file)
--- a/daphne/includes.hpp
+++ b/daphne/includes.hpp
@@ -230,6 +230,3 @@ void load_roomlist(RoomTree *tree, CitClient *citsock);
 
 extern wxMDIParentFrame *BigMDI;
 extern RoomTree *RoomList;
-
-
-

diff --git a/daphne/roomtree.cpp b/daphne/roomtree.cpp
index 633d04b292ab6847fca9ba9ecf2a2a19408c0e24..46108ea4503aab19265233bd90ef084e70068305 100644 (file)
--- a/daphne/roomtree.cpp
+++ b/daphne/roomtree.cpp
@@ -8,6 +8,23 @@
 #include "bitmaps/mailroom.xpm"
 
 
+
+class RoomItem : public wxTreeItemData {
+public:
+       RoomItem(wxString name);
+       wxString RoomName;
+};
+
+RoomItem::RoomItem(wxString name) 
+       : wxTreeItemData() {
+
+       RoomName = name;        
+}
+
+
+
+
+
 enum {
 
         ROOMTREE_CTRL
@@ -95,7 +112,8 @@ void RoomTree::LoadRoomList(void) {
                        roomname,
                        2,
                        -1,
-                       NULL);
+                       new RoomItem(roomname)
+                       );
                SetItemBold(item, TRUE);
                SetItemBold(floorboards[floornum], TRUE);
        }
@@ -112,7 +130,8 @@ void RoomTree::LoadRoomList(void) {
                        roomname,
                        3,
                        -1,
-                       NULL);
+                       new RoomItem(roomname)
+                       );
        }
 
 }
@@ -123,6 +142,7 @@ void RoomTree::LoadRoomList(void) {
 void RoomTree::OnDoubleClick(wxTreeEvent& evt) {
        wxTreeItemId itemId;
        int i;
+       RoomItem *r;
 
        itemId = GetSelection();
 
@@ -130,5 +150,9 @@ void RoomTree::OnDoubleClick(wxTreeEvent& evt) {
        if (itemId == GetRootItem()) return;
        for (i=0; i<MAXFLOORS; ++i)
                if (itemId == floorboards[i]) return;
-       cout << "doubleclickroom\n";
+
+       // Ok, it's a room, so go there.
+       r = (RoomItem *)GetItemData(itemId);
+
+       cout << r->RoomName << "\n";
 }