Fix bitmap accessor for the buttons in wxQt

Return the bitmap previously set with SetBitmap().

This fixes unit tests using GetBitmap().

Closes https://github.com/wxWidgets/wxWidgets/pull/1035
This commit is contained in:
Liam Treacy
2018-11-30 11:24:26 +00:00
committed by Vadim Zeitlin
parent 29f771ab82
commit 5e089badc0
2 changed files with 10 additions and 1 deletions

View File

@@ -26,11 +26,12 @@ public:
// --------------
virtual void SetLabel( const wxString &label );
virtual void DoSetBitmap(const wxBitmap& bitmap, State which);
virtual QWidget *GetHandle() const;
protected:
virtual wxBitmap DoGetBitmap(State state) const wxOVERRIDE;
virtual void DoSetBitmap(const wxBitmap& bitmap, State which) wxOVERRIDE;
QPushButton *m_qtPushButton;
@@ -39,6 +40,7 @@ protected:
private:
typedef wxAnyButtonBase base_type;
wxBitmap m_bitmap;
wxDECLARE_NO_COPY_CLASS(wxAnyButton);
};