df13791078
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.3 KiB
C++
41 lines
1.3 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/qt/bmpbuttn.h
|
|
// Author: Peter Most
|
|
// Copyright: (c) Peter Most
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_QT_BMPBUTTN_H_
|
|
#define _WX_QT_BMPBUTTN_H_
|
|
|
|
class WXDLLIMPEXP_CORE wxBitmapButton : public wxBitmapButtonBase
|
|
{
|
|
public:
|
|
wxBitmapButton();
|
|
|
|
wxBitmapButton(wxWindow *parent,
|
|
wxWindowID id,
|
|
const wxBitmap& bitmap,
|
|
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 wxBitmap& bitmap,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& size = wxDefaultSize,
|
|
long style = 0,
|
|
const wxValidator& validator = wxDefaultValidator,
|
|
const wxString& name = wxButtonNameStr);
|
|
protected:
|
|
wxDECLARE_DYNAMIC_CLASS(wxBitmapButton);
|
|
|
|
private:
|
|
// We re-use wxButton
|
|
};
|
|
|
|
#endif // _WX_QT_BMPBUTTN_H_
|