Changeset 174 for trunk/src

Timestamp:

10/05/2008 01:59:22 PM (4 years ago)

Author:

guyru

Message:

VC2008 project files, minor fixes for windows compilation

Location:

trunk/src

Files:

• MainFrame.cpp (modified) (2 diffs)
• Makefile.am (modified) (2 diffs)
• highscores_dialog.cpp (modified) (2 diffs)
• settings_dialog.cpp (modified) (1 diff)

trunk/src/MainFrame.cpp

@@ -88 +88 @@
         
         std::string config_file;
-        config_file = (home_path.mb_str());
+        config_file = (home_path.utf8_str());
         #ifndef PORTABLE
                 config_file += "/.openyahtzee.new";
@@ -998 +998 @@
         infodialog.ShowModal();
 
-        name = infodialog.GetValue().mb_str();
+        name = infodialog.GetValue().utf8_str();
         m_config->set("last-name",name)->save();
 
         //get the date
         wxDateTime now = wxDateTime::Now();
-        date = now.FormatDate().mb_str();
+        date = now.FormatDate().utf8_str();
         date += " ";
-        date += now.FormatISOTime().SubString(0,4).mb_str();
+        date += now.FormatISOTime().SubString(0,4).utf8_str();
 
         int rank = m_config->submitHighscore(score, name, date);

trunk/src/Makefile.am

@@ -2 +2 @@
 openyahtzee_SOURCES = \
         About.cpp \
+        ../config.h \
         configuration.cpp \
         configuration.h \
@@ -37 +38 @@
         ObjectsID.h \
         ScoreDice.h \
-        wxDynamicBitmap.h
+        wxDynamicBitmap.h \
+        ../openyahtzee.vcproj \
+        ../openyahtzee.sln
 
 AM_CXXFLAGS = `wx-config --cxxflags`

trunk/src/highscores_dialog.cpp

@@ -87 +87 @@
 
                 // name
-                buf = wxString(it->name.c_str(),wxConvUTF8);
+                buf = wxString::FromUTF8(it->name.c_str());
                 highscoreslist->SetItem(i,1,buf);
 
@@ -96 +96 @@
 
                 // date
-                buf = wxString(it->date.c_str(),wxConvUTF8);
+                buf = wxString::FromUTF8(it->date.c_str());
                 highscoreslist->SetItem(i,3,buf);
         }

trunk/src/settings_dialog.cpp

@@ -43 +43 @@
         // need to delete them manually
         animate_checkbox = new wxCheckBox(this, wxID_ANY, wxT("Dice animation"));
-        subtotal_checkbox = new wxCheckBox(this, wxID_ANY, wxT("Calculate "
-                "sub-total score for the upper and lower sections"));
-        score_hints_checkbox = new wxCheckBox(this, wxID_ANY, wxT("Display "
-                "score hints."));
+        subtotal_checkbox = new wxCheckBox(this, wxID_ANY, wxT("Calculate sub-total score for the upper and lower sections"));
+        score_hints_checkbox = new wxCheckBox(this, wxID_ANY, wxT("Display score hints."));
         horizontal_checkbox = new wxCheckBox(this, wxID_ANY, wxT("Enable horizontal layout for user interface."));
 }