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
		
			
				
	
	
		
			45 lines
		
	
	
		
			1.3 KiB
		
	
	
	
		
			C++
		
	
	
	
	
	
			
		
		
	
	
			45 lines
		
	
	
		
			1.3 KiB
		
	
	
	
		
			C++
		
	
	
	
	
	
/////////////////////////////////////////////////////////////////////////////
 | 
						|
// Name:        wx/qt/statbox.h
 | 
						|
// Author:      Peter Most, Mariano Reingart
 | 
						|
// Copyright:   (c) 2010 wxWidgets dev team
 | 
						|
// Licence:     wxWindows licence
 | 
						|
/////////////////////////////////////////////////////////////////////////////
 | 
						|
 | 
						|
#ifndef _WX_QT_STATBOX_H_
 | 
						|
#define _WX_QT_STATBOX_H_
 | 
						|
 | 
						|
#include <QtWidgets/QGroupBox>
 | 
						|
 | 
						|
class WXDLLIMPEXP_CORE wxStaticBox : public wxStaticBoxBase
 | 
						|
{
 | 
						|
public:
 | 
						|
    wxStaticBox();
 | 
						|
    
 | 
						|
    wxStaticBox(wxWindow *parent, wxWindowID id,
 | 
						|
                const wxString& label,
 | 
						|
                const wxPoint& pos = wxDefaultPosition,
 | 
						|
                const wxSize& size = wxDefaultSize,
 | 
						|
                long style = 0,
 | 
						|
                const wxString& name = wxStaticBoxNameStr);
 | 
						|
 | 
						|
    bool Create(wxWindow *parent, wxWindowID id,
 | 
						|
                const wxString& label,
 | 
						|
                const wxPoint& pos = wxDefaultPosition,
 | 
						|
                const wxSize& size = wxDefaultSize,
 | 
						|
                long style = 0,
 | 
						|
                const wxString& name = wxStaticBoxNameStr);
 | 
						|
 | 
						|
    virtual void GetBordersForSizer(int *borderTop, int *borderOther) const;
 | 
						|
 | 
						|
    virtual QGroupBox *GetHandle() const;
 | 
						|
 | 
						|
protected:
 | 
						|
 | 
						|
private:
 | 
						|
    QGroupBox *m_qtGroupBox;
 | 
						|
 | 
						|
    wxDECLARE_DYNAMIC_CLASS( wxStaticBox );
 | 
						|
};
 | 
						|
 | 
						|
#endif // _WX_QT_STATBOX_H_
 |