Fixed enter so it's stable again.

Made minor tweaks for compatibility between wxGTK and wxMSW
Fixed roomview so that 'skip' shows up again in button bar
Still working on windoze images.  They're only showing half-height.
Fixed wholist so that it fires up maximized.  Fixed the button problems
in 'wholist' under wxMSW.
REfixed roomtree.cpp so that under wxMSW it is clickable again.
Certain things here are for tests.  DoChat was one of them.  This is not
yet a release version of the software, LS, so please don't give me crap
about things I'm testing.

diff --git a/daphne/ChangeLog b/daphne/ChangeLog
index 9a2a734e2e10c89cac491ee821e22c40f33cebeb..fe38cec934572a9549e7b71c067dc22a3641fde2 100644 (file)
--- a/daphne/ChangeLog
+++ b/daphne/ChangeLog
@@ -1,20 +1,51 @@
- $Log$
- Revision 1.16  2000/01/11 22:51:42  nbryant
-       * citclient.cpp: different IDEN string depending on __WXMSW__ etc.
-         macros
-       * hosts.cpp, prefs.cpp: pass FALSE to ini->Flush() as this is supposed
-         to be the default but WX headers appear to lack the default on
-         Windows
-       * includes.hpp: renamed class DoChat to class ChatWindow -- WTF was it
-         named like this?
-       * main.cpp: load bitmaps from resouces if __WXMSW__ is defined
-       * makefile.g95: add hosts.o
-       * daphne.rc: new file; Windows resource definitions. right now just
-         contains the bitmaps
-
- Revision 1.15  2000/01/08 20:25:21  smw
- Fixed a condition in goto where the message window would eat itself
- prior to importing the messages, forcing daphne to crash.
+<<<<<<< ChangeLog
+$Log$
+Revision 1.17  2000/01/26 18:42:24  smw
+Fixed enter so it's stable again.
+Made minor tweaks for compatibility between wxGTK and wxMSW
+Fixed roomview so that 'skip' shows up again in button bar
+Still working on windoze images.  They're only showing half-height.
+Fixed wholist so that it fires up maximized.  Fixed the button problems
+in 'wholist' under wxMSW.
+REfixed roomtree.cpp so that under wxMSW it is clickable again.
+Certain things here are for tests.  DoChat was one of them.  This is not
+yet a release version of the software, LS, so please don't give me crap
+about things I'm testing.
+
+Revision 1.15  2000/01/08 20:25:21  smw
+Fixed a condition in goto where the message window would eat itself
+prior to importing the messages, forcing daphne to crash.
+=======
+$Log$
+Revision 1.17  2000/01/26 18:42:24  smw
+Fixed enter so it's stable again.
+Made minor tweaks for compatibility between wxGTK and wxMSW
+Fixed roomview so that 'skip' shows up again in button bar
+Still working on windoze images.  They're only showing half-height.
+Fixed wholist so that it fires up maximized.  Fixed the button problems
+in 'wholist' under wxMSW.
+REfixed roomtree.cpp so that under wxMSW it is clickable again.
+Certain things here are for tests.  DoChat was one of them.  This is not
+yet a release version of the software, LS, so please don't give me crap
+about things I'm testing.
+
+Revision 1.16  2000/01/11 22:51:42  nbryant
+* citclient.cpp: different IDEN string depending on __WXMSW__ etc.
+macros
+* hosts.cpp, prefs.cpp: pass FALSE to ini->Flush() as this is supposed
+to be the default but WX headers appear to lack the default on
+ Windows
+* includes.hpp: renamed class DoChat to class ChatWindow -- WTF was it
+named like this?
+* main.cpp: load bitmaps from resouces if __WXMSW__ is defined
+* makefile.g95: add hosts.o
+* daphne.rc: new file; Windows resource definitions. right now just
+contains the bitmaps
+
+Revision 1.15  2000/01/08 20:25:21  smw
+Fixed a condition in goto where the message window would eat itself
+prior to importing the messages, forcing daphne to crash.
+>>>>>>> 1.16
 
 Revision 1.14  2000/01/08 20:06:38  smw
 Added hosts.cpp (for user configurable bbs additions to bbslist)

diff --git a/daphne/citclient.cpp b/daphne/citclient.cpp
index 1625e842732c3e1e65de997e658ce42e05e82b8e..1247bc687255a72f17c2edf1b7a6aa8296920528 100644 (file)
--- a/daphne/citclient.cpp
+++ b/daphne/citclient.cpp
@@ -275,14 +275,19 @@ void CitClient::initialize_session(void)  {
        CurrentRoom = "";
 
 #ifdef __WXMSW__
-       sendcmd = "IDEN 0|6|001|Daphne (Windows)";
-#elif defined(__WXGTK__)
-       sendcmd - "IDEN 0|6|001|Daphne (GTK)";
-#elif defined(__WXMOTIF__)
-       sendcmd = "IDEN 0|6|001|Daphne (Motif)";
-#else
-       sendcmd = "IDEN 0|6|001|Daphne (Unknown window system)";
+       sendcmd = "IDEN 0|6|001|Daphne (M$ Windows)";
 #endif
+
+#ifdef __WXGTK__
+       sendcmd = "IDEN 0|6|001|Daphne (Unix-GTK)";
+#endif
+
+#ifdef __WXMOTIF__
+       sendcmd = "IDEN 0|6|001|Daphne (Unix-Motif)";
+
+#endif
+
+
        serv_trans(sendcmd);
 
        sendcmd = "INFO";

diff --git a/daphne/enter.cpp b/daphne/enter.cpp
index d0d55a05bf75338824f574fc0f1e2796652b0bd4..b3129bd4aad59b349ec665d9d04388e2f381f731 100644 (file)
--- a/daphne/enter.cpp
+++ b/daphne/enter.cpp
@@ -109,10 +109,7 @@ EnterMessage::EnterMessage(
        // There may also be the opportunity to present a recipient.
        // FIX ... disable this if we're not in a mail room 
 
-       // Fixed, smw - 12/14/99
-       
-       if (roomname == "Mail") {
-       wxStaticText *tolabel = new wxStaticText(this, -1, "To: ");
+        wxStaticText *tolabel = new wxStaticText(this, -1, "To: ");
 
        wxLayoutConstraints *c8 = new wxLayoutConstraints;
        c8->centreY.SameAs(fromname, wxCentreY);
@@ -121,7 +118,7 @@ EnterMessage::EnterMessage(
        c8->height.AsIs();
        tolabel->SetConstraints(c8);
 
-       toname = new wxTextCtrl(this, -1, "",
+        toname = new wxTextCtrl(this, -1, "",
                wxDefaultPosition, wxSize(150,25));
        
        wxLayoutConstraints *c9 = new wxLayoutConstraints;
@@ -144,7 +141,6 @@ EnterMessage::EnterMessage(
        d1->height.AsIs();
        findrecp->SetConstraints(d1);
 
-}
 
 
        // The main portion of this screen is a text entry box.

diff --git a/daphne/includes.hpp b/daphne/includes.hpp
index 76c1b8db48f294ab69198996bd53f8fb19869278..4e13175815a66a5f30a9ff89b04cd22b1625b5aa 100644 (file)
--- a/daphne/includes.hpp
+++ b/daphne/includes.hpp
@@ -283,7 +283,8 @@ public:
 private:
        wxTreeItemId GetNextRoomId(void);
        void InitTreeIcons(void);
-       void OnDoubleClick(wxTreeEvent& evt);
+        void OnLeftClick(wxTreeEvent& evt);
+        void OnDoubleClick(wxTreeEvent& evt);
        CitClient *citsock;
        wxMDIParentFrame *citMyMDI;
        wxTreeItemId floorboards[MAXFLOORS];

diff --git a/daphne/makefile.g95 b/daphne/makefile.g95
index 638ad47b346b87d530bff00e69bed14db4965b80..3fdf9243382d4ca7d9a9fcbde2149dcf9d8e4638 100644 (file)
--- a/daphne/makefile.g95
+++ b/daphne/makefile.g95
@@ -10,4 +10,5 @@ MY_OBJECTS    = citclient.o enter.o express_message.o main.o message.o \
 
 OBJECTS         = $(MY_OBJECTS)
 
-include $(WXDIR)/src/makeprog.g95
\ No newline at end of file
+WXDIR = /wx2
+include $(WXDIR)/src/makeprog.g95

diff --git a/daphne/roomtree.cpp b/daphne/roomtree.cpp
index a24de2862a87ed080cf6718a846c2a9b2a50a880..60cddaee09f64e69836e73de4aaade0e94b47bc0 100644 (file)
--- a/daphne/roomtree.cpp
+++ b/daphne/roomtree.cpp
@@ -47,10 +47,18 @@ enum {
         ROOMTREE_CTRL
 };
 
+#ifdef __WXMSW__
 BEGIN_EVENT_TABLE(RoomTree, wxTreeCtrl)
-       EVT_TREE_ITEM_ACTIVATED(ROOMTREE_CTRL, RoomTree::OnDoubleClick)
+        EVT_LEFT_DCLICK(RoomTree::OnLeftClick)
 END_EVENT_TABLE()
 
+#else
+
+BEGIN_EVENT_TABLE(RoomTree, wxTreeCtrl)
+        EVT_TREE_ITEM_ACTIVATED(ROOMTREE_CTRL, RoomTree::OnDoubleClick)
+END_EVENT_TABLE()
+
+#endif
 
 
 RoomTree::RoomTree(wxMDIParentFrame *parent, CitClient *sock)
@@ -266,8 +274,11 @@ void RoomTree::LoadRoomList(void) {
 
 
 
-
+#ifdef __WXMSW__
+void RoomTree::OnLeftClick(wxTreeEvent& evt) {
+#else
 void RoomTree::OnDoubleClick(wxTreeEvent& evt) {
+#endif
        wxTreeItemId itemId;
        int i;
        RoomItem *r;
@@ -282,7 +293,8 @@ void RoomTree::OnDoubleClick(wxTreeEvent& evt) {
        // Ok, it's a leaf node...
        r = (RoomItem *)GetItemData(itemId);
 
-       switch (r->NodeType) {
+        evt.Skip();
+        switch (r->NodeType) {
 
        case RI_ROOM:
                new RoomView(citsock, citMyMDI, r->RoomName);

diff --git a/daphne/roomview.cpp b/daphne/roomview.cpp
index 620e436b3894e1b71703aaa209f7b9f221e9abca..6dd5fcf39c71eba1c7587f3a6ce49faf35522bd7 100644 (file)
--- a/daphne/roomview.cpp
+++ b/daphne/roomview.cpp
@@ -166,12 +166,12 @@ RoomView::RoomView(
                " Read all ",
                wxDefaultPosition);
 
-       wxLayoutConstraints *c3 = new wxLayoutConstraints;
-       c3->top.SameAs(goto_button, wxTop);
-       c3->bottom.SameAs(goto_button, wxBottom);
-       c3->width.AsIs();
-       c3->right.LeftOf(goto_button, 3);
-       readall_button->SetConstraints(c3);
+        wxLayoutConstraints *c2 = new wxLayoutConstraints;
+        c2->top.SameAs(skip_button, wxTop);
+        c2->bottom.SameAs(skip_button, wxBottom);
+        c2->width.AsIs();
+        c2->right.LeftOf(skip_button, 3);
+        readall_button->SetConstraints(c2);
 
        wxButton *enter_button = new wxButton(
                this,

diff --git a/daphne/who.cpp b/daphne/who.cpp
index b5eceb896f41f0b7cf760a5a77f51a58495fd28e..270a996509d56195fd59dba27d09e851107e440b 100644 (file)
--- a/daphne/who.cpp
+++ b/daphne/who.cpp
@@ -96,8 +96,13 @@ who::who(CitClient *sock, wxMDIParentFrame *MyMDI)
        
        wxLayoutConstraints *c1 = new wxLayoutConstraints;
        c1->top.SameAs(this, wxTop, 10);                // 10 from the top
-       c1->bottom.SameAs(this, wxBottom, 10);
-       c1->left.SameAs(this, wxLeft, 10); 
+#ifdef __WXMSW__
+        c1->bottom.SameAs(this, wxBottom, 40);
+#endif
+#ifdef __WXGTK__
+        c1->bottom.SameAs(this, wxBottom, 10);
+#endif
+       c1->left.SameAs(this, wxLeft, 10);
        c1->right.SameAs(this, wxRight, 10);
        wholist->SetConstraints(c1);
 
@@ -126,6 +131,7 @@ who::who(CitClient *sock, wxMDIParentFrame *MyMDI)
        refresh_button->SetConstraints(b2);
 
        SetAutoLayout(TRUE);
+        Maximize(TRUE);
        Show(TRUE);
        LoadWholist();
         Layout();