← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/aui/framemanager.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/aui/framemanager.cpp
4
4
// Author:      Benjamin I. Williams
5
5
// Modified by:
6
6
// Created:     2005-05-17
7
 
// RCS-ID:      $Id: framemanager.cpp 62670 2009-11-16 21:57:20Z BP $
 
7
// RCS-ID:      $Id: framemanager.cpp 66980 2011-02-20 10:26:32Z TIK $
8
8
// Copyright:   (C) Copyright 2005-2006, Kirix Corporation, All Rights Reserved
9
9
// Licence:     wxWindows Library Licence, Version 3.1
10
10
///////////////////////////////////////////////////////////////////////////////
249
249
                long style = wxDEFAULT_FRAME_STYLE,
250
250
                const wxString &name = wxT("frame"))
251
251
    {
252
 
         if (!CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
 
252
        if (!Create( parent, id, title, pos, size, style, name ))
253
253
            return;
254
254
 
255
255
        m_title = title;
1297
1297
    for (i = 0, pane_count = m_panes.GetCount(); i < pane_count; ++i)
1298
1298
    {
1299
1299
        wxAuiPaneInfo& p = m_panes.Item(i);
1300
 
        if (!p.IsToolbar())
 
1300
        if (!p.IsToolbar() && !p.IsFloating())
1301
1301
        {
1302
1302
            p.SetFlag(wxAuiPaneInfo::optionHidden,
1303
1303
                      p.HasFlag(wxAuiPaneInfo::savedHiddenState));