somehow this got missed on the last commit..

[wxWidgets.git] / samples / font / font.cpp

diff --git a/samples/font/font.cpp b/samples/font/font.cpp
index c436ed747d8842bf0d15830db844f87a2918d7b8..43ef8f587104569e501f8cd1f6082c03f790f5c6 100644 (file)
--- a/samples/font/font.cpp
+++ b/samples/font/font.cpp
@@ -10,7 +10,7 @@
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx/wx.h".
-#include <wx/wxprec.h>
+#include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
     #pragma hdrstop
@@ -262,10 +262,10 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
 class MyEncodingEnumerator : public wxFontEnumerator
 {
 public:
-    MyEncodingEnumerator() 
+    MyEncodingEnumerator()
         { m_n = 0; }
 
-    const wxString& GetText() const 
+    const wxString& GetText() const
         { return m_text; }
 
 protected:
@@ -273,7 +273,7 @@ protected:
                                 const wxString& encoding)
     {
         wxString text;
-        text.Printf("Encoding %d: %s (available in facename '%s')\n",
+        text.Printf(wxT("Encoding %d: %s (available in facename '%s')\n"),
                     ++m_n, encoding.c_str(), facename.c_str());
         m_text += text;
         return TRUE;
@@ -290,7 +290,7 @@ void MyFrame::OnEnumerateEncodings(wxCommandEvent& WXUNUSED(event))
 
     fontEnumerator.EnumerateEncodings();
 
-    wxLogMessage("Enumerating all available encodings:\n%s",
+    wxLogMessage(wxT("Enumerating all available encodings:\n%s"),
                  fontEnumerator.GetText().c_str());
 }
 
@@ -299,10 +299,10 @@ void MyFrame::OnEnumerateEncodings(wxCommandEvent& WXUNUSED(event))
 class MyFontEnumerator : public wxFontEnumerator
 {
 public:
-    bool GotAny() const 
+    bool GotAny() const
         { return !m_facenames.IsEmpty(); }
 
-    const wxArrayString& GetFacenames() const 
+    const wxArrayString& GetFacenames() const
         { return m_facenames; }
 
 protected:
@@ -329,8 +329,8 @@ bool MyFrame::DoEnumerateFamilies(bool fixedWidthOnly,
         int nFacenames = fontEnumerator.GetFacenames().GetCount();
         if ( !silent )
         {
-            wxLogStatus(this, "Found %d %sfonts",
-                        nFacenames, fixedWidthOnly ? "fixed width " : "");
+            wxLogStatus(this, wxT("Found %d %sfonts"),
+                        nFacenames, fixedWidthOnly ? wxT("fixed width ") : wxT(""));
         }
 
         wxString facename;
@@ -368,7 +368,7 @@ bool MyFrame::DoEnumerateFamilies(bool fixedWidthOnly,
     }
     else if ( !silent )
     {
-        wxLogWarning("No such fonts found.");
+        wxLogWarning(wxT("No such fonts found."));
     }
 
     return FALSE;
@@ -391,15 +391,15 @@ void MyFrame::OnEnumerateFamiliesForEncoding(wxCommandEvent& WXUNUSED(event))
 
     static const wxString encodingNames[] =
     {
-        "West European (Latin 1)",
-        "Central European (Latin 2)",
-        "Cyrillic (Latin 5)",
-        "Greek (Latin 7)",
-        "West European new (Latin 0)",
+        "Western European (ISO-8859-1)",
+        "Central European (ISO-8859-2)",
+        "Cyrillic (ISO-8859-5)",
+        "Greek (ISO-8859-7)",
+        "Western European with Euro (ISO-8859-15)",
         "KOI8-R",
-        "Windows Latin 2",
-        "Windows Cyrillic",
-        "Windows Latin 1",
+        "Windows Central European (CP 1250)",
+        "Windows Cyrillic (CP 1251)",
+        "Windows Western European (CP 1252)",
     };
 
     int n = wxGetSingleChoiceIndex("Choose an encoding", "Font demo",
@@ -419,15 +419,15 @@ void MyFrame::OnCheckNativeToFromString(wxCommandEvent& WXUNUSED(event))
 
     if ( fontInfo.IsEmpty() )
     {
-        wxLogError("Native font info string is empty!");
+        wxLogError(wxT("Native font info string is empty!"));
     }
     else
     {
         wxFont *font = wxFont::New(fontInfo);
         if ( fontInfo != font->GetNativeFontInfoDesc() )
-            wxLogError("wxNativeFontInfo ToString()/FromString() broken!");
+            wxLogError(wxT("wxNativeFontInfo ToString()/FromString() broken!"));
         else
-            wxLogError("wxNativeFontInfo works: %s", fontInfo.c_str());
+            wxLogError(wxT("wxNativeFontInfo works: %s"), fontInfo.c_str());
         delete font;
      }
 }
@@ -451,7 +451,7 @@ void MyFrame::DoResizeFont(int diff)
 
 void MyFrame::DoChangeFont(const wxFont& font, const wxColour& col)
 {
-    Resize(GetSize(), font);
+    Resize(GetClientSize(), font);
 
     m_canvas->SetTextFont(font);
     if ( col.Ok() )
@@ -526,7 +526,7 @@ void MyFrame::OnViewMsg(wxCommandEvent& WXUNUSED(event))
         if ( line.Left(len) == prefix )
         {
             // found!
-            const char *pc = line.c_str() + len;
+            const wxChar *pc = line.c_str() + len;
             if ( *pc == '"' )
                 pc++;
 
@@ -541,7 +541,7 @@ void MyFrame::OnViewMsg(wxCommandEvent& WXUNUSED(event))
 
     if ( !charset )
     {
-        wxLogError("The file '%s' doesn't contain charset information.",
+        wxLogError(wxT("The file '%s' doesn't contain charset information."),
                    filename.c_str());
 
         return;
@@ -551,20 +551,21 @@ void MyFrame::OnViewMsg(wxCommandEvent& WXUNUSED(event))
     wxFontEncoding fontenc = wxTheFontMapper->CharsetToEncoding(charset);
     if ( fontenc == wxFONTENCODING_SYSTEM )
     {
-        wxLogError("Charset '%s' is unsupported.", charset.c_str());
+        wxLogError(wxT("Charset '%s' is unsupported."), charset.c_str());
         return;
     }
 
     m_textctrl->LoadFile(filename);
 
-    if (!wxTheFontMapper->IsEncodingAvailable(fontenc))
+    if ( fontenc == wxFONTENCODING_UTF8 ||
+            !wxTheFontMapper->IsEncodingAvailable(fontenc) )
     {
         // try to find some similar encoding:
         wxFontEncoding encAlt;
         if ( wxTheFontMapper->GetAltForEncoding(fontenc, &encAlt) )
         {
             wxEncodingConverter conv;
-            
+
             if (conv.Init(fontenc, encAlt))
             {
                 fontenc = encAlt;
@@ -572,13 +573,13 @@ void MyFrame::OnViewMsg(wxCommandEvent& WXUNUSED(event))
             }
             else
             {
-                wxLogWarning("Cannot convert from '%s' to '%s'.",
+                wxLogWarning(wxT("Cannot convert from '%s' to '%s'."),
                              wxFontMapper::GetEncodingDescription(fontenc).c_str(),
                              wxFontMapper::GetEncodingDescription(encAlt).c_str());
             }
         }
         else
-            wxLogWarning("No fonts for encoding '%s' on this system.",
+            wxLogWarning(wxT("No fonts for encoding '%s' on this system."),
                          wxFontMapper::GetEncodingDescription(fontenc).c_str());
     }
 
@@ -594,7 +595,7 @@ void MyFrame::OnViewMsg(wxCommandEvent& WXUNUSED(event))
         }
         else
         {
-            wxLogWarning("No fonts for encoding '%s' on this system.",
+            wxLogWarning(wxT("No fonts for encoding '%s' on this system."),
                          wxFontMapper::GetEncodingDescription(fontenc).c_str());
         }
     }
@@ -610,9 +611,7 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnSize(wxSizeEvent& event)
 {
-    wxSize size = event.GetSize();
-
-    Resize(size);
+    Resize(GetClientSize());
 
     event.Skip();
 }
@@ -663,12 +662,12 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
     PrepareDC(dc);
 
     // set background
-    dc.SetBackground(wxBrush("white", wxSOLID));
+    dc.SetBackground(wxBrush(wxT("white"), wxSOLID));
     dc.Clear();
 
     // output the font name/info
     wxString fontInfo;
-    fontInfo.Printf("Font size is %d points, family is %s, style %s, weight %s",
+    fontInfo.Printf(wxT("Font size is %d points, family is %s, style %s, weight %s"),
                     m_font.GetPointSize(),
                     m_font.GetFamilyString().c_str(),
                     m_font.GetStyleString().c_str(),
@@ -679,8 +678,8 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
     if ( m_font.Ok() )
     {
         wxString fontDesc = m_font.GetNativeFontInfoDesc();
-        dc.SetFont(wxFont(fontDesc));
-        fontInfo.Printf("Native font info: %s", fontDesc.c_str());
+        dc.SetFont(m_font);
+        fontInfo.Printf(wxT("Native font info: %s"), fontDesc.c_str());
         dc.DrawText(fontInfo, 5, 5 + dc.GetCharHeight());
     }
 
@@ -701,7 +700,7 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
     {
         for ( int j = 0; j < 32; j++ )
         {
-            dc.DrawText(char(32*i + j), x + w*j, y + h*i);
+            dc.DrawText(wxChar(32*i + j), x + w*j, y + h*i);
         }
     }