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
		
			
				
	
	
		
			43 lines
		
	
	
		
			1.3 KiB
		
	
	
	
		
			C++
		
	
	
	
	
	
			
		
		
	
	
			43 lines
		
	
	
		
			1.3 KiB
		
	
	
	
		
			C++
		
	
	
	
	
	
/////////////////////////////////////////////////////////////////////////////
 | 
						|
// Name:        wx/qt/stattext.h
 | 
						|
// Author:      Peter Most, Mariano Reingart
 | 
						|
// Copyright:   (c) 2010 wxWidgets dev team
 | 
						|
// Licence:     wxWindows licence
 | 
						|
/////////////////////////////////////////////////////////////////////////////
 | 
						|
 | 
						|
#ifndef _WX_QT_STATTEXT_H_
 | 
						|
#define _WX_QT_STATTEXT_H_
 | 
						|
 | 
						|
#include <QtWidgets/QLabel>
 | 
						|
 | 
						|
class WXDLLIMPEXP_CORE wxStaticText : public wxStaticTextBase
 | 
						|
{
 | 
						|
public:
 | 
						|
    wxStaticText();
 | 
						|
    wxStaticText(wxWindow *parent,
 | 
						|
                 wxWindowID id,
 | 
						|
                 const wxString &label,
 | 
						|
                 const wxPoint &pos = wxDefaultPosition,
 | 
						|
                 const wxSize &size = wxDefaultSize,
 | 
						|
                 long style = 0,
 | 
						|
                 const wxString &name = wxStaticTextNameStr );
 | 
						|
 | 
						|
    bool Create(wxWindow *parent,
 | 
						|
                wxWindowID id,
 | 
						|
                const wxString &label,
 | 
						|
                const wxPoint &pos = wxDefaultPosition,
 | 
						|
                const wxSize &size = wxDefaultSize,
 | 
						|
                long style = 0,
 | 
						|
                const wxString &name = wxStaticTextNameStr );
 | 
						|
 | 
						|
    void SetLabel(const wxString& label);
 | 
						|
 | 
						|
    QLabel *GetHandle() const;
 | 
						|
private:
 | 
						|
    QLabel *m_qtLabel;
 | 
						|
 | 
						|
    wxDECLARE_DYNAMIC_CLASS( wxStaticText );
 | 
						|
};
 | 
						|
 | 
						|
#endif // _WX_QT_STATTEXT_H_
 |