← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/msw/settings.cpp

  • 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/msw/settings.cpp
4
4
// Author:      Julian Smart
5
5
// Modified by:
6
6
// Created:     04/01/98
7
 
// RCS-ID:      $Id: settings.cpp 57542 2008-12-25 13:03:24Z VZ $
 
7
// RCS-ID:      $Id: settings.cpp 67017 2011-02-25 09:37:28Z JS $
8
8
// Copyright:   (c) Julian Smart
9
9
// Licence:     wxWindows licence
10
10
/////////////////////////////////////////////////////////////////////////////
132
132
        // there is no standard colour with this index, map to another one
133
133
        index = wxSYS_COLOUR_WINDOWTEXT;
134
134
    }
 
135
    else if ( index == wxSYS_COLOUR_LISTBOXHIGHLIGHTTEXT)
 
136
    {
 
137
        // there is no standard colour with this index, map to another one
 
138
        index = wxSYS_COLOUR_HIGHLIGHTTEXT;
 
139
    }
135
140
    else if ( index == wxSYS_COLOUR_LISTBOX )
136
141
    {
137
142
        // there is no standard colour with this index, map to another one