Changeset 1448

Timestamp:

Jul 31, 2014 12:19:10 PM (9 years ago)

Author:

toby

Message:

quick wx2.9+ fixes

Location:

trunk

Files:

• GSASIIplot.py (modified) (2 diffs)
• gltext.py (modified) (3 diffs)

trunk/GSASIIplot.py

@@ -4654 +4654 @@
     try:
         plotNum = G2frame.G2plotNB.plotList.index(generalData['Name'])
-        Page = G2frame.G2plotNB.nb.GetPage(plotNum)        
+        Page = G2frame.G2plotNB.nb.GetPage(plotNum)
     except ValueError:
         Plot = G2frame.G2plotNB.addOgl(generalData['Name'])
@@ -4662 +4662 @@
         view = False
         altDown = False
+    G2frame.G2plotNB.nb.SetSelection(plotNum) # make sure plot tab is raised for wx >2.8
     Font = Page.GetFont()
     Page.SetFocus()

trunk/gltext.py

@@ -61 +61 @@
         text (String)         - Text
         font (wx.Font)        - Font to draw with (None = System default)
-        foreground (wx.Color) - Color of the text
+        foreground (wx.Colour)- Color of the text
                 or (wx.Bitmap)- Bitmap to overlay the text with
         centered (bool)       - Center the text
@@ -205 +205 @@
         alpha = img.GetData()
         
-        if isinstance(self._foreground, wx.Color):  
+        if isinstance(self._foreground, wx.Colour):  
             """
             If we have a static color...  
@@ -324 +324 @@
             font (wx.Font)          - if None, system default font will be used with font_size
             font_size (int)         - font size in points
-            foreground (wx.Color)   - Color of the text
+            foreground (wx.Colour)   - Color of the text
                     or (wx.Bitmap)  - Bitmap to overlay the text with
             centered (bool)         - should the text drawn centered towards position?