Commit e7bb9b2a authored by Rom Walton's avatar Rom Walton

- MGR: Remove bitmap that is part of the Wizard.

    
    clientgui/
        AccountInfoPage.cpp
        AccountManagerInfoPage.cpp
        AccountManagerProcessingPage.cpp
        AccountManagerPropertiesPage.cpp
        AlreadyExistsPage.cpp
        BOINCBaseWizard.cpp, .h
        CompletionErrorPage.cpp
        CompletionPage.cpp
        NoInternetConnectionPage.cpp
        NotDetectedPage.cpp
        NotFoundPage.cpp
        ProjectInfoPage.cpp
        ProjectProcessingPage.cpp
        ProjectPropertiesPage.cpp
        ProxyInfoPage.cpp
        ProxyPage.cpp
        TermsOfUsePage.cpp
        UnavailablePage.cpp
        WelcomePage.cpp
        WizardAttachProject.cpp
        wizardex.cpp, .h
    win_build/
        boincmgr.vcproj

svn path=/trunk/boinc/; revision=19588
parent 6c16687b
......@@ -9249,3 +9249,31 @@ Bernd 16 Nov 2009
lib/
Makefile.mingw
Rom 17 Nov 2009
- MGR: Remove bitmap that is part of the Wizard.
clientgui/
AccountInfoPage.cpp
AccountManagerInfoPage.cpp
AccountManagerProcessingPage.cpp
AccountManagerPropertiesPage.cpp
AlreadyExistsPage.cpp
BOINCBaseWizard.cpp, .h
CompletionErrorPage.cpp
CompletionPage.cpp
NoInternetConnectionPage.cpp
NotDetectedPage.cpp
NotFoundPage.cpp
ProjectInfoPage.cpp
ProjectProcessingPage.cpp
ProjectPropertiesPage.cpp
ProxyInfoPage.cpp
ProxyPage.cpp
TermsOfUsePage.cpp
UnavailablePage.cpp
WelcomePage.cpp
WizardAttachProject.cpp
wizardex.cpp, .h
win_build/
boincmgr.vcproj
......@@ -105,8 +105,7 @@ bool CAccountInfoPage::Create( CBOINCBaseWizard* parent )
////@end CAccountInfoPage member initialisation
////@begin CAccountInfoPage creation
wxBitmap wizardBitmap(wxNullBitmap);
wxWizardPageEx::Create( parent, ID_ACCOUNTINFOPAGE, wizardBitmap );
wxWizardPageEx::Create( parent, ID_ACCOUNTINFOPAGE );
CreateControls();
GetSizer()->Fit(this);
......
......@@ -93,8 +93,7 @@ bool CAccountManagerInfoPage::Create( CBOINCBaseWizard* parent )
m_bAccountManagerListPopulated = false;
////@begin CAccountManagerInfoPage creation
wxBitmap wizardBitmap(wxNullBitmap);
wxWizardPageEx::Create( parent, ID_ACCOUNTMANAGERINFOPAGE, wizardBitmap );
wxWizardPageEx::Create( parent, ID_ACCOUNTMANAGERINFOPAGE );
CreateControls();
GetSizer()->Fit(this);
......
......@@ -117,8 +117,7 @@ bool CAccountManagerProcessingPage::Create( CBOINCBaseWizard* parent )
m_iCurrentState = ATTACHACCTMGR_INIT;
////@begin CAccountManagerProcessingPage creation
wxBitmap wizardBitmap(wxNullBitmap);
wxWizardPageEx::Create( parent, ID_ACCOUNTMANAGERPROCESSINGPAGE, wizardBitmap );
wxWizardPageEx::Create( parent, ID_ACCOUNTMANAGERPROCESSINGPAGE );
CreateControls();
GetSizer()->Fit(this);
......
......@@ -124,8 +124,7 @@ bool CAccountManagerPropertiesPage::Create( CBOINCBaseWizard* parent )
m_iCurrentState = ACCTMGRPROP_INIT;
////@begin CAccountManagerPropertiesPage creation
wxBitmap wizardBitmap(wxNullBitmap);
wxWizardPageEx::Create( parent, ID_ACCOUNTMANAGERPROPERTIESPAGE, wizardBitmap );
wxWizardPageEx::Create( parent, ID_ACCOUNTMANAGERPROPERTIESPAGE );
CreateControls();
GetSizer()->Fit(this);
......
......@@ -81,8 +81,7 @@ bool CErrAlreadyExistsPage::Create( CBOINCBaseWizard* parent )
////@end CErrAlreadyExistsPage member initialisation
////@begin CErrAlreadyExistsPage creation
wxBitmap wizardBitmap(wxNullBitmap);
wxWizardPageEx::Create( parent, ID_ERRALREADYEXISTSPAGE, wizardBitmap );
wxWizardPageEx::Create( parent, ID_ERRALREADYEXISTSPAGE );
CreateControls();
GetSizer()->Fit(this);
......
......@@ -54,8 +54,8 @@ CBOINCBaseWizard::CBOINCBaseWizard() :
close_when_completed = false;
}
CBOINCBaseWizard::CBOINCBaseWizard(wxWindow *parent, int id, const wxString& title, const wxBitmap& bitmap, const wxPoint& pos, long style) :
wxWizardEx(parent, id, title, bitmap, pos, style)
CBOINCBaseWizard::CBOINCBaseWizard(wxWindow *parent, int id, const wxString& title, const wxPoint& pos, long style) :
wxWizardEx(parent, id, title, pos, style)
{
IsAttachToProjectWizard = false;
IsAccountManagerWizard = false;
......
......@@ -36,7 +36,6 @@ public:
CBOINCBaseWizard(wxWindow *parent,
int id = wxID_ANY,
const wxString& title = wxEmptyString,
const wxBitmap& bitmap = wxNullBitmap,
const wxPoint& pos = wxDefaultPosition,
long style = wxDEFAULT_DIALOG_STYLE);
......
......@@ -84,8 +84,7 @@ bool CCompletionErrorPage::Create( CBOINCBaseWizard* parent )
////@end CCompletionErrorPage member initialisation
////@begin CCompletionErrorPage creation
wxBitmap wizardBitmap(wxNullBitmap);
wxWizardPageEx::Create( parent, ID_COMPLETIONERRORPAGE, wizardBitmap );
wxWizardPageEx::Create( parent, ID_COMPLETIONERRORPAGE );
CreateControls();
GetSizer()->Fit(this);
......
......@@ -85,8 +85,7 @@ bool CCompletionPage::Create( CBOINCBaseWizard* parent )
////@end CCompletionPage member initialisation
////@begin CCompletionPage creation
wxBitmap wizardBitmap(wxNullBitmap);
wxWizardPageEx::Create( parent, ID_COMPLETIONPAGE, wizardBitmap );
wxWizardPageEx::Create( parent, ID_COMPLETIONPAGE );
CreateControls();
GetSizer()->Fit(this);
......
......@@ -81,8 +81,7 @@ bool CErrNoInternetConnectionPage::Create( CBOINCBaseWizard* parent )
////@end CErrNoInternetConnectionPage member initialisation
////@begin CErrNoInternetConnectionPage creation
wxBitmap wizardBitmap(wxNullBitmap);
wxWizardPageEx::Create( parent, ID_ERRNOINTERNETCONNECTIONPAGE, wizardBitmap );
wxWizardPageEx::Create( parent, ID_ERRNOINTERNETCONNECTIONPAGE );
CreateControls();
GetSizer()->Fit(this);
......
......@@ -81,8 +81,7 @@ bool CErrNotDetectedPage::Create( CBOINCBaseWizard* parent )
////@end CErrNotDetectedPage member initialisation
////@begin CErrNotDetectedPage creation
wxBitmap wizardBitmap(wxNullBitmap);
wxWizardPageEx::Create( parent, ID_ERRNOTDETECTEDPAGE, wizardBitmap );
wxWizardPageEx::Create( parent, ID_ERRNOTDETECTEDPAGE );
CreateControls();
GetSizer()->Fit(this);
......
......@@ -81,8 +81,7 @@ bool CErrNotFoundPage::Create( CBOINCBaseWizard* parent )
////@end CErrNotFoundPage member initialisation
////@begin CErrNotFoundPage creation
wxBitmap wizardBitmap(wxNullBitmap);
wxWizardPageEx::Create( parent, ID_ERRNOTFOUNDPAGE, wizardBitmap );
wxWizardPageEx::Create( parent, ID_ERRNOTFOUNDPAGE );
CreateControls();
GetSizer()->Fit(this);
......
......@@ -97,8 +97,7 @@ bool CProjectInfoPage::Create( CBOINCBaseWizard* parent )
m_bProjectListPopulated = false;
////@begin CProjectInfoPage creation
wxBitmap wizardBitmap(wxNullBitmap);
wxWizardPageEx::Create( parent, ID_PROJECTINFOPAGE, wizardBitmap );
wxWizardPageEx::Create( parent, ID_PROJECTINFOPAGE );
CreateControls();
......
......@@ -116,8 +116,7 @@ bool CProjectProcessingPage::Create( CBOINCBaseWizard* parent )
m_iCurrentState = ATTACHPROJECT_INIT;
////@begin CProjectProcessingPage creation
wxBitmap wizardBitmap(wxNullBitmap);
wxWizardPageEx::Create( parent, ID_PROJECTPROCESSINGPAGE, wizardBitmap );
wxWizardPageEx::Create( parent, ID_PROJECTPROCESSINGPAGE );
CreateControls();
GetSizer()->Fit(this);
......
......@@ -120,8 +120,7 @@ bool CProjectPropertiesPage::Create( CBOINCBaseWizard* parent )
m_iCurrentState = PROJPROP_INIT;
////@begin CProjectPropertiesPage creation
wxBitmap wizardBitmap(wxNullBitmap);
wxWizardPageEx::Create( parent, ID_PROJECTPROPERTIESPAGE, wizardBitmap );
wxWizardPageEx::Create( parent, ID_PROJECTPROPERTIESPAGE );
CreateControls();
GetSizer()->Fit(this);
......
......@@ -82,8 +82,7 @@ bool CErrProxyInfoPage::Create( CBOINCBaseWizard* parent )
////@end CErrProxyInfoPage member initialisation
////@begin CErrProxyInfoPage creation
wxBitmap wizardBitmap(wxNullBitmap);
wxWizardPageEx::Create( parent, ID_ERRPROXYINFOPAGE, wizardBitmap );
wxWizardPageEx::Create( parent, ID_ERRPROXYINFOPAGE );
CreateControls();
GetSizer()->Fit(this);
......
......@@ -102,8 +102,7 @@ bool CErrProxyPage::Create( CBOINCBaseWizard* parent )
////@end CErrProxyPage member initialisation
////@begin CErrProxyPage creation
wxBitmap wizardBitmap(wxNullBitmap);
wxWizardPageEx::Create( parent, ID_ERRPROXYPAGE, wizardBitmap );
wxWizardPageEx::Create( parent, ID_ERRPROXYPAGE );
CreateControls();
GetSizer()->Fit(this);
......
......@@ -88,8 +88,7 @@ bool CTermsOfUsePage::Create( CBOINCBaseWizard* parent )
////@end CTermsOfUsePage member initialisation
////@begin CTermsOfUsePage creation
wxBitmap wizardBitmap(wxNullBitmap);
wxWizardPageEx::Create( parent, ID_TERMSOFUSEPAGE, wizardBitmap );
wxWizardPageEx::Create( parent, ID_TERMSOFUSEPAGE );
CreateControls();
GetSizer()->Fit(this);
......
......@@ -81,8 +81,7 @@ bool CErrUnavailablePage::Create( CBOINCBaseWizard* parent )
////@end CErrUnavailablePage member initialisation
////@begin CErrUnavailablePage creation
wxBitmap wizardBitmap(wxNullBitmap);
wxWizardPageEx::Create( parent, ID_ERRUNAVAILABLEPAGE, wizardBitmap );
wxWizardPageEx::Create( parent, ID_ERRUNAVAILABLEPAGE );
CreateControls();
GetSizer()->Fit(this);
......
......@@ -91,8 +91,7 @@ bool CWelcomePage::Create( CBOINCBaseWizard* parent )
////@end CWelcomePage member initialisation
////@begin CWelcomePage creation
wxBitmap wizardBitmap(wxNullBitmap);
wxWizardPageEx::Create( parent, ID_WELCOMEPAGE, wizardBitmap );
wxWizardPageEx::Create( parent, ID_WELCOMEPAGE );
CreateControls();
GetSizer()->Fit(this);
......
......@@ -159,10 +159,8 @@ bool CWizardAttachProject::Create( wxWindow* parent, wxWindowID id, const wxPoin
strTitle = pSkinAdvanced->GetApplicationName();
}
wxBitmap wizardBitmap = wxBitmap(*(pSkinWizardATP->GetWizardBitmap()));
////@begin CWizardAttachProject creation
CBOINCBaseWizard::Create( parent, id, strTitle, wizardBitmap, pos );
CBOINCBaseWizard::Create( parent, id, strTitle, pos );
CreateControls();
////@end CWizardAttachProject creation
......
......@@ -176,22 +176,19 @@ IMPLEMENT_ABSTRACT_CLASS(wxWizardPageEx, wxPanel)
void wxWizardPageEx::Init()
{
m_bitmap = wxNullBitmap;
}
wxWizardPageEx::wxWizardPageEx(
wxWizardEx *parent,
int id,
const wxBitmap& bitmap,
const wxChar *resource)
{
Create(parent, id, bitmap, resource);
Create(parent, id, resource);
}
bool wxWizardPageEx::Create(
wxWizardEx *parent,
int id,
const wxBitmap& bitmap,
const wxChar *resource)
{
if ( !wxPanel::Create(parent, id) )
......@@ -209,8 +206,6 @@ bool wxWizardPageEx::Create(
#endif // wxUSE_RESOURCES
}
m_bitmap = bitmap;
// initially the page is hidden, it's shown only when it becomes current
Hide();
......@@ -264,14 +259,12 @@ void wxWizardEx::Init()
bool wxWizardEx::Create(wxWindow *parent,
int id,
const wxString& title,
const wxBitmap& bitmap,
const wxPoint& pos,
long style)
{
bool result = wxDialog::Create(parent,id,title,pos,wxDefaultSize,style);
m_posWizard = pos;
m_bitmap = bitmap ;
DoCreateControls();
......@@ -291,24 +284,6 @@ void wxWizardEx::AddBitmapRow(wxBoxSizer *mainColumn)
wxEXPAND // No border, (mostly useless) horizontal stretching
);
#if wxUSE_STATBMP
if ( m_bitmap.Ok() )
{
m_statbmp = new wxStaticBitmap(this, wxID_ANY, m_bitmap);
m_sizerBmpAndPage->Add(
m_statbmp,
0, // No horizontal stretching
wxALL, // Border all around, top alignment
5 // Border width
);
m_sizerBmpAndPage->Add(
5,0,
0, // No horizontal stretching
wxEXPAND // No border, (mostly useless) vertical stretching
);
}
#endif
// Added to m_sizerBmpAndPage later
m_sizerPage = new wxWizardExSizer(this);
}
......@@ -526,8 +501,6 @@ bool wxWizardEx::ShowPage(wxWizardPageEx *page, bool goingForward)
btnLabelWasNext = HasNextPage(m_page);
bmpPrev = m_page->GetBitmap();
if ( !m_usingSizer )
m_sizerBmpAndPage->Detach(m_page);
}
......@@ -571,30 +544,6 @@ bool wxWizardEx::ShowPage(wxWizardPageEx *page, bool goingForward)
m_sizerBmpAndPage->SetItemMinSize(m_page, GetPageSize());
}
#if wxUSE_STATBMP
// update the bitmap if:it changed
if ( m_statbmp )
{
wxBitmap bmp = m_page->GetBitmap();
if ( !bmp.Ok() )
bmp = m_bitmap;
if ( !bmpPrev.Ok() )
bmpPrev = m_bitmap;
#if wxCHECK_VERSION(2,8,0)
if ( !bmp.IsSameAs(bmpPrev) )
m_statbmp->SetBitmap(bmp);
#else
if ( !(bmp == bmpPrev) )
m_statbmp->SetBitmap(bmp);
#endif
}
#endif // wxUSE_STATBMP
// and update the buttons state
m_btnPrev->Enable(HasPrevPage(m_page));
......@@ -674,12 +623,6 @@ wxSize wxWizardEx::GetPageSize() const
// make the page at least as big as specified by user
pageSize.IncTo(m_sizePage);
if ( m_statbmp )
{
// make the page at least as tall as the bitmap
pageSize.IncTo(wxSize(0, m_bitmap.GetHeight()));
}
if ( m_usingSizer )
{
// make it big enough to contain all pages added to the sizer
......
......@@ -46,14 +46,12 @@ public:
wxWizardPageEx(
wxWizardEx *parent,
int id = wxID_ANY,
const wxBitmap& bitmap = wxNullBitmap,
const wxChar* resource = NULL
);
virtual bool Create(
wxWizardEx *parent,
int id = wxID_ANY,
const wxBitmap& bitmap = wxNullBitmap,
const wxChar* resource = NULL
);
......@@ -62,12 +60,6 @@ public:
virtual wxWizardPageEx *GetPrev() const = 0;
virtual wxWizardPageEx *GetNext() const = 0;
// default GetBitmap() will just return m_bitmap which is ok in 99% of
// cases - override this method if you want to create the bitmap to be used
// dynamically or to do something even more fancy. It's ok to return
// wxNullBitmap from here - the default one will be used then.
virtual wxBitmap GetBitmap() const { return m_bitmap; }
#if wxUSE_VALIDATOR
/// Override the base functions to allow a validator to be assigned to this page.
bool TransferDataToWindow()
......@@ -91,8 +83,6 @@ protected:
// common part of ctors:
void Init();
wxBitmap m_bitmap;
private:
DECLARE_DYNAMIC_CLASS_NO_COPY(wxWizardPageEx)
};
......@@ -178,18 +168,16 @@ public:
wxWizardEx(wxWindow *parent,
int id = wxID_ANY,
const wxString& title = wxEmptyString,
const wxBitmap& bitmap = wxNullBitmap,
const wxPoint& pos = wxDefaultPosition,
long style = wxDEFAULT_DIALOG_STYLE)
{
Init();
Create(parent, id, title, bitmap, pos, style);
Create(parent, id, title, pos, style);
}
bool Create(wxWindow *parent,
int id = wxID_ANY,
const wxString& title = wxEmptyString,
const wxBitmap& bitmap = wxNullBitmap,
const wxPoint& pos = wxDefaultPosition,
long style = wxDEFAULT_DIALOG_STYLE);
void Init();
......@@ -242,7 +230,6 @@ private:
// wizard state
wxWizardPageEx *m_page; // the current page or NULL
wxBitmap m_bitmap; // the default bitmap to show
// wizard controls
protected:
......
......@@ -1396,6 +1396,10 @@
RelativePath="..\lib\url.cpp"
>
</File>
<File
RelativePath="..\lib\url.h"
>
</File>
<File
RelativePath="..\lib\util.cpp"
>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment