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

More patches from FM to clean up after moving contribs. Also removes

Browse Source 
use of wxUSE_RESOURCES


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45280 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2007-04-06 21:08:30 +00:00
parent 79f45cf784
commit cf63f3d3ae
19 changed files with 35 additions and 1379 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/wx/wizard.h
View File

@@ -54,12 +54,10 @@ public:
// that no other parameters are needed because the wizard will resize and
// reposition the page anyhow
wxWizardPage(wxWizard *parent,
const wxBitmap& bitmap = wxNullBitmap,
const wxChar* resource = NULL);
const wxBitmap& bitmap = wxNullBitmap);
bool Create(wxWizard *parent,
const wxBitmap& bitmap = wxNullBitmap,
const wxChar* resource = NULL);
const wxBitmap& bitmap = wxNullBitmap);
// these functions are used by the wizard to show another page when the
// user chooses "Back" or "Next" button
@@ -121,21 +119,19 @@ public:
wxWizardPageSimple(wxWizard *parent,
wxWizardPage *prev = (wxWizardPage *)NULL,
wxWizardPage *next = (wxWizardPage *)NULL,
const wxBitmap& bitmap = wxNullBitmap,
const wxChar* resource = NULL)
const wxBitmap& bitmap = wxNullBitmap)
{
Create(parent, prev, next, bitmap, resource);
Create(parent, prev, next, bitmap);
}
bool Create(wxWizard *parent = NULL, // let it be default ctor too
wxWizardPage *prev = (wxWizardPage *)NULL,
wxWizardPage *next = (wxWizardPage *)NULL,
const wxBitmap& bitmap = wxNullBitmap,
const wxChar* resource = NULL)
const wxBitmap& bitmap = wxNullBitmap)
{
m_prev = prev;
m_next = next;
return wxWizardPage::Create(parent, bitmap, resource);
return wxWizardPage::Create(parent, bitmap);
}
// the pointers may be also set later - but before starting the wizard