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
		
			
				
	
	
		
			41 lines
		
	
	
		
			1.2 KiB
		
	
	
	
		
			C++
		
	
	
	
	
	
			
		
		
	
	
			41 lines
		
	
	
		
			1.2 KiB
		
	
	
	
		
			C++
		
	
	
	
	
	
| /////////////////////////////////////////////////////////////////////////////
 | |
| // Name:        wx/qt/statline.h
 | |
| // Author:      Peter Most
 | |
| // Copyright:   (c) Peter Most
 | |
| // Licence:     wxWindows licence
 | |
| /////////////////////////////////////////////////////////////////////////////
 | |
| 
 | |
| #ifndef _WX_QT_STATLINE_H_
 | |
| #define _WX_QT_STATLINE_H_
 | |
| 
 | |
| #include <QtWidgets/QFrame>
 | |
| 
 | |
| class WXDLLIMPEXP_CORE wxStaticLine : public wxStaticLineBase
 | |
| {
 | |
| public:
 | |
|     wxStaticLine();
 | |
| 
 | |
|     wxStaticLine( wxWindow *parent,
 | |
|                   wxWindowID id = wxID_ANY,
 | |
|                   const wxPoint& pos = wxDefaultPosition,
 | |
|                   const wxSize& size = wxDefaultSize,
 | |
|                   long style = wxLI_HORIZONTAL,
 | |
|                   const wxString &name = wxStaticLineNameStr );
 | |
| 
 | |
|     bool Create( wxWindow *parent,
 | |
|                  wxWindowID id = wxID_ANY,
 | |
|                  const wxPoint& pos = wxDefaultPosition,
 | |
|                  const wxSize& size = wxDefaultSize,
 | |
|                  long style = wxLI_HORIZONTAL,
 | |
|                  const wxString &name = wxStaticLineNameStr );
 | |
| 
 | |
|     virtual QFrame *GetHandle() const;
 | |
| 
 | |
| private:
 | |
|     QFrame *m_qtFrame;
 | |
| 
 | |
|     wxDECLARE_DYNAMIC_CLASS( wxStaticLine );
 | |
| };
 | |
| 
 | |
| #endif // _WX_QT_STATLINE_H_
 |