compilation fix

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

diff --git a/samples/text/text.cpp b/samples/text/text.cpp
index f805cbf50582aea4d3c7b7ce7a2414098f10aebf..af3246f4a156384ac5120745b89a5b0eae1de5d4 100644 (file)
--- a/samples/text/text.cpp
+++ b/samples/text/text.cpp
@@ -770,10 +770,17 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
                 m_horizontal->SetValue("®lu»ouèký kùò zbìsile èe¹tina «»");
                 break;
 
-            default:
+            case '1':
+                m_horizontal->SetFont(wxFont(18, wxSWISS, wxNORMAL, wxNORMAL,
+                                             FALSE, "",
+                                             wxFONTENCODING_CP1251));
+                m_horizontal->SetValue("Ïðèâåò!");
+                break;
+
+            case '8':
                 m_horizontal->SetFont(wxFont(18, wxSWISS, wxNORMAL, wxNORMAL,
                                              FALSE, "",
-                                             wxFONTENCODING_KOI8));
+                                             wxFONTENCODING_CP1251));
                 m_horizontal->SetValue("ËÁÖÅÔÓÑ ÕÄÁÞÎÙÍ");
         }
     }
@@ -826,7 +833,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
     m_textrich->AppendText(_T("And the next 10 characters should be green and italic\n"));
     m_textrich->SetDefaultStyle(wxTextAttr(*wxCYAN, *wxBLUE));
     m_textrich->AppendText(_T("This text should be cyan on blue\n"));
-    m_textrich->SetDefaultStyle(*wxBLUE);
+    m_textrich->SetDefaultStyle(wxTextAttr(*wxBLUE, *wxWHITE));
     m_textrich->AppendText(_T("And this should be in blue and the text you ")
                            _T("type should be in blue as well"));
 #else