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
		
			
				
	
	
		
			40 lines
		
	
	
		
			1.1 KiB
		
	
	
	
		
			C++
		
	
	
	
	
	
			
		
		
	
	
			40 lines
		
	
	
		
			1.1 KiB
		
	
	
	
		
			C++
		
	
	
	
	
	
/////////////////////////////////////////////////////////////////////////////
 | 
						|
// Name:        wx/qt/toolbar.h
 | 
						|
// Author:      Sean D'Epagnier
 | 
						|
// Copyright:   (c) Sean D'Epagnier 2014
 | 
						|
// Licence:     wxWindows licence
 | 
						|
/////////////////////////////////////////////////////////////////////////////
 | 
						|
 | 
						|
#ifndef _WX_QT_DATAFORM_H_
 | 
						|
#define _WX_QT_DATAFORM_H_
 | 
						|
 | 
						|
class WXDLLIMPEXP_CORE wxDataFormat
 | 
						|
{
 | 
						|
public:
 | 
						|
    wxDataFormat();
 | 
						|
    wxDataFormat( wxDataFormatId formatId );
 | 
						|
    wxDataFormat(const wxString &id);
 | 
						|
    wxDataFormat(const QString &id);
 | 
						|
    wxDataFormat(const wxChar *id);
 | 
						|
 | 
						|
    void SetId( const wxChar *id );
 | 
						|
    
 | 
						|
    bool operator==(wxDataFormatId format) const;
 | 
						|
    bool operator!=(wxDataFormatId format) const;
 | 
						|
    bool operator==(const wxDataFormat& format) const;
 | 
						|
    bool operator!=(const wxDataFormat& format) const;
 | 
						|
 | 
						|
    // string ids are used for custom types - this SetId() must be used for
 | 
						|
    // application-specific formats
 | 
						|
    wxString GetId() const;
 | 
						|
    void SetId( const wxString& id );
 | 
						|
 | 
						|
    // implementation
 | 
						|
    wxDataFormatId GetType() const;
 | 
						|
    void SetType( wxDataFormatId type );
 | 
						|
 | 
						|
    QString m_MimeType;
 | 
						|
};
 | 
						|
 | 
						|
#endif // _WX_QT_DATAFORM_H_
 |