Changeset 185 for trunk/src

Timestamp:

10/23/2008 08:51:44 PM (4 years ago)

Author:

guyru

Message:

fix compilation under VC

Location:

trunk/src

Files:

• MainFrame.cpp (modified) (3 diffs)
• about.cpp (modified) (3 diffs)

trunk/src/MainFrame.cpp

@@ -41 +41 @@
 #include <wx/filename.h>
 #include <wx/stdpaths.h>
-#include <wx/aboutdlg.h>
 #include <wx/mstream.h>
 
@@ -55 +54 @@
 
 #include "icon32.xpm"
-#include "openyahtzee_logo.png.h"
 
 //default values - design
@@ -387 +385 @@
 void MainFrame::OnAbout(wxCommandEvent& event)
 {
-        wxAboutDialogInfo info;
-        info.SetName(wxT(PACKAGE_NAME));
-        info.SetVersion(wxT(PACKAGE_VERSION));
-        info.SetDescription(wxT("A cross-platform Yahtzee game."));
-        info.SetCopyright(wxT("(C) 2006-2008 Guy Rutenberg"));
-        info.SetWebSite(wxT("http://www.openyahtzee.org/"));
-
-        wxMemoryInputStream istream(openyahtzee_logo_png, sizeof openyahtzee_logo_png);
-        wxImage myimage_img(istream, wxBITMAP_TYPE_PNG);
-
-        wxIcon logo;
-        logo.CopyFromBitmap(wxBitmap(myimage_img));
-        info.SetIcon(logo);
-
-        info.AddDeveloper(wxT("Guy Rutenberg <guyrutenberg@gmail.com>"));
-        info.AddArtist(wxT("Seamous Mc\nGill <johndoe@gmail.com>"));
-
-        //wxAboutBox(info);
-#ifdef PORTABLE
         about::AboutDialog *about = new about::AboutDialog(this);
-#else
-        about::AboutDialog *about = new about::AboutDialog(this);
-#endif
         about->ShowModal();
 }

trunk/src/about.cpp

@@ -27 +27 @@
 using namespace about;
 AboutDialog::AboutDialog(wxWindow* parent):
-    wxDialog(parent, wxID_ANY, wxT("About " PACKAGE_NAME), wxDefaultPosition, wxSize(-1,300), wxDEFAULT_DIALOG_STYLE)
+    wxDialog(parent, wxID_ANY, wxT("About ") wxT(PACKAGE_NAME), wxDefaultPosition, wxSize(-1,300), wxDEFAULT_DIALOG_STYLE)
 {
         addControlsAndLayout();
@@ -39 +39 @@
         title_sizer->Add(logo, 0, wxALL|wxALIGN_CENTER_VERTICAL, 10);
 
-        wxStaticText* app_label = new wxStaticText(this,wxID_ANY,wxT("Open Yahtzee " VERSION));
+        wxStaticText* app_label = new wxStaticText(this,wxID_ANY,wxT("Open Yahtzee ") wxT(VERSION));
         app_label->SetFont(wxFont(14, wxDEFAULT, wxNORMAL, wxBOLD, false));
         title_sizer->Add(app_label, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxADJUST_MINSIZE, 10);
@@ -99 +99 @@
 {
         wxTextCtrl* text = new wxTextCtrl(notebook, wxID_ANY,wxT(""),wxDefaultPosition,wxDefaultSize,wxTE_MULTILINE|wxTE_READONLY);
-        *text << wxT("This program is free software; you can redistribute "
-                "it and/or modify it under the terms of the GNU General "
-                "Public License as published by the Free Software "
-                "Foundation; either version 2 of the License, or (at your "
-                "option) any later version.\n\n"
+        *text << wxT("This program is free software; you can redistribute ")
+                wxT("it and/or modify it under the terms of the GNU General ")
+                wxT("Public License as published by the Free Software ")
+                wxT("Foundation; either version 2 of the License, or (at your ")
+                wxT("option) any later version.\n\n")
 
-                "This program is distributed in the hope that it will be "
-                "useful, but WITHOUT ANY WARRANTY; without even the "
-                "implied warranty of MERCHANTABILITY or FITNESS FOR A "
-                "PARTICULAR PURPOSE.  See the GNU General Public License "
-                "for more details. \n\n"
+                wxT("This program is distributed in the hope that it will be ")
+                wxT("useful, but WITHOUT ANY WARRANTY; without even the ")
+                wxT("implied warranty of MERCHANTABILITY or FITNESS FOR A ")
+                wxT("PARTICULAR PURPOSE.  See the GNU General Public License ")
+                wxT("for more details. \n\n")
 
-                "You should have received a copy of the GNU General "
-                "Public License along with this program; if not, write to "
-                "the\n"
-                "Free Software Foundation, Inc.,\n"
-                "59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.");
+                wxT("You should have received a copy of the GNU General ")
+                wxT("Public License along with this program; if not, write to ")
+                wxT("the\n")
+                wxT("Free Software Foundation, Inc.,\n")
+                wxT("59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.");
 
         notebook->AddPage(text, wxT("License Agreement"));