projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
revert memory leak fix, it causes crash
[wxWidgets.git]
/
include
/
wx
/
generic
/
wizard.h
diff --git
a/include/wx/generic/wizard.h
b/include/wx/generic/wizard.h
index a353cd0418033f95cd2635e13c6ed6ac37934169..52940b2a82d058b51beba4c7271cdc23ba090e55 100644
(file)
--- a/
include/wx/generic/wizard.h
+++ b/
include/wx/generic/wizard.h
@@
-1,5
+1,5
@@
///////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
-// Name: generic/wizard.h
+// Name:
wx/
generic/wizard.h
// Purpose: declaration of generic wxWizard class
// Author: Vadim Zeitlin
// Modified by: Robert Vazan (sizers)
// Purpose: declaration of generic wxWizard class
// Author: Vadim Zeitlin
// Modified by: Robert Vazan (sizers)
@@
-9,6
+9,9
@@
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
+#ifndef _WX_GENERIC_WIZARD_H_
+#define _WX_GENERIC_WIZARD_H_
+
// ----------------------------------------------------------------------------
// wxWizard
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
// wxWizard
// ----------------------------------------------------------------------------
@@
-66,6
+69,10
@@
public:
// this is app-overridable to, for example, set help and tooltip text
virtual void DoCreateControls();
// this is app-overridable to, for example, set help and tooltip text
virtual void DoCreateControls();
+protected:
+ // for compatibility only, doesn't do anything any more
+ void FinishLayout() { }
+
private:
// was the dialog really created?
bool WasCreated() const { return m_btnPrev != NULL; }
private:
// was the dialog really created?
bool WasCreated() const { return m_btnPrev != NULL; }
@@
-82,14
+89,6
@@
private:
void AddBackNextPair(wxBoxSizer *buttonRow);
void AddButtonRow(wxBoxSizer *mainColumn);
void AddBackNextPair(wxBoxSizer *buttonRow);
void AddButtonRow(wxBoxSizer *mainColumn);
-#if wxABI_VERSION >= 20602
-protected:
-#endif
- void FinishLayout();
-
-private:
- wxSize GetManualPageSize() const;
-
// the page size requested by user
wxSize m_sizePage;
// the page size requested by user
wxSize m_sizePage;
@@
-105,14
+104,18
@@
private:
*m_btnNext; // the "Next>" or "Finish" button
wxStaticBitmap *m_statbmp; // the control for the bitmap
*m_btnNext; // the "Next>" or "Finish" button
wxStaticBitmap *m_statbmp; // the control for the bitmap
- // Whether user called SetBorder()
- bool m_calledSetBorder;
// Border around page area sizer requested using SetBorder()
int m_border;
// Whether RunWizard() was called
bool m_started;
// Border around page area sizer requested using SetBorder()
int m_border;
// Whether RunWizard() was called
bool m_started;
+ // Whether was modal (modeless has to be destroyed on finish or cancel)
+ bool m_wasModal;
+
+ // True if pages are laid out using the sizer
+ bool m_usingSizer;
+
// Page area sizer will be inserted here with padding
wxBoxSizer *m_sizerBmpAndPage;
// Page area sizer will be inserted here with padding
wxBoxSizer *m_sizerBmpAndPage;
@@
-126,3
+129,4
@@
private:
DECLARE_NO_COPY_CLASS(wxWizard)
};
DECLARE_NO_COPY_CLASS(wxWizard)
};
+#endif // _WX_GENERIC_WIZARD_H_