df13791078
This merges in the latest sources from GSoC 2014 wxQt project with just a few minor corrections, mostly undoing wrong changes to common files in that branch (results of a previous bad merge?) and getting rid of whitespace-only changes. Also remove debug logging from wxGrid. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77455 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
33 lines
707 B
C++
33 lines
707 B
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/qt/dataobj2.h
|
|
// Author: Peter Most
|
|
// Copyright: (c) Peter Most
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_QT_DATAOBJ2_H_
|
|
#define _WX_QT_DATAOBJ2_H_
|
|
|
|
class WXDLLIMPEXP_CORE wxBitmapDataObject : public wxBitmapDataObjectBase
|
|
{
|
|
public:
|
|
wxBitmapDataObject();
|
|
wxBitmapDataObject(const wxBitmap& bitmap);
|
|
|
|
protected:
|
|
|
|
private:
|
|
};
|
|
|
|
|
|
|
|
class WXDLLIMPEXP_CORE wxFileDataObject : public wxFileDataObjectBase
|
|
{
|
|
public:
|
|
wxFileDataObject();
|
|
|
|
void AddFile( const wxString &filename );
|
|
};
|
|
|
|
#endif // _WX_QT_DATAOBJ2_H_
|