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

fix compile errors under Linux

Browse Source
This commit is contained in:
Jinhao
2015-12-16 01:21:44 +08:00
parent c260eebbc3
commit 2ca11d4e25
21 changed files with 274 additions and 279 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/gui/msgbox.cpp
View File

@@ -38,7 +38,7 @@ namespace nana
: public form
{
public:
msgbox_window(window wd, const ::nana::string& title, msgbox::button_t btn, msgbox::icon_t ico)
msgbox_window(window wd, const std::string& title, msgbox::button_t btn, msgbox::icon_t ico)
: form(wd, rectangle(1, 1, 1, 1), appear::decorate<>()),
owner_(wd), pick_(msgbox::pick_yes)
{
@@ -61,14 +61,14 @@ namespace nana
{
_m_click(arg);
});
yes_.caption(STR("OK"));
yes_.caption("OK");
width_pixel += 77;
if(msgbox::yes_no == btn || msgbox::yes_no_cancel == btn)
{
yes_.caption(STR("Yes"));
yes_.caption("Yes");
no_.create(*this);
no_.caption(STR("No"));
no_.caption("No");
no_.events().click.connect_unignorable([this](const arg_click& arg)
{
_m_click(arg);
@@ -79,7 +79,7 @@ namespace nana
if(msgbox::yes_no_cancel == btn)
{
cancel_.create(*this);
cancel_.caption(STR("Cancel"));
cancel_.caption("Cancel");
cancel_.events().click.connect_unignorable([this](const arg_click& arg)
{
_m_click(arg);
@@ -843,7 +843,7 @@ namespace nana
void inputbox::text::tip_string(std::wstring tip)
{
impl_->tip.swap(utf8_cast(tip));
impl_->tip = utf8_cast(tip);
}
void inputbox::text::tip_string(std::string tip_utf8)