mewin/nana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add support of speicifying default value for inputbox::text

Browse Source
This commit is contained in:
Jinhao 2015-11-17 01:09:39 +08:00
parent a4258d3884
commit 3a85835907
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/nana/gui/msgbox.hpp
View File

@ -140,8 +140,11 @@ namespace nana
: public abstract_content : public abstract_content
{ {
struct implement; struct implement;
text(const text&) = delete;
text& operator=(const text&) = delete;
public: public:
text(::nana::string label); text(::nana::string label, ::nana::string init_text = ::nana::string());
text(::nana::string label, std::vector<::nana::string>); text(::nana::string label, std::vector<::nana::string>);
~text(); ~text();

11
source/gui/msgbox.cpp
View File

@ -809,23 +809,25 @@ namespace nana
std::vector< ::nana::string> options; std::vector< ::nana::string> options;
::nana::string label_text; ::nana::string label_text;
::nana::string init_text;
::nana::panel<false> dock; ::nana::panel<false> dock;
::nana::label label; ::nana::label label;
::nana::combox combox; ::nana::combox combox;
::nana::textbox textbox; ::nana::textbox textbox;
}; };
inputbox::text::text(::nana::string label) inputbox::text::text(::nana::string label, ::nana::string init_text)
: impl_(new implement) : impl_(new implement)
{ {
impl_->label_text = std::move(label); impl_->label_text.swap(std::move(label));
impl_->init_text.swap(init_text);
} }
inputbox::text::text(::nana::string label, std::vector<::nana::string> options) inputbox::text::text(::nana::string label, std::vector<::nana::string> options)
: impl_(new implement) : impl_(new implement)
{ {
impl_->options.swap(options); impl_->options.swap(options);
impl_->label_text = std::move(label); impl_->label_text.swap(label);
} }
//Instance for impl_ because implmenet is incomplete type at the point of declaration //Instance for impl_ because implmenet is incomplete type at the point of declaration
@ -833,7 +835,7 @@ namespace nana
void inputbox::text::tip_string(std::wstring tip) void inputbox::text::tip_string(std::wstring tip)
{ {
impl_->tip = std::move(tip); impl_->tip.swap(tip);
} }
void inputbox::text::tip_string(std::string tip_utf8) void inputbox::text::tip_string(std::string tip_utf8)
@ -877,6 +879,7 @@ namespace nana
{ {
impl->textbox.create(impl->dock, rectangle{ static_cast<int>(label_px + 10), 0, 0, 0 }); impl->textbox.create(impl->dock, rectangle{ static_cast<int>(label_px + 10), 0, 0, 0 });
impl->textbox.tip_string(impl->tip); impl->textbox.tip_string(impl->tip);
impl->textbox.caption(impl->init_text);
impl->textbox.mask(impl->mask_character); impl->textbox.mask(impl->mask_character);
impl->textbox.multi_lines(false); impl->textbox.multi_lines(false);
} }