get ready for Linux
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
/*
|
||||
* Basic Types definition
|
||||
* Nana C++ Library(http://www.nanapro.org)
|
||||
* Copyright(C) 2003-2014 Jinhao(cnjinhao@hotmail.com)
|
||||
* Copyright(C) 2003-2015 Jinhao(cnjinhao@hotmail.com)
|
||||
*
|
||||
* Distributed under the Boost Software License, Version 1.0.
|
||||
* (See accompanying file LICENSE_1_0.txt or copy at
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
/*
|
||||
* A Drawer Implementation
|
||||
* Nana C++ Library(http://www.nanapro.org)
|
||||
* Copyright(C) 2003-2014 Jinhao(cnjinhao@hotmail.com)
|
||||
* Copyright(C) 2003-2015 Jinhao(cnjinhao@hotmail.com)
|
||||
*
|
||||
* Distributed under the Boost Software License, Version 1.0.
|
||||
* (See accompanying file LICENSE_1_0.txt or copy at
|
||||
@@ -139,7 +139,11 @@ namespace nana
|
||||
{
|
||||
realizer_->_m_reset_overrided();
|
||||
(realizer_->*mfptr)(graphics, arg);
|
||||
mth_state_[pos] = (realizer_->_m_overrided() ? method_state::overrided : method_state::not_overrided);
|
||||
|
||||
//Check realizer, when the window is closed in that event handler, the drawer will be
|
||||
//detached and realizer will be a nullptr
|
||||
if(realizer_)
|
||||
mth_state_[pos] = (realizer_->_m_overrided() ? method_state::overrided : method_state::not_overrided);
|
||||
}
|
||||
else
|
||||
(realizer_->*mfptr)(graphics, arg);
|
||||
|
||||
@@ -180,7 +180,7 @@ namespace API
|
||||
using scheme_type = typename ::nana::dev::widget_traits<Widget>::scheme_type;
|
||||
|
||||
internal_scope_guard lock;
|
||||
auto * wdg_colors = ::nana::dev::get_scheme(wd);
|
||||
auto * wdg_colors = dev::get_scheme(wd);
|
||||
if (nullptr == wdg_colors)
|
||||
throw std::invalid_argument("API::scheme(): bad parameter window handle, no events object or invalid window handle.");
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@ namespace nana
|
||||
virtual ~display() = default;
|
||||
|
||||
/// The index of monitor.
|
||||
virtual std::size_t index() const = 0;
|
||||
virtual std::size_t get_index() const = 0;
|
||||
|
||||
/// Returns the positional coordinates and size of the display device in reference to the desktop area
|
||||
virtual const ::nana::rectangle& area() const = 0;
|
||||
@@ -49,4 +49,4 @@ namespace nana
|
||||
};
|
||||
}//end namespace nana
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
||||
@@ -22,16 +22,13 @@
|
||||
namespace nana
|
||||
{
|
||||
/// A list box combined with a textbox - the list box should drop down when the user selects the arrow next to the control
|
||||
class combox;
|
||||
class combox;
|
||||
|
||||
struct arg_combox
|
||||
: public event_arg
|
||||
{
|
||||
combox & widget;
|
||||
|
||||
arg_combox(combox& wdg)
|
||||
: widget{ wdg }
|
||||
{}
|
||||
arg_combox(combox&);
|
||||
};
|
||||
|
||||
namespace drawerbase
|
||||
|
||||
@@ -421,7 +421,7 @@ namespace nana
|
||||
mutable drawerbase::listbox::item_proxy item;
|
||||
bool selected;
|
||||
|
||||
arg_listbox(drawerbase::listbox::item_proxy&, bool selected);
|
||||
arg_listbox(const drawerbase::listbox::item_proxy&, bool selected);
|
||||
};
|
||||
|
||||
namespace drawerbase
|
||||
|
||||
@@ -44,7 +44,7 @@ namespace nana
|
||||
widget * widget_{nullptr};
|
||||
nana::paint::graphics* graph_{nullptr};
|
||||
unsigned draw_width_{static_cast<unsigned>(-1)};
|
||||
bool has_value_{true};
|
||||
//bool has_value_{true}; //deprecated
|
||||
bool unknown_{false};
|
||||
unsigned max_{100};
|
||||
unsigned value_{0};
|
||||
|
||||
@@ -27,7 +27,7 @@ namespace nana
|
||||
scroll<Vert> & widget;
|
||||
|
||||
arg_scroll(scroll<Vert> & wdg)
|
||||
: widget{ wdg }
|
||||
: widget(wdg)
|
||||
{}
|
||||
};
|
||||
|
||||
@@ -312,7 +312,7 @@ namespace nana
|
||||
private:
|
||||
void _m_emit_value_changed()
|
||||
{
|
||||
widget_->events().value_changed.emit(::nana::arg_scroll<Vertical>({*widget_}));
|
||||
widget_->events().value_changed.emit(::nana::arg_scroll<Vertical>(*widget_));
|
||||
}
|
||||
|
||||
void _m_tick()
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
* (See accompanying file LICENSE_1_0.txt or copy at
|
||||
* http://www.boost.org/LICENSE_1_0.txt)
|
||||
*
|
||||
* @file: nana/gui/widgets/spanbox.hpp
|
||||
* @file: nana/gui/widgets/spinbox.hpp
|
||||
*/
|
||||
|
||||
#ifndef NANA_GUI_WIDGET_SPINBOX_HPP
|
||||
@@ -23,10 +23,7 @@ namespace nana
|
||||
: public event_arg
|
||||
{
|
||||
spinbox & widget;
|
||||
|
||||
arg_spinbox(spinbox& wdg)
|
||||
: widget{ wdg }
|
||||
{}
|
||||
arg_spinbox(spinbox&);
|
||||
};
|
||||
|
||||
namespace drawerbase
|
||||
@@ -137,4 +134,4 @@ namespace nana
|
||||
}
|
||||
}//end namespace nana
|
||||
|
||||
#endif //NANA_GUI_WIDGET_SPINBOX_HPP
|
||||
#endif //NANA_GUI_WIDGET_SPINBOX_HPP
|
||||
|
||||
Reference in New Issue
Block a user