← Back to branch summary

~ubuntu-branches/ubuntu/maverick/wxwidgets2.8/maverick-proposed

« back to all changes in this revision

Viewing changes to src/mac/carbon/notebmac.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Devid Filoni
  • Date: 2008-06-30 22:02:17 UTC
  • mfrom: (1.1.5 upstream)
  • Revision ID: james.westby@ubuntu.com-20080630220217-vag3tkfp91t0453d
Tags: 2.8.8.0-0ubuntu1
https://launchpad.net/bugs/244355
https://launchpad.net/bugs/242164
https://launchpad.net/bugs/211553
https://launchpad.net/bugs/236876
* New upstream version, based on the upstream tarball
  wxPython-src-2.8.8.0.tar.bz2, remove upstream debian dir (LP: #244355).
* Add debian/watch file, LP: #242164.
* Edit get-orig-source target to provide a .orig.tar.gz with the same md5 for
  each .orig.tar.gz generated.
* debian/rules: remove get-orig-source from .PHONY target.
* debian/control.in: add python-wxtools in python-wxgtk=V=U Suggests field.
* Do not apply fix_from_upstream_svn_r52465 patch, not needed.
* Regenerate octave_oct, tcl_tk_tcl patches for the new version.
* Fix spelling-error-in-description lintian warning.
* Fix depends-on-obsolete-package lintian error.
* Fix executable-not-elf-or-script lintian warnings.
* Fix script-not-executable lintian warnings.
* Fix missing-dependency-on-libc lintian error.
* Fix dbg-package-missing-depends lintian warnings.
* Fix package-contains-empty-directory lintian warnings.
* Fix manpage-has-errors-from-man lintian warning.
* Fix image-file-in-usr-lib lintian warnings:
  - add editra_pixmaps patch
  - add xrced_bitmaps patch
* Fix unused-override lintian info.
* Fix malformed-override lintian errors.
* Fix extra-license-file lintian warnings.
* Install upstream wx.pth instead of generated file links (LP: #211553).
* Add editra.png, pyshell.png (encoded using uuencode) icons, LP: #236876:
  - debian/rules: use uudecode to decode .png icons.
* Add a new pyshell.xpm icon.
* Fix doc-base-file-references-missing-file lintian error.
* Fix doc-base-unknown-section lintian warning.
* Fix ruby-script-but-no-ruby-dep lintian errors.
* Fix wish-script-but-no-wish-dep lintian errors.
* Fix missing-dep-for-interpreter errors.
* Bump Standards-Version to 3.8.0.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/mac/carbon/notebmac.cpp
4
4
// Author:      Stefan Csomor
5
5
// Modified by:
6
6
// Created:     1998-01-01
7
 
// RCS-ID:      $Id: notebmac.cpp 42015 2006-10-14 16:55:55Z SC $
 
7
// RCS-ID:      $Id: notebmac.cpp 51558 2008-02-05 09:12:12Z JS $
8
8
// Copyright:   (c) Stefan Csomor
9
9
// Licence:     wxWindows licence
10
10
///////////////////////////////////////////////////////////////////////////////
34
34
DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED)
35
35
DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING)
36
36
 
37
 
BEGIN_EVENT_TABLE(wxNotebook, wxControl)
 
37
BEGIN_EVENT_TABLE(wxNotebook, wxBookCtrlBase)
38
38
    EVT_NOTEBOOK_PAGE_CHANGED(wxID_ANY, wxNotebook::OnSelChange)
39
39
 
40
40
    EVT_SIZE(wxNotebook::OnSize)
42
42
    EVT_NAVIGATION_KEY(wxNotebook::OnNavigationKey)
43
43
END_EVENT_TABLE()
44
44
 
45
 
IMPLEMENT_DYNAMIC_CLASS(wxNotebook, wxControl)
 
45
IMPLEMENT_DYNAMIC_CLASS(wxNotebook, wxBookCtrlBase)
46
46
IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxCommandEvent)
47
47
 
48
48
 
190
190
    wxCHECK_MSG( IS_VALID_PAGE(nPage), false, wxT("SetPageText: invalid notebook page") );
191
191
 
192
192
    wxNotebookPage *page = m_pages[nPage];
193
 
    page->SetLabel(strText);
 
193
    page->SetLabel(wxStripMenuCodes(strText));
194
194
    MacSetupTabs();
195
195
 
196
196
    return true;
284
284
    // don't show pages by default (we'll need to adjust their size first)
285
285
    pPage->Show( false ) ;
286
286
 
287
 
    pPage->SetLabel( strText );
 
287
    pPage->SetLabel( wxStripMenuCodes(strText) );
288
288
 
289
289
    m_images.Insert( imageId, nPage );
290
290