more cross-platform poop

diff --git a/daphne/includes.hpp b/daphne/includes.hpp
index bfb656586733871a9b48518ebbd02241e43b5d9a..78972a217187d8fa29317719e7d346d8ee1bc78f 100644 (file)
--- a/daphne/includes.hpp
+++ b/daphne/includes.hpp
@@ -6,8 +6,9 @@
 #include <wx/listctrl.h>
 #include <wx/socket.h>
 #include <wx/log.h>
-#include "wx/imaglist.h"
-#include "wx/treectrl.h"
+#include <wx/imaglist.h>
+#include <wx/treectrl.h>
+#include <wx/toolbar.h>
 
 
 

diff --git a/daphne/main.cpp b/daphne/main.cpp
index 0a82c2d435ccbf7d5e571aed6355e265c483b0d7..dd956fc3f35662c6dfdffea36b54111600e01d78 100644 (file)
--- a/daphne/main.cpp
+++ b/daphne/main.cpp
@@ -202,7 +202,15 @@ void MyFrame::InitToolBar(wxToolBar* toolBar) {
        int i;
        wxBitmap* bitmaps[4];
 
-
+// wxGTK seems to do the right thing by itself, while wxMSW wants to be
+// told how big the toolbar icons are going to be, otherwise it defaults to
+// 16x16.  Strangely, wxToolBar::SetToolBitmapSize() doesn't seem to be
+// available at all in wxGTK, hence the ifdef...
+#ifdef __WXMSW__
+       toolBar->SetToolBitmapSize(wxSize(32, 32));
+#endif
+
+        // Set up the toolbar icons (BMP is available on both GTK and MSW) 
        bitmaps[0] = new wxBitmap("bitmaps/globe.bmp",  wxBITMAP_TYPE_BMP);
        bitmaps[1] = new wxBitmap("bitmaps/mail.bmp",   wxBITMAP_TYPE_BMP);
        bitmaps[2] = new wxBitmap("bitmaps/who.bmp",    wxBITMAP_TYPE_BMP);
@@ -273,10 +281,10 @@ void MyFrame::OnUsersMenu(wxCommandEvent& cmd) {
        
        id = cmd.GetId();
        if (id == UMENU_WHO) {
-               if (TheWholist == NULL)
+                //if (TheWholist == NULL)
                        TheWholist = new who(citadel, this);
-               else
-                       TheWholist->Activate();
+                //else
+                        //TheWholist->Activate();
        }
        else if (id == UMENU_SEND_EXPRESS)
                new SendExpress(citadel, this, "");