← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/common/strconv.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/common/strconv.cpp
5
5
//              Ryan Norton, Fredrik Roubert (UTF7)
6
6
// Modified by:
7
7
// Created:     29/01/98
8
 
// RCS-ID:      $Id: strconv.cpp 56394 2008-10-17 11:31:22Z VZ $
 
8
// RCS-ID:      $Id: strconv.cpp 64156 2010-04-27 08:52:30Z VZ $
9
9
// Copyright:   (c) 1999 Ove Kaaven, Robert Roebling, Vaclav Slavik
10
10
//              (c) 2000-2003 Vadim Zeitlin
11
11
//              (c) 2004 Ryan Norton, Fredrik Roubert
1676
1676
        {
1677
1677
#if SIZEOF_WCHAR_T == 4
1678
1678
            _T("UCS-4"),
1679
 
#elif SIZEOF_WCHAR_T = 2
 
1679
#elif SIZEOF_WCHAR_T == 2
1680
1680
            _T("UCS-2"),
1681
1681
#endif
1682
1682
            NULL