Take wxBitmapBundle in wxMenuItem::SetBitmap() in all ports
Update the remaining ports to take wxBitmapBundle rather than wxBitmap as well to make their API consistent with the tier 1 ports -- even if there is no actual support for choosing the resolution-appropriate bitmap in them yet.
This commit is contained in:
@@ -35,8 +35,8 @@ public:
|
||||
virtual void Check(bool check = true) wxOVERRIDE;
|
||||
virtual bool IsChecked() const wxOVERRIDE;
|
||||
|
||||
virtual void SetBitmap(const wxBitmap& bitmap);
|
||||
virtual const wxBitmap& GetBitmap() const { return m_bitmap; }
|
||||
virtual void SetBitmap(const wxBitmapBundle& bitmap);
|
||||
virtual wxBitmap GetBitmap() const { return GetBitmapFromBundle(m_bitmap); }
|
||||
|
||||
virtual QAction *GetHandle() const;
|
||||
|
||||
@@ -44,7 +44,7 @@ public:
|
||||
private:
|
||||
// Qt is using an action instead of a menu item.
|
||||
wxQtAction *m_qtAction;
|
||||
wxBitmap m_bitmap;
|
||||
wxBitmapBundle m_bitmap;
|
||||
|
||||
wxDECLARE_DYNAMIC_CLASS( wxMenuItem );
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user