* 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

diff --git a/daphne/ChangeLog b/daphne/ChangeLog
index 9d623806e1954ee69e79026978954e4732c655bb..9a2a734e2e10c89cac491ee821e22c40f33cebeb 100644 (file)
--- a/daphne/ChangeLog
+++ b/daphne/ChangeLog
@@ -1,4 +1,17 @@
  $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.
@@ -83,4 +96,3 @@ shut down the program.
 
 Revision 1.1  1999/11/07 17:56:38  ajc
 * Began the ChangeLog for this project.
-

diff --git a/daphne/citclient.cpp b/daphne/citclient.cpp
index ef4e2fcc5572c39281ca3d88f6345d2e32d0ed43..1625e842732c3e1e65de997e658ce42e05e82b8e 100644 (file)
--- a/daphne/citclient.cpp
+++ b/daphne/citclient.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "includes.hpp"
 #include <wx/protocol/protocol.h>
 
@@ -272,7 +274,15 @@ void CitClient::initialize_session(void)  {
 
        CurrentRoom = "";
 
-       sendcmd = "IDEN 0|6|001|Daphne";
+#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)";
+#endif
        serv_trans(sendcmd);
 
        sendcmd = "INFO";

diff --git a/daphne/daphne.rc b/daphne/daphne.rc
new file mode 100644 (file)
index 0000000..131e937
--- /dev/null
+++ b/daphne/daphne.rc
@@ -0,0 +1,16 @@
+// $Id$
+
+chat           BITMAP "bitmaps/chat.bmp"
+floor          BITMAP "bitmaps/floor.bmp"
+globe          BITMAP "bitmaps/globe.bmp"
+goto           BITMAP "bitmaps/goto.bmp"
+mail           BITMAP "bitmaps/mail.bmp"
+mailroom       BITMAP "bitmaps/mailroom.bmp"
+newroom        BITMAP "bitmaps/newroom.bmp"
+oldroom                BITMAP "bitmaps/oldroom.bmp"
+root           BITMAP "bitmaps/root.bmp"
+who            BITMAP "bitmaps/who.bmp"
+xglobe         BITMAP "bitmaps/xglobe.bmp"
+
+#include "wx/msw/wx.rc"
+

diff --git a/daphne/hosts.cpp b/daphne/hosts.cpp
index ca99523bb93c5356c10af3016efbdd518c20a010..da3abfb71af8abbabb398154d630e64ab39ee9c3 100644 (file)
--- a/daphne/hosts.cpp
+++ b/daphne/hosts.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 // =========================================================================
 // declarations
 // =========================================================================
@@ -151,6 +153,6 @@ void Hosts::OnButtonPressed(wxCommandEvent& whichbutton) {
                ini->Write("/BBSList/Host", server_host->GetValue());
                ini->Write("/BBSList/Port", server_port->GetValue());
                                
-               ini->Flush();
+               ini->Flush(FALSE);
        }
 }

diff --git a/daphne/includes.hpp b/daphne/includes.hpp
index e656445e274ae7b3906272e57bb5aecc2a1b8d7a..76c1b8db48f294ab69198996bd53f8fb19869278 100644 (file)
--- a/daphne/includes.hpp
+++ b/daphne/includes.hpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include <wx/wx.h>             // General-purpose wxWin header
 #include <wx/listctrl.h>
 #include <wx/socket.h>         // TCP socket client
@@ -189,7 +191,7 @@ private:
 };
 
 // Just testing...
-class DoChat : public wxMDIChildFrame {
+class ChatWindow : public wxMDIChildFrame {
 public:
         ChatWindow(CitClient *sock, wxMDIParentFrame *MyMDI);
 private:

diff --git a/daphne/main.cpp b/daphne/main.cpp
index 0f765ea9726b17c96c3e70bab0968f1956131a4e..a66280a293a4dbc915e8bd9ae3c397c6309097e8 100644 (file)
--- a/daphne/main.cpp
+++ b/daphne/main.cpp
@@ -1,6 +1,7 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        main.cpp
 // Purpose:     Main screen type thing
+// Version:     $Id$
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -260,7 +261,14 @@ void MyFrame::InitToolBar(wxToolBar* toolBar) {
 #endif
 
         // Set up the toolbar icons (BMP is available on both GTK and MSW) 
-#ifndef __WXMOTIF__
+#ifdef __WXMSW__
+       bitmaps[0] = new wxBitmap("globe", wxBITMAP_TYPE_BMP_RESOURCE);
+       bitmaps[1] = new wxBitmap("mail", wxBITMAP_TYPE_BMP_RESOURCE);
+       bitmaps[2] = new wxBitmap("who", wxBITMAP_TYPE_BMP_RESOURCE);
+       bitmaps[3] = new wxBitmap("chat", wxBITMAP_TYPE_BMP_RESOURCE);
+       bitmaps[4] = new wxBitmap("xglobe", wxBITMAP_TYPE_BMP_RESOURCE);
+       bitmaps[5] = new wxBitmap("goto", wxBITMAP_TYPE_BMP_RESOURCE);
+#elif !defined(__WXMOTIF__)
        bitmaps[0] = new wxBitmap("/usr/local/share/bitmaps/globe.bmp", wxBITMAP_TYPE_BMP);
        bitmaps[1] = new wxBitmap("/usr/local/share/bitmaps/mail.bmp", wxBITMAP_TYPE_BMP);
        bitmaps[2] = new wxBitmap("/usr/local/share/bitmaps/who.bmp", wxBITMAP_TYPE_BMP);

diff --git a/daphne/makefile.g95 b/daphne/makefile.g95
index a9271d365799e741b7ca4e0deb7fc7477a0aa447..638ad47b346b87d530bff00e69bed14db4965b80 100644 (file)
--- a/daphne/makefile.g95
+++ b/daphne/makefile.g95
@@ -5,7 +5,7 @@ TARGET          = daphne
 
 MY_OBJECTS     = citclient.o enter.o express_message.o main.o message.o \
                prefs.o roomtree.o roomview.o selectuser.o send_express.o \
-               servprops.o testwindow.o userlogin.o \
+               servprops.o testwindow.o userlogin.o hosts.o \
                utils.o who.o
 
 OBJECTS         = $(MY_OBJECTS)

diff --git a/daphne/prefs.cpp b/daphne/prefs.cpp
index 9cfeb2f65d518b3e1ef3ebfba3e874249dcf7206..4be58298315bafa29213c103b7259fc629568740 100644 (file)
--- a/daphne/prefs.cpp
+++ b/daphne/prefs.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 // =========================================================================
 // declarations
 // =========================================================================
@@ -165,7 +167,7 @@ void Preferences::OnButtonPressed(wxCommandEvent& whichbutton) {
                ini->Write("/Citadel Server/ConnectOnStartup",
                        ((server_autoconnect->GetValue()==TRUE)
                        ? wxString("yes") : wxString("no")));
-               ini->Flush();
+               ini->Flush(FALSE);
                delete this;
        }
 }