← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/common/utilscmn.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/utilscmn.cpp
3
3
// Author:      Julian Smart
4
4
// Modified by:
5
5
// Created:     29/01/98
6
 
// RCS-ID:      $Id: utilscmn.cpp 63295 2010-01-28 10:14:20Z CE $
 
6
// RCS-ID:      $Id: utilscmn.cpp 66917 2011-02-16 21:51:31Z JS $
7
7
// Copyright:   (c) 1998 Julian Smart
8
8
// Licence:     wxWindows licence
9
9
/////////////////////////////////////////////////////////////////////////////
1285
1285
 
1286
1286
wxColour wxGetColourFromUser(wxWindow *parent, const wxColour& colInit, const wxString& caption)
1287
1287
{
1288
 
    wxColourData data;
 
1288
    static wxColourData data;
1289
1289
    data.SetChooseFull(true);
1290
1290
    if ( colInit.Ok() )
1291
1291
    {