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

wxDialogBase only has one ctor, so just do initialization in ctor instead of Init()

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74699 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2013-08-24 05:04:11 +00:00
parent 3780d6e577
commit 092162bc12
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/dialog.h
View File

@@ -67,7 +67,7 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxDialogNameStr[];
class WXDLLIMPEXP_CORE wxDialogBase : public wxTopLevelWindow class WXDLLIMPEXP_CORE wxDialogBase : public wxTopLevelWindow
{ {
public: public:
wxDialogBase() { Init(); } wxDialogBase();
virtual ~wxDialogBase() { } virtual ~wxDialogBase() { }
// define public wxDialog methods to be implemented by the derived classes // define public wxDialog methods to be implemented by the derived classes
@@ -241,9 +241,6 @@ protected:
static bool sm_layoutAdaptation; static bool sm_layoutAdaptation;
private: private:
// common part of all ctors
void Init();
// helper of GetParentForModalDialog(): returns the passed in window if it // helper of GetParentForModalDialog(): returns the passed in window if it
// can be used as our parent or NULL if it can't // can be used as our parent or NULL if it can't
wxWindow *CheckIfCanBeUsedAsParent(wxWindow *parent) const; wxWindow *CheckIfCanBeUsedAsParent(wxWindow *parent) const;

2
src/common/dlgcmn.cpp
View File

@@ -125,7 +125,7 @@ END_EVENT_TABLE()
wxDialogLayoutAdapter* wxDialogBase::sm_layoutAdapter = NULL; wxDialogLayoutAdapter* wxDialogBase::sm_layoutAdapter = NULL;
bool wxDialogBase::sm_layoutAdaptation = false; bool wxDialogBase::sm_layoutAdaptation = false;
void wxDialogBase::Init() wxDialogBase::wxDialogBase()
{ {
m_returnCode = 0; m_returnCode = 0;
m_affirmativeId = wxID_OK; m_affirmativeId = wxID_OK;