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
		
			
				
	
	
		
			48 lines
		
	
	
		
			1.2 KiB
		
	
	
	
		
			C++
		
	
	
	
	
	
			
		
		
	
	
			48 lines
		
	
	
		
			1.2 KiB
		
	
	
	
		
			C++
		
	
	
	
	
	
| /////////////////////////////////////////////////////////////////////////////
 | |
| // Name:        wx/qt/anybutton.h
 | |
| // Purpose:     wxQT wxAnyButton class declaration
 | |
| // Author:      Mariano Reingart
 | |
| // Copyright:   (c) 2014 wxWidgets dev team
 | |
| // Licence:     wxWindows licence
 | |
| /////////////////////////////////////////////////////////////////////////////
 | |
| 
 | |
| #ifndef _WX_QT_ANYBUTTON_H_
 | |
| #define _WX_QT_ANYBUTTON_H_
 | |
| 
 | |
| #include <QtWidgets/QPushButton>
 | |
| 
 | |
| //-----------------------------------------------------------------------------
 | |
| // wxAnyButton
 | |
| //-----------------------------------------------------------------------------
 | |
| 
 | |
| class WXDLLIMPEXP_CORE wxAnyButton : public wxAnyButtonBase
 | |
| {
 | |
| public:
 | |
|     wxAnyButton()
 | |
|     {
 | |
|     }
 | |
| 
 | |
|     // implementation
 | |
|     // --------------
 | |
| 
 | |
|     virtual void SetLabel( const wxString &label );
 | |
|     virtual void DoSetBitmap(const wxBitmap& bitmap, State which);
 | |
| 
 | |
|     virtual QPushButton *GetHandle() const;
 | |
| 
 | |
| protected:
 | |
| 
 | |
|     QPushButton *m_qtPushButton;
 | |
| 
 | |
|     void QtCreate(wxWindow *parent);
 | |
|     void QtSetBitmap( const wxBitmap &bitmap );
 | |
| 
 | |
| private:
 | |
|     typedef wxAnyButtonBase base_type;
 | |
| 
 | |
|     wxDECLARE_NO_COPY_CLASS(wxAnyButton);
 | |
| };
 | |
| 
 | |
| 
 | |
| #endif // _WX_QT_ANYBUTTON_H_
 |