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
		
			
				
	
	
		
			46 lines
		
	
	
		
			1.5 KiB
		
	
	
	
		
			C++
		
	
	
	
	
	
			
		
		
	
	
			46 lines
		
	
	
		
			1.5 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 = wxASCII_STR(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 = wxASCII_STR(wxButtonNameStr));
 | |
| 
 | |
|     bool CreateCloseButton(wxWindow* parent,
 | |
|                            wxWindowID winid,
 | |
|                            const wxString& name = wxString());
 | |
| 
 | |
| protected:
 | |
|     wxDECLARE_DYNAMIC_CLASS(wxBitmapButton);
 | |
| 
 | |
| private:
 | |
|     // We re-use wxButton
 | |
| };
 | |
| 
 | |
| #endif // _WX_QT_BMPBUTTN_H_
 |