← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/common/sizer.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/sizer.cpp
5
5
//              Dirk Holtwick, Ron Lee
6
6
// Modified by: Ron Lee
7
7
// Created:
8
 
// RCS-ID:      $Id: sizer.cpp 52359 2008-03-06 13:48:50Z VS $
 
8
// RCS-ID:      $Id: sizer.cpp 66936 2011-02-17 09:52:57Z JS $
9
9
// Copyright:   (c) Robin Dunn, Robert Roebling
10
10
// Licence:     wxWindows licence
11
11
/////////////////////////////////////////////////////////////////////////////
771
771
 
772
772
    wxSizerItem *item = node->GetData();
773
773
    node->SetData(newitem);
 
774
 
 
775
    if (item->IsWindow() && item->GetWindow())
 
776
        item->GetWindow()->SetContainingSizer(NULL);
 
777
 
774
778
    delete item;
775
779
 
776
780
    return true;