Changeset 1448


Ignore:
Timestamp:
Jul 31, 2014 12:19:10 PM (7 years ago)
Author:
toby
Message:

quick wx2.9+ fixes

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIplot.py

    r1445 r1448  
    46544654    try:
    46554655        plotNum = G2frame.G2plotNB.plotList.index(generalData['Name'])
    4656         Page = G2frame.G2plotNB.nb.GetPage(plotNum)       
     4656        Page = G2frame.G2plotNB.nb.GetPage(plotNum)
    46574657    except ValueError:
    46584658        Plot = G2frame.G2plotNB.addOgl(generalData['Name'])
     
    46624662        view = False
    46634663        altDown = False
     4664    G2frame.G2plotNB.nb.SetSelection(plotNum) # make sure plot tab is raised for wx >2.8
    46644665    Font = Page.GetFont()
    46654666    Page.SetFocus()
  • trunk/gltext.py

    r1299 r1448  
    6161        text (String)         - Text
    6262        font (wx.Font)        - Font to draw with (None = System default)
    63         foreground (wx.Color) - Color of the text
     63        foreground (wx.Colour)- Color of the text
    6464                or (wx.Bitmap)- Bitmap to overlay the text with
    6565        centered (bool)       - Center the text
     
    205205        alpha = img.GetData()
    206206       
    207         if isinstance(self._foreground, wx.Color): 
     207        if isinstance(self._foreground, wx.Colour): 
    208208            """
    209209            If we have a static color... 
     
    324324            font (wx.Font)          - if None, system default font will be used with font_size
    325325            font_size (int)         - font size in points
    326             foreground (wx.Color)   - Color of the text
     326            foreground (wx.Colour)   - Color of the text
    327327                    or (wx.Bitmap)  - Bitmap to overlay the text with
    328328            centered (bool)         - should the text drawn centered towards position?
Note: See TracChangeset for help on using the changeset viewer.