GUI2/Modal Dialog, Modeless Dialog: made window_ a protected class member
This will allow direct use of the window pointer without binding in hundreds of different callbacks just because we want to use it for, say, find_widget. This is just the base change. I still might change my mind as to this method, and I have yet to undertake any refactoring around this. modal_dialog::get_window and modeless_dialog::get_window remain.
This commit is contained in:
parent
61e9acec7c
commit
7eff742fba
2 changed files with 4 additions and 2 deletions
|
@ -325,10 +325,11 @@ protected:
|
|||
return register_label(id, mandatory, filename);
|
||||
}
|
||||
|
||||
private:
|
||||
protected:
|
||||
/** The window object build for this dialog. */
|
||||
std::unique_ptr<window> window_;
|
||||
|
||||
private:
|
||||
/** Returns the window exit status, 0 means not shown. */
|
||||
int retval_;
|
||||
|
||||
|
|
|
@ -84,10 +84,11 @@ public:
|
|||
return window_.get();
|
||||
}
|
||||
|
||||
private:
|
||||
protected:
|
||||
/** The window, used in show. */
|
||||
std::unique_ptr<window> window_;
|
||||
|
||||
private:
|
||||
/** The id of the window to build. */
|
||||
virtual const std::string& window_id() const = 0;
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue