← Back to branch summary

~ubuntu-branches/ubuntu/raring/wxwidgets2.8/raring

« back to all changes in this revision

Viewing changes to src/cocoa/settings.mm

  • Committer: Package Import Robot
  • Author(s): Stéphane Graber
  • Date: 2012-01-07 13:59:25 UTC
  • mfrom: (1.1.9) (5.1.10 sid)
  • Revision ID: package-import@ubuntu.com-20120107135925-2601miy9ullcon9j
Tags: 2.8.12.1-6ubuntu1
https://launchpad.net/bugs/632984
* Resync from Debian, changes that were kept:
  - debian/rules: re-enable mediactrl. This allows libwx_gtk2u_media-2.8 to be
    built, as this is required by some applications (LP: #632984)
  - debian/control: Build-dep on libxt-dev for mediactrl.
  - Patches
    + fix-bashism-in-example
* Add conflict on python-wxgtk2.8 (<< 2.8.12.1-6ubuntu1~) to python-wxversion
  to guarantee upgrade ordering when moving from pycentral to dh_python2.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/cocoa/settings.mm
4
4
// Author:      David Elliott
5
5
// Modified by:
6
6
// Created:     2005/01/11
7
 
// RCS-ID:      $Id: settings.mm 49216 2007-10-18 08:23:05Z DE $
 
7
// RCS-ID:      $Id: settings.mm 67017 2011-02-25 09:37:28Z JS $
8
8
// Copyright:   (c) 2005 David Elliott
9
9
// Licence:     wxWindows licence
10
10
/////////////////////////////////////////////////////////////////////////////
75
75
        return wxColour([NSColor controlShadowColor]);
76
76
    case wxSYS_COLOUR_3DLIGHT:
77
77
        return wxColour([NSColor controlHighlightColor]);
 
78
    case wxSYS_COLOUR_LISTBOXHIGHLIGHTTEXT:
78
79
    case wxSYS_COLOUR_HIGHLIGHTTEXT:
79
80
        return wxColour([NSColor selectedControlTextColor]);
80
81
    case wxSYS_COLOUR_INFOBK: