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
		
			
				
	
	
		
			40 lines
		
	
	
		
			1.2 KiB
		
	
	
	
		
			C++
		
	
	
	
	
	
			
		
		
	
	
			40 lines
		
	
	
		
			1.2 KiB
		
	
	
	
		
			C++
		
	
	
	
	
	
| /////////////////////////////////////////////////////////////////////////////
 | |
| // Name:        wx/qt/button.h
 | |
| // Author:      Peter Most, Mariano Reingart
 | |
| // Copyright:   (c) 2010 wxWidgets dev team
 | |
| // Licence:     wxWindows licence
 | |
| /////////////////////////////////////////////////////////////////////////////
 | |
| 
 | |
| #ifndef _WX_QT_BUTTON_H_
 | |
| #define _WX_QT_BUTTON_H_
 | |
| 
 | |
| #include "wx/control.h"
 | |
| #include "wx/button.h"
 | |
| 
 | |
| class WXDLLIMPEXP_CORE wxButton : public wxButtonBase
 | |
| {
 | |
| public:
 | |
|     wxButton();
 | |
|     wxButton(wxWindow *parent, wxWindowID id,
 | |
|            const wxString& label = wxEmptyString,
 | |
|            const wxPoint& pos = wxDefaultPosition,
 | |
|            const wxSize& size = wxDefaultSize, long style = 0,
 | |
|            const wxValidator& validator = wxDefaultValidator,
 | |
|            const wxString& name = wxButtonNameStr);
 | |
| 
 | |
|     bool Create(wxWindow *parent, wxWindowID id,
 | |
|            const wxString& label = wxEmptyString,
 | |
|            const wxPoint& pos = wxDefaultPosition,
 | |
|            const wxSize& size = wxDefaultSize, long style = 0,
 | |
|            const wxValidator& validator = wxDefaultValidator,
 | |
|            const wxString& name = wxButtonNameStr);
 | |
| 
 | |
|    virtual wxWindow *SetDefault();
 | |
| 
 | |
| private:
 | |
|     wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxButton);
 | |
| };
 | |
| 
 | |
| 
 | |
| #endif // _WX_QT_BUTTON_H_
 |