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

Use wxBitmapBundle in wxWizard

Browse Source
This commit is contained in:
Alexander Koshelev
2022-02-10 16:04:28 +03:00
parent d130323a4c
commit 429b5561ff
4 changed files with 53 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
include/wx/generic/wizard.h
View File

@@ -29,7 +29,7 @@ public:
wxWizard(wxWindow *parent,
int id = wxID_ANY,
const wxString& title = wxEmptyString,
const wxBitmap& bitmap = wxNullBitmap,
const wxBitmapBundle& bitmap = wxBitmapBundle(),
const wxPoint& pos = wxDefaultPosition,
long style = wxDEFAULT_DIALOG_STYLE)
{
@@ -39,7 +39,7 @@ public:
bool Create(wxWindow *parent,
int id = wxID_ANY,
const wxString& title = wxEmptyString,
const wxBitmap& bitmap = wxNullBitmap,
const wxBitmapBundle& bitmap = wxBitmapBundle(),
const wxPoint& pos = wxDefaultPosition,
long style = wxDEFAULT_DIALOG_STYLE);
void Init();
@@ -55,8 +55,8 @@ public:
virtual void SetBorder(int border) wxOVERRIDE;
/// set/get bitmap
const wxBitmap& GetBitmap() const { return m_bitmap; }
void SetBitmap(const wxBitmap& bitmap);
wxBitmap GetBitmap() const { return m_bitmap.GetBitmapFor(this); }
void SetBitmap(const wxBitmapBundle& bitmap);
// implementation only from now on
// -------------------------------
@@ -116,6 +116,9 @@ protected:
void AddBackNextPair(wxBoxSizer *buttonRow);
void AddButtonRow(wxBoxSizer *mainColumn);
// This function can be used as event handle for wxEVT_DPI_CHANGED event.
void WXHandleDPIChanged(wxDPIChangedEvent& event);
// the page size requested by user
wxSize m_sizePage;
@@ -123,9 +126,9 @@ protected:
wxPoint m_posWizard;
// wizard state
wxWizardPage *m_page; // the current page or NULL
wxWizardPage *m_firstpage; // the page RunWizard started on or NULL
wxBitmap m_bitmap; // the default bitmap to show
wxWizardPage *m_page; // the current page or NULL
wxWizardPage *m_firstpage; // the page RunWizard started on or NULL
wxBitmapBundle m_bitmap; // the default bitmap to show
// wizard controls
wxButton *m_btnPrev, // the "<Back" button