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

1. wxWizard supports setting images for each page, sample updated to show it

Browse Source 
2. wxLogGui now uses a special dialog instead of a wxMsgBox
3. wxComboBox doesn't limit the text to its size under MSW
4. removed windows.h from dummy.cpp because I think it's unneeded


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5558 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-01-21 02:26:25 +00:00
parent cded6e3c28
commit f1df09276c
12 changed files with 387 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,7 +13,10 @@
// wxWizard
// ----------------------------------------------------------------------------
class wxWizard : public wxWizardBase
class WXDLLEXPORT wxButton;
class WXDLLEXPORT wxStaticBitmap;
class WXDLLEXPORT wxWizard : public wxWizardBase
{
public:
// ctor
@@ -52,10 +55,12 @@ private:
// wizard state
wxWizardPage *m_page; // the current page or NULL
wxBitmap m_bitmap; // the default bitmap to show
// wizard controls
wxButton *m_btnPrev, // the "<Back" button
*m_btnNext; // the "Next>" or "Finish" button
wxStaticBitmap *m_statbmp; // the control for the bitmap
DECLARE_DYNAMIC_CLASS(wxWizard)
DECLARE_EVENT_TABLE()

5
include/wx/log.h
View File

@@ -286,8 +286,9 @@ protected:
// empty everything
void Clear();
wxArrayString m_aMessages;
wxArrayLong m_aTimes;
wxArrayString m_aMessages; // the log message texts
wxArrayInt m_aSeverity; // one of wxLOG_XXX values
wxArrayLong m_aTimes; // the time of each message
bool m_bErrors, // do we have any errors?
m_bWarnings; // any warnings?
};

15
include/wx/wizard.h
View File

@@ -38,15 +38,26 @@ class WXDLLEXPORT wxWizard;
class WXDLLEXPORT wxWizardPage : public wxPanel
{
public:
// ctor: no other parameters are needed because the wizard will resize and
// ctor accepts an optional bitmap which will be used for this page instead
// of the default one for this wizard (should be of the same size). Notice
// that no other parameters are needed because the wizard will resize and
// reposition the page anyhow
wxWizardPage(wxWizard *parent);
wxWizardPage(wxWizard *parent, const wxBitmap& bitmap = wxNullBitmap);
// these functions are used by the wizard to show another page when the
// user chooses "Back" or "Next" button
virtual wxWizardPage *GetPrev() const = 0;
virtual wxWizardPage *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; }
protected:
wxBitmap m_bitmap;
private:
DECLARE_ABSTRACT_CLASS(wxWizardPage)
};