Removing makegen and projgen, part #1: removing references

[wxWidgets.git] / demos / forty / scoredg.cpp

diff --git a/demos/forty/scoredg.cpp b/demos/forty/scoredg.cpp
index 39f8f5eacb60df5c32b91e56836b51f314ca3b4c..f4b563a469f4708d8a70989789a48b9dfcb80b9b 100644 (file)
--- a/demos/forty/scoredg.cpp
+++ b/demos/forty/scoredg.cpp
@@ -86,7 +86,7 @@ void ScoreCanvas::OnDraw(wxDC& dc)
 {
        dc.SetFont(* m_font);
 
-       const char* str = m_text;
+       const wxChar* str = m_text;
        unsigned int tab = 0;
        unsigned int tabstops[] = { 5, 100, 150, 200 };
 
@@ -94,15 +94,15 @@ void ScoreCanvas::OnDraw(wxDC& dc)
        int lineSpacing;
        {
                long w, h;
-               dc.GetTextExtent("Testing", &w, &h);
+               dc.GetTextExtent(wxT("Testing"), &w, &h);
                lineSpacing = (int)h;
        }
 
        int y = 0;
        while (*str)
        {
-               char text[256];
-               char* dest = text;
+               wxChar text[256];
+               wxChar* dest = text;
                
                while (*str && *str >= ' ') *dest++ = *str++;
                *dest = '\0';
@@ -133,7 +133,7 @@ ScoreDialog::ScoreDialog(
                                                        wxWindow* parent,
                                                        ScoreFile* file
                                                        ) :
-       wxDialog(parent, -1, "Scores",
+       wxDialog(parent, -1, _("Scores"),
                        wxDefaultPosition, wxSize(310, 200),
                        wxDIALOG_MODAL | wxDEFAULT_DIALOG_STYLE),
        m_scoreFile(file)
@@ -142,7 +142,7 @@ ScoreDialog::ScoreDialog(
        SetAutoLayout (TRUE);
 
        ScoreCanvas* list = new ScoreCanvas(this, m_scoreFile);
-       m_OK = new wxButton(this, wxID_OK, "OK");
+       m_OK = new wxButton(this, wxID_OK, _("OK"));
 
        wxLayoutConstraints* layout;