712c2d4004
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
51 lines
1.6 KiB
C++
51 lines
1.6 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/osx/bmpbuttn.h
|
|
// Purpose: wxBitmapButton class
|
|
// Author: Stefan Csomor
|
|
// Modified by:
|
|
// Created: 1998-01-01
|
|
// Copyright: (c) Stefan Csomor
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_OSX_BMPBUTTN_H_
|
|
#define _WX_OSX_BMPBUTTN_H_
|
|
|
|
#include "wx/button.h"
|
|
|
|
#define wxDEFAULT_BUTTON_MARGIN 4
|
|
|
|
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:
|
|
|
|
virtual wxSize DoGetBestSize() const wxOVERRIDE;
|
|
|
|
wxDECLARE_DYNAMIC_CLASS(wxBitmapButton);
|
|
};
|
|
|
|
#endif // _WX_OSX_BMPBUTTN_H_
|