Merge wxQT branch into the trunk.
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
This commit is contained in:
44
include/wx/qt/clipbrd.h
Normal file
44
include/wx/qt/clipbrd.h
Normal file
@@ -0,0 +1,44 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Name: wx/qt/toolbar.h
|
||||
// Author: Sean D'Epagnier
|
||||
// Copyright: (c) Sean D'Epagnier 2014
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef _WX_QT_CLIPBRD_H_
|
||||
#define _WX_QT_CLIPBRD_H_
|
||||
|
||||
#include "wx/weakref.h"
|
||||
|
||||
class QtClipBoardSignalHandler;
|
||||
|
||||
class WXDLLIMPEXP_CORE wxClipboard : public wxClipboardBase
|
||||
{
|
||||
public:
|
||||
wxClipboard();
|
||||
~wxClipboard();
|
||||
|
||||
virtual bool Open();
|
||||
virtual void Close();
|
||||
virtual bool IsOpened() const;
|
||||
|
||||
virtual bool AddData( wxDataObject *data );
|
||||
virtual bool SetData( wxDataObject *data );
|
||||
virtual bool GetData( wxDataObject& data );
|
||||
virtual void Clear();
|
||||
virtual bool IsSupported( const wxDataFormat& format );
|
||||
virtual bool IsSupportedAsync(wxEvtHandler *sink);
|
||||
|
||||
private:
|
||||
friend class QtClipBoardSignalHandler;
|
||||
int Mode();
|
||||
|
||||
QtClipBoardSignalHandler *m_SignalHandler;
|
||||
wxEvtHandlerRef m_sink;
|
||||
|
||||
bool m_open;
|
||||
|
||||
DECLARE_DYNAMIC_CLASS(wxClipboard)
|
||||
};
|
||||
|
||||
#endif // _WX_QT_CLIPBRD_H_
|
Reference in New Issue
Block a user