$NetBSD$

various wxGTK changes.

--- carnival.cpp.orig	2011-12-15 12:12:21.000000000 +0000
+++ carnival.cpp	2011-12-15 12:12:51.000000000 +0000
@@ -382,7 +382,7 @@
 {
     // make an unique ID string to identify multiple instances:
     // "Carnival-[User-ID]"
-    const wxString name = wxString::Format("Carnival-%s", wxGetUserId().c_str());
+    const wxString name = wxString::Format(_T("Carnival-%s"), wxGetUserId().c_str());
     m_checker = new wxSingleInstanceChecker(name); // make new instance checker
     SetAppName(_T("Carnival")); // set internal app and vendor name
     SetVendorName(_T("Bernd Amann, IMS (Uni Stuttgart)"));
@@ -1428,7 +1428,7 @@
              wxCAPTION | wxMINIMIZE_BOX | wxSYSTEM_MENU | wxRESIZE_BORDER)
 {
     m_text = NULL;
-    SetIcon(wxICON(carnival)); // load the icon, see MyFrame constructor
+    //SetIcon(wxICON(carnival)); // load the icon, see MyFrame constructor
     m_text = new wxTextCtrl(this, -1, _T("This is the log window.\n"),
                             wxPoint(0, 0), wxSize(500, 140), wxTE_MULTILINE | wxTE_READONLY);
     m_text->SetBackgroundColour(wxT("light blue"));
@@ -1481,7 +1481,7 @@
     // Give it an icon
     // The wxICON() macro loads an icon from a resource under Windows
     // and uses an #included XPM image under GTK+ and Motif
-    SetIcon(wxICON(carnival));
+    //SetIcon(wxICON(carnival));
 
     // load / create the menu
     wxMenu *file_menu = new wxMenu;
@@ -1574,7 +1574,7 @@
             frame_sable = NULL;
             frame_sable = new wxFrame(this, D_SABLE, boxtext,wxPoint(10,10),wxSize(550,490),
                                         wxDEFAULT_FRAME_STYLE); // | wxRESIZE_BORDER);
-            frame_sable->SetIcon(wxICON(carnival)); // load the icon, see MyFrame constructor
+            //frame_sable->SetIcon(wxICON(carnival)); // load the icon, see MyFrame constructor
             frame_sable->Move(50,50);
             wxHtmlWindow *htmlwin;
             htmlwin = new wxHtmlWindow(frame_sable, -1,wxPoint(0,0),wxSize(510,470));
@@ -1590,7 +1590,7 @@
             frame_ssml = NULL;
             frame_ssml = new wxFrame(this, D_SSML, boxtext,wxPoint(10,10),wxSize(550,490),
                                         wxDEFAULT_FRAME_STYLE); // | wxRESIZE_BORDER);
-            frame_ssml->SetIcon(wxICON(carnival)); // load the icon, see MyFrame constructor
+            //frame_ssml->SetIcon(wxICON(carnival)); // load the icon, see MyFrame constructor
             frame_ssml->Move(80,80);
             wxHtmlWindow *htmlwin;
             htmlwin = new wxHtmlWindow(frame_ssml, -1,wxPoint(0,0),wxSize(510,470));
