Merge branch 'hotfixes' into develop
Conflicts: include/nana/detail/linux_X11/platform_spec.hpp source/detail/linux_X11/platform_spec.cpp source/paint/detail/native_paint_interface.cpp
This commit is contained in:
@@ -575,17 +575,27 @@ namespace nana
|
||||
|
||||
|
||||
//class menubar
|
||||
menubar::menubar(){}
|
||||
menubar::menubar(window wd)
|
||||
{
|
||||
create(wd);
|
||||
}
|
||||
|
||||
menubar::~menubar()
|
||||
{
|
||||
API::umake_event(evt_resized_);
|
||||
}
|
||||
|
||||
void menubar::create(window wd)
|
||||
{
|
||||
widget_object<category::widget_tag, drawerbase::menubar::trigger>
|
||||
::create(wd, rectangle(nana::size(API::window_size(wd).width, 28)));
|
||||
API::attach_menubar(handle());
|
||||
evt_resized_ = API::events(wd).resized([this](const ::nana::arg_resized& arg)
|
||||
{
|
||||
auto sz = this->size();
|
||||
sz.width = arg.width;
|
||||
this->size(sz);
|
||||
});
|
||||
}
|
||||
|
||||
menu& menubar::push_back(const nana::string& text)
|
||||
|
||||
@@ -1196,7 +1196,7 @@ namespace nana{ namespace widgets
|
||||
undo(false);
|
||||
break;
|
||||
default:
|
||||
if (key >= 0xFF || (32 <= key && key <= 126))
|
||||
if (key > 0x7F || (32 <= key && key <= 126))
|
||||
put(key);
|
||||
else if (sizeof(nana::char_t) == sizeof(char))
|
||||
{ //Non-Unicode Version for Non-English characters
|
||||
|
||||
Reference in New Issue
Block a user