wxDialogBase only has one ctor, so just do initialization in ctor instead of Init()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74699 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -67,7 +67,7 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxDialogNameStr[];
|
||||
class WXDLLIMPEXP_CORE wxDialogBase : public wxTopLevelWindow
|
||||
{
|
||||
public:
|
||||
wxDialogBase() { Init(); }
|
||||
wxDialogBase();
|
||||
virtual ~wxDialogBase() { }
|
||||
|
||||
// define public wxDialog methods to be implemented by the derived classes
|
||||
@@ -241,9 +241,6 @@ protected:
|
||||
static bool sm_layoutAdaptation;
|
||||
|
||||
private:
|
||||
// common part of all ctors
|
||||
void Init();
|
||||
|
||||
// helper of GetParentForModalDialog(): returns the passed in window if it
|
||||
// can be used as our parent or NULL if it can't
|
||||
wxWindow *CheckIfCanBeUsedAsParent(wxWindow *parent) const;
|
||||
|
@@ -125,7 +125,7 @@ END_EVENT_TABLE()
|
||||
wxDialogLayoutAdapter* wxDialogBase::sm_layoutAdapter = NULL;
|
||||
bool wxDialogBase::sm_layoutAdaptation = false;
|
||||
|
||||
void wxDialogBase::Init()
|
||||
wxDialogBase::wxDialogBase()
|
||||
{
|
||||
m_returnCode = 0;
|
||||
m_affirmativeId = wxID_OK;
|
||||
|
Reference in New Issue
Block a user