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
		
			
				
	
	
		
			35 lines
		
	
	
		
			959 B
		
	
	
	
		
			C++
		
	
	
	
	
	
			
		
		
	
	
			35 lines
		
	
	
		
			959 B
		
	
	
	
		
			C++
		
	
	
	
	
	
/////////////////////////////////////////////////////////////////////////////
 | 
						|
// Name:        wx/qt/taskbar.h
 | 
						|
// Author:      Peter Most
 | 
						|
// Copyright:   (c) Peter Most
 | 
						|
// Licence:     wxWindows licence
 | 
						|
/////////////////////////////////////////////////////////////////////////////
 | 
						|
 | 
						|
#ifndef _WX_QT_TASKBAR_H_
 | 
						|
#define _WX_QT_TASKBAR_H_
 | 
						|
 | 
						|
#include <QtWidgets/QSystemTrayIcon>
 | 
						|
 | 
						|
class WXDLLIMPEXP_CORE wxTaskBarIcon : public wxTaskBarIconBase
 | 
						|
{
 | 
						|
public:
 | 
						|
    wxTaskBarIcon(wxTaskBarIconType iconType = wxTBI_DEFAULT_TYPE);
 | 
						|
 | 
						|
    // Accessors
 | 
						|
    bool IsOk() const { return false; }
 | 
						|
    bool IsIconInstalled() const { return false; }
 | 
						|
 | 
						|
    // Operations
 | 
						|
    virtual bool SetIcon(const wxIcon& icon,
 | 
						|
                         const wxString& tooltip = wxEmptyString);
 | 
						|
    virtual bool RemoveIcon();
 | 
						|
    virtual bool PopupMenu(wxMenu *menu);
 | 
						|
 | 
						|
private:
 | 
						|
    QSystemTrayIcon m_qtSystemTrayIcon;
 | 
						|
 | 
						|
    DECLARE_DYNAMIC_CLASS_NO_COPY(wxTaskBarIcon)
 | 
						|
};
 | 
						|
 | 
						|
#endif // _WX_QT_TASKBAR_H_
 |