← Back to branch summary

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

« back to all changes in this revision

Viewing changes to wxPython/src/_dc.i

  • 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:
wxPython/src/_dc.i
5
5
// Author:      Robin Dunn
6
6
//
7
7
// Created:     7-July-1997
8
 
// RCS-ID:      $Id: _dc.i 63426 2010-02-08 20:19:39Z RD $
 
8
// RCS-ID:      $Id: _dc.i 67471 2011-04-13 18:20:58Z RD $
9
9
// Copyright:   (c) 2003 by Total Control Software
10
10
// Licence:     wxWindows license
11
11
/////////////////////////////////////////////////////////////////////////////
745
745
        "Gets the current pen", "");
746
746
    
747
747
    DocDeclStr(
748
 
        const wxColour& , GetTextBackground() const,
 
748
        const wxColour , GetTextBackground() const,
749
749
        "Gets the current text background colour", "");
750
750
    
751
751
    DocDeclStr(
752
 
        const wxColour& , GetTextForeground() const,
 
752
        const wxColour , GetTextForeground() const,
753
753
        "Gets the current text foreground colour", "");
754
754
    
755
755