← Back to branch summary

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

« back to all changes in this revision

Viewing changes to include/wx/mac/carbon/dataobj2.h

  • 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:
include/wx/mac/carbon/dataobj2.h
4
4
// Author:      David Webster (adapted from Robert Roebling's gtk port
5
5
// Modified by:
6
6
// Created:     10/21/99
7
 
// RCS-ID:      $Id: dataobj2.h 41020 2006-09-05 20:47:48Z VZ $
 
7
// RCS-ID:      $Id: dataobj2.h 51164 2008-01-11 19:17:46Z SC $
8
8
// Copyright:   (c) 1998, 1999 Vadim Zeitlin, Robert Roebling
9
9
// Licence:     wxWindows licence
10
10
///////////////////////////////////////////////////////////////////////////////
35
35
    virtual size_t GetDataSize() const ;
36
36
    virtual bool GetDataHere(void *buf) const ;
37
37
    virtual bool SetData(size_t len, const void *buf);
38
 
    // Must provide overloads to avoid hiding them (and warnings about it)
39
 
    virtual size_t GetDataSize(const wxDataFormat&) const
40
 
    {
41
 
        return GetDataSize();
42
 
    }
43
 
    virtual bool GetDataHere(const wxDataFormat&, void *buf) const
44
 
    {
45
 
        return GetDataHere(buf);
46
 
    }
47
 
    virtual bool SetData(const wxDataFormat&, size_t len, const void *buf)
48
 
    {
49
 
        return SetData(len, buf);
50
 
    }
51
 
 
 
38
 
 
39
    // virtuals, we aren't breaking binary compat here
 
40
    virtual size_t GetFormatCount(Direction WXUNUSED(dir) = Get) const;
 
41
    virtual void GetAllFormats(wxDataFormat *formats,
 
42
                               wxDataObjectBase::Direction WXUNUSED(dir) = Get) const;
 
43
 
 
44
    virtual size_t GetDataSize(const wxDataFormat& format) const;
 
45
    virtual bool GetDataHere(const wxDataFormat& format, void *pBuf) const;
 
46
    virtual bool SetData(const wxDataFormat& format, size_t nLen, const void* pBuf);
52
47
protected :
53
48
    void Init() ;
54
49
    void Clear() ;