This requires refactoring NewCloseButton() in order to extract CreateCloseButton() from it, as XRC relies on being able to use two-step creation which was previously impossible for this kind of buttons. CreateCloseButton() is rather unusual, as it has to be declared in the derived, platform-specific class, in order to be able to call its Create(), but is defined only once in common, platform-independent, code. However the only alternative seems to be to have a static function, e.g. InitCloseButton(), which wouldn't be very pretty neither. Closes https://github.com/wxWidgets/wxWidgets/pull/2118
53 lines
1.7 KiB
C++
53 lines
1.7 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/msw/bmpbuttn.h
|
|
// Purpose: wxBitmapButton class
|
|
// Author: Julian Smart
|
|
// Modified by:
|
|
// Created: 01/02/97
|
|
// Copyright: (c) Julian Smart
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_BMPBUTTN_H_
|
|
#define _WX_BMPBUTTN_H_
|
|
|
|
#include "wx/button.h"
|
|
#include "wx/bitmap.h"
|
|
#include "wx/brush.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 = wxASCII_STR(wxButtonNameStr))
|
|
{
|
|
Create(parent, id, bitmap, pos, size, style, validator, name);
|
|
}
|
|
|
|
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 = wxASCII_STR(wxButtonNameStr));
|
|
|
|
bool CreateCloseButton(wxWindow* parent,
|
|
wxWindowID winid,
|
|
const wxString& name = wxString());
|
|
protected:
|
|
wxDECLARE_EVENT_TABLE();
|
|
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxBitmapButton);
|
|
};
|
|
|
|
#endif // _WX_BMPBUTTN_H_
|