- Revision
- 16068
- Author
- robind
- Date
- 2007-12-06 13:07:40 -0800 (Thu, 06 Dec 2007)
Log Message
Minor changes needed for the wx r201 tarball (r=rae)
Modified Paths
Diff
Modified: trunk/chandler/application/Application.py (16067 => 16068)
--- trunk/chandler/application/Application.py 2007-12-06 21:05:18 UTC (rev 16067) +++ trunk/chandler/application/Application.py 2007-12-06 21:07:40 UTC (rev 16068) @@ -152,29 +152,14 @@ self.Bind(wx.EVT_CLOSE, self.OnClose) if wx.Platform == "__WXMSW__": - # From the wxWidgets documentation: - # wxToolBar95: Note that this toolbar paints tools to reflect system-wide colours. - # If you use more than 16 colours in your tool bitmaps, you may wish to suppress - # this behaviour, otherwise system colours in your bitmaps will inadvertently be - # mapped to system colours. To do this, set the msw.remap system option before - # creating the toolbar: + # if we're running on a Themed XP, and the display depth + # gives us enough bits to play with, then this mode gives + # us better looking toolbar icons, otherwise stick to the + # default behavior. + if wx.GetApp().GetComCtl32Version() >= 600 and wx.DisplayDepth() >= 32: + wx.SystemOptions.SetOptionInt("msw.remap", 2) + - # wxSystemOptions::SetOption(wxT("msw.remap"), 0); - - # If you wish to use 32-bit images (which include an alpha channel for - # transparency) use: - - # wxSystemOptions::SetOption(wxT("msw.remap"), 2); - - # then colour remapping is switched off, and a transparent background used. But - # only use this option under Windows XP with true colour: - - # (wxTheApp->GetComCtl32Version() >= 600 && ::wxDisplayDepth() >= 32) - # - # Unfortunately, for some XP machines msw.remap of 2 doesn't work, even - # when wx.GetApp().GetComCtl32Version() >= 600 and wx.DisplayDepth() >= 32 - wx.SystemOptions.SetOptionInt ("msw.remap", 0) - if wx.Platform == '__WXMAC__': # Fix for Bug 4156: On the Mac, when the app activates, # un-minimize the main window if necessary
Modified: trunk/chandler/parcels/osaf/framework/attributeEditors/StringAttributeEditor.py (16067 => 16068)
--- trunk/chandler/parcels/osaf/framework/attributeEditors/StringAttributeEditor.py 2007-12-06 21:05:18 UTC (rev 16067) +++ trunk/chandler/parcels/osaf/framework/attributeEditors/StringAttributeEditor.py 2007-12-06 21:07:40 UTC (rev 16068) @@ -103,7 +103,7 @@ # We'll draw the sample or prefix in gray (unless it's part of the # selection, in which case we'll leave it white) if not isInSelection and (isSample or prefix is not None): - oldForeground = wx.Colour(dc.GetTextForeground()) + oldForeground = dc.GetTextForeground() dc.SetTextForeground (wx.SystemSettings.GetColour (wx.SYS_COLOUR_GRAYTEXT)) haveText = len(theText) > 0
_______________________________________________ Commits mailing list [email protected] http://lists.osafoundation.org/mailman/listinfo/commits
