Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bitmap accessor for the buttons in wxQt

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/qt/anybutton.h
View File

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

7
src/qt/anybutton.cpp
View File

@@ -58,6 +58,8 @@ void wxAnyButton::QtSetBitmap( const wxBitmap &bitmap )
QPixmap *pixmap = bitmap.GetHandle(); QPixmap *pixmap = bitmap.GetHandle();
m_qtPushButton->setIcon( QIcon( *pixmap )); m_qtPushButton->setIcon( QIcon( *pixmap ));
m_qtPushButton->setIconSize( pixmap->rect().size() ); m_qtPushButton->setIconSize( pixmap->rect().size() );
m_bitmap = bitmap;
} }
void wxAnyButton::SetLabel( const wxString &label ) void wxAnyButton::SetLabel( const wxString &label )
@@ -70,6 +72,11 @@ QWidget *wxAnyButton::GetHandle() const
return m_qtPushButton; return m_qtPushButton;
} }
wxBitmap wxAnyButton::DoGetBitmap(State state) const
{
return state == State_Normal ? m_bitmap : wxNullBitmap;
}
void wxAnyButton::DoSetBitmap(const wxBitmap& bitmap, State which) void wxAnyButton::DoSetBitmap(const wxBitmap& bitmap, State which)
{ {
switch ( which ) switch ( which )