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
		
	
	
		
			862 B
		
	
	
	
		
			C++
		
	
	
	
	
	
			
		
		
	
	
			33 lines
		
	
	
		
			862 B
		
	
	
	
		
			C++
		
	
	
	
	
	
| /////////////////////////////////////////////////////////////////////////////
 | |
| // Name:        wx/qt/fontdlg.h
 | |
| // Author:      Peter Most
 | |
| // Copyright:   (c) Peter Most
 | |
| // Licence:     wxWindows licence
 | |
| /////////////////////////////////////////////////////////////////////////////
 | |
| 
 | |
| #ifndef _WX_QT_FONTDLG_H_
 | |
| #define _WX_QT_FONTDLG_H_
 | |
| 
 | |
| #include <QtWidgets/QFontDialog>
 | |
| 
 | |
| class WXDLLIMPEXP_CORE wxFontDialog : public wxFontDialogBase
 | |
| {
 | |
| public:
 | |
|     wxFontDialog() { }
 | |
|     wxFontDialog(wxWindow *parent) { Create(parent); }
 | |
|     wxFontDialog(wxWindow *parent, const wxFontData& data) { Create(parent, data); }
 | |
|     
 | |
|     virtual QFontDialog *GetHandle() const { return static_cast<QFontDialog *>(m_qtWindow); }
 | |
| 
 | |
| protected:
 | |
|     bool DoCreate(wxWindow *parent);
 | |
|     
 | |
| private:
 | |
| 
 | |
|     wxFontData m_data;
 | |
| 
 | |
|     DECLARE_DYNAMIC_CLASS(wxFontDialog)
 | |
| };
 | |
| 
 | |
| #endif // _WX_QT_FONTDLG_H_
 |