mention extra flag for OGL build

[wxWidgets.git] / wxPython / demo / Main.py
diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py

index ba79bc8e44e569b45694afc0eb4e3f10fdc5c753..facaf02784b4df094bc7386cd94efd1871b1d77c 100644 (file)
--- a/wxPython/demo/Main.py
+++ b/wxPython/demo/Main.py
@@ -261,6 +261,8 @@ try:
  
          # Some methods to make it compatible with how the wxTextCtrl is used
          def SetValue(self, value):
  
          # Some methods to make it compatible with how the wxTextCtrl is used
          def SetValue(self, value):
+            if wx.USE_UNICODE:
+                value = value.decode('iso8859_1')
              self.SetReadOnly(False)
              self.SetText(value)
              self.SetReadOnly(True)
              self.SetReadOnly(False)
              self.SetText(value)
              self.SetReadOnly(True)
@@ -435,7 +437,7 @@ class wxPythonDemo(wx.Frame):
  
          if wx.Platform != '__WXMAC__':
              # setup a taskbar icon, and catch some events from it
  
          if wx.Platform != '__WXMAC__':
              # setup a taskbar icon, and catch some events from it
-            dim = 16  # (may want to use 22 on wxGTK...)
+            dim = 16  # (may want to use 22 on wxGTK, but 16b looks okay too)
              icon = wx.IconFromBitmap(
                  images.getMondrianImage().Scale(dim,dim).ConvertToBitmap() )
              #icon = wx.Icon('bmp_source/mondrian.ico', wx.BITMAP_TYPE_ICO)
              icon = wx.IconFromBitmap(
                  images.getMondrianImage().Scale(dim,dim).ConvertToBitmap() )
              #icon = wx.Icon('bmp_source/mondrian.ico', wx.BITMAP_TYPE_ICO)
@@ -736,6 +738,8 @@ class wxPythonDemo(wx.Frame):
          lead = text[:6]
          if lead != '<html>' and lead != '<HTML>':
              text = '<br>'.join(text.split('\n'))
          lead = text[:6]
          if lead != '<html>' and lead != '<HTML>':
              text = '<br>'.join(text.split('\n'))
+        if wx.USE_UNICODE:
+            text = text.decode('iso8859_1')  
          self.ovr.SetPage(text)
          self.nb.SetPageText(0, name)
  
          self.ovr.SetPage(text)
          self.nb.SetPageText(0, name)