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

« back to all changes in this revision

Viewing changes to src/html/htmltag.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
* 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:
2
2
// Name:        src/html/htmltag.cpp
3
3
// Purpose:     wxHtmlTag class (represents single tag)
4
4
// Author:      Vaclav Slavik
5
 
// RCS-ID:      $Id: htmltag.cpp 40777 2006-08-23 19:07:15Z VS $
 
5
// RCS-ID:      $Id: htmltag.cpp 53433 2008-05-03 00:40:29Z VZ $
6
6
// Copyright:   (c) 1999 Vaclav Slavik
7
7
// Licence:     wxWindows licence
8
8
/////////////////////////////////////////////////////////////////////////////
452
452
 
453
453
bool wxHtmlTag::GetParamAsInt(const wxString& par, int *clr) const
454
454
{
455
 
    if (!HasParam(par)) return false;
 
455
    if ( !HasParam(par) )
 
456
        return false;
 
457
 
456
458
    long i;
457
 
    bool succ = GetParam(par).ToLong(&i);
 
459
    if ( !GetParam(par).ToLong(&i) )
 
460
        return false;
 
461
 
458
462
    *clr = (int)i;
459
 
    return succ;
 
463
    return true;
460
464
}
461
465
 
462
466
wxString wxHtmlTag::GetAllParams() const