← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/common/fldlgcmn.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/fldlgcmn.cpp
4
4
// Author:      John Labenski
5
5
// Modified by:
6
6
// Created:     14.06.03 (extracted from src/*/filedlg.cpp)
7
 
// RCS-ID:      $Id: fldlgcmn.cpp 47482 2007-07-15 14:12:08Z VS $
 
7
// RCS-ID:      $Id: fldlgcmn.cpp 66916 2011-02-16 21:48:55Z JS $
8
8
// Copyright:   (c) Robert Roebling
9
9
// Licence:     wxWindows licence
10
10
/////////////////////////////////////////////////////////////////////////////
300
300
    }
301
301
 
302
302
    return wxFileSelector(prompt, NULL, default_name, ext, wild,
303
 
                          load ? wxFD_OPEN : wxFD_SAVE, parent);
 
303
                          load ? (wxFD_OPEN | wxFD_FILE_MUST_EXIST) : wxFD_SAVE, parent);
304
304
}
305
305
 
306
306
//----------------------------------------------------------------------------