trying to add wxBase project file from Unix

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

diff --git a/samples/font/font.cpp b/samples/font/font.cpp
index 7948599d422e9dcb66e6166ad83ca22b0fa8a268..472ac4a4ab9124a9a39c765546fb755a3a1e0ca7 100644 (file)
--- a/samples/font/font.cpp
+++ b/samples/font/font.cpp
@@ -262,10 +262,10 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
 class MyEncodingEnumerator : public wxFontEnumerator
 {
 public:
 class MyEncodingEnumerator : public wxFontEnumerator
 {
 public:

-    MyEncodingEnumerator() 
+    MyEncodingEnumerator()

         { m_n = 0; }
 
         { m_n = 0; }
 

-    const wxString& GetText() const 
+    const wxString& GetText() const

         { return m_text; }
 
 protected:
         { return m_text; }
 
 protected:


@@ -273,7 +273,7 @@ protected:
                                 const wxString& encoding)
     {
         wxString text;
                                 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;
                     ++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();
 
 
     fontEnumerator.EnumerateEncodings();
 

-    wxLogMessage("Enumerating all available encodings:\n%s",
+    wxLogMessage(wxT("Enumerating all available encodings:\n%s"),

                  fontEnumerator.GetText().c_str());
 }
 
                  fontEnumerator.GetText().c_str());
 }
 


@@ -299,10 +299,10 @@ void MyFrame::OnEnumerateEncodings(wxCommandEvent& WXUNUSED(event))
 class MyFontEnumerator : public wxFontEnumerator
 {
 public:
 class MyFontEnumerator : public wxFontEnumerator
 {
 public:

-    bool GotAny() const 
+    bool GotAny() const

         { return !m_facenames.IsEmpty(); }
 
         { return !m_facenames.IsEmpty(); }
 

-    const wxArrayString& GetFacenames() const 
+    const wxArrayString& GetFacenames() const

         { return m_facenames; }
 
 protected:
         { return m_facenames; }
 
 protected:


@@ -329,8 +329,8 @@ bool MyFrame::DoEnumerateFamilies(bool fixedWidthOnly,
         int nFacenames = fontEnumerator.GetFacenames().GetCount();
         if ( !silent )
         {
         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;
         }
 
         wxString facename;


@@ -368,7 +368,7 @@ bool MyFrame::DoEnumerateFamilies(bool fixedWidthOnly,
     }
     else if ( !silent )
     {
     }
     else if ( !silent )
     {

-        wxLogWarning("No such fonts found.");
+        wxLogWarning(wxT("No such fonts found."));

     }
 
     return FALSE;
     }
 
     return FALSE;


@@ -391,15 +391,15 @@ void MyFrame::OnEnumerateFamiliesForEncoding(wxCommandEvent& WXUNUSED(event))
 
     static const wxString encodingNames[] =
     {
 
     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",
         "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",
     };
 
     int n = wxGetSingleChoiceIndex("Choose an encoding", "Font demo",


@@ -419,15 +419,15 @@ void MyFrame::OnCheckNativeToFromString(wxCommandEvent& WXUNUSED(event))
 
     if ( fontInfo.IsEmpty() )
     {
 
     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() )
     }
     else
     {
         wxFont *font = wxFont::New(fontInfo);
         if ( fontInfo != font->GetNativeFontInfoDesc() )

-            wxLogError("wxNativeFontInfo ToString()/FromString() broken!");
+            wxLogError(wxT("wxNativeFontInfo ToString()/FromString() broken!"));

         else
         else

-            wxLogError("wxNativeFontInfo works: %s", fontInfo.c_str());
+            wxLogError(wxT("wxNativeFontInfo works: %s"), fontInfo.c_str());

         delete font;
      }
 }
         delete font;
      }
 }


@@ -526,7 +526,7 @@ void MyFrame::OnViewMsg(wxCommandEvent& WXUNUSED(event))
         if ( line.Left(len) == prefix )
         {
             // found!
         if ( line.Left(len) == prefix )
         {
             // found!

-            const char *pc = line.c_str() + len;
+            const wxChar *pc = line.c_str() + len;

             if ( *pc == '"' )
                 pc++;
 
             if ( *pc == '"' )
                 pc++;
 


@@ -541,7 +541,7 @@ void MyFrame::OnViewMsg(wxCommandEvent& WXUNUSED(event))
 
     if ( !charset )
     {
 
     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;
                    filename.c_str());
 
         return;


@@ -551,20 +551,21 @@ void MyFrame::OnViewMsg(wxCommandEvent& WXUNUSED(event))
     wxFontEncoding fontenc = wxTheFontMapper->CharsetToEncoding(charset);
     if ( fontenc == wxFONTENCODING_SYSTEM )
     {
     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);
 
         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;
     {
         // try to find some similar encoding:
         wxFontEncoding encAlt;
         if ( wxTheFontMapper->GetAltForEncoding(fontenc, &encAlt) )
         {
             wxEncodingConverter conv;

-            
+

             if (conv.Init(fontenc, encAlt))
             {
                 fontenc = encAlt;
             if (conv.Init(fontenc, encAlt))
             {
                 fontenc = encAlt;


@@ -572,13 +573,13 @@ void MyFrame::OnViewMsg(wxCommandEvent& WXUNUSED(event))
             }
             else
             {
             }
             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
                              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());
     }
 
                          wxFontMapper::GetEncodingDescription(fontenc).c_str());
     }
 


@@ -594,7 +595,7 @@ void MyFrame::OnViewMsg(wxCommandEvent& WXUNUSED(event))
         }
         else
         {
         }
         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());
         }
     }
                          wxFontMapper::GetEncodingDescription(fontenc).c_str());
         }
     }


@@ -666,7 +667,7 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
 
     // output the font name/info
     wxString fontInfo;
 
     // 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(),
                     m_font.GetPointSize(),
                     m_font.GetFamilyString().c_str(),
                     m_font.GetStyleString().c_str(),


@@ -677,8 +678,8 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
     if ( m_font.Ok() )
     {
         wxString fontDesc = m_font.GetNativeFontInfoDesc();
     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());
     }
 
         dc.DrawText(fontInfo, 5, 5 + dc.GetCharHeight());
     }
 


@@ -699,7 +700,7 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
     {
         for ( int j = 0; j < 32; j++ )
         {
     {
         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);

         }
     }
 
         }
     }