diff --git a/include/nana/gui/detail/drawer.hpp b/include/nana/gui/detail/drawer.hpp index 7c20db17..46796573 100644 --- a/include/nana/gui/detail/drawer.hpp +++ b/include/nana/gui/detail/drawer.hpp @@ -98,10 +98,10 @@ namespace nana void clear_filter(); private: - void _m_reset_overrided(); - bool _m_overrided(event_code) const; + void _m_reset_overridden(); + bool _m_overridden(event_code) const; private: - unsigned overrided_{ 0xFFFFFFFF }; + unsigned overridden_{ 0xFFFFFFFF }; unsigned evt_disabled_{ 0 }; // bit set if event is filtered }; @@ -117,8 +117,8 @@ namespace nana enum class method_state { pending, - overrided, - not_overrided + overridden, + not_overridden }; public: drawer(); @@ -165,7 +165,7 @@ namespace nana auto realizer = this->realizer(); auto & mth_state = _m_mth_state(pos); - if (realizer && (method_state::not_overrided != mth_state)) + if (realizer && (method_state::not_overridden != mth_state)) { const bool bFiltered = !bForce__EmitInternal && realizer->filter_event(evt_code); if (method_state::pending == mth_state) @@ -176,7 +176,7 @@ namespace nana //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 = (realizer->_m_overrided(evt_code) ? method_state::overrided : method_state::not_overrided); + mth_state = (realizer->_m_overridden(evt_code) ? method_state::overridden : method_state::not_overridden); } else { diff --git a/include/nana/gui/detail/event_code.hpp b/include/nana/gui/detail/event_code.hpp index 2f126db6..2c63cb4c 100644 --- a/include/nana/gui/detail/event_code.hpp +++ b/include/nana/gui/detail/event_code.hpp @@ -28,7 +28,7 @@ namespace nana mouse_wheel, ///< A mouse scrolls the wheel on a widget. mouse_drop, ///< A mouse release over a window that is registered as recipient of drag and drop. expose, ///< - resizing, ///< A widget's size is sizing. In this event, A widget's size can be overrided with a new size. + resizing, ///< A widget's size is sizing. In this event, A widget's size can be overridden with a new size. resized, ///< A widget's size is changing. move, ///< unload, ///< A form is closed by clicking the X button, only works for root widget. diff --git a/source/gui/detail/drawer.cpp b/source/gui/detail/drawer.cpp index 3f5bc755..da5b0091 100644 --- a/source/gui/detail/drawer.cpp +++ b/source/gui/detail/drawer.cpp @@ -33,99 +33,99 @@ namespace nana void drawer_trigger::resizing(graph_reference, const arg_resizing&) { - overrided_ &= ~(1 << static_cast(event_code::resizing)); + overridden_ &= ~(1 << static_cast(event_code::resizing)); } void drawer_trigger::resized(graph_reference graph, const arg_resized&) { - overrided_ |= (1 << static_cast(event_code::resized)); + overridden_ |= (1 << static_cast(event_code::resized)); this->refresh(graph); detail::bedrock::instance().thread_context_lazy_refresh(); } void drawer_trigger::move(graph_reference, const arg_move&) { - overrided_ &= ~(1 << static_cast(event_code::move)); + overridden_ &= ~(1 << static_cast(event_code::move)); } void drawer_trigger::click(graph_reference, const arg_click&) { - overrided_ &= ~(1 << static_cast(event_code::click)); + overridden_ &= ~(1 << static_cast(event_code::click)); } void drawer_trigger::dbl_click(graph_reference, const arg_mouse&) { - overrided_ &= ~(1 << static_cast(event_code::dbl_click)); + overridden_ &= ~(1 << static_cast(event_code::dbl_click)); } void drawer_trigger::mouse_enter(graph_reference, const arg_mouse&) { - overrided_ &= ~(1 << static_cast(event_code::mouse_enter)); + overridden_ &= ~(1 << static_cast(event_code::mouse_enter)); } void drawer_trigger::mouse_move(graph_reference, const arg_mouse&) { - overrided_ &= ~(1 << static_cast(event_code::mouse_move)); + overridden_ &= ~(1 << static_cast(event_code::mouse_move)); } void drawer_trigger::mouse_leave(graph_reference, const arg_mouse&) { - overrided_ &= ~(1 << static_cast(event_code::mouse_leave)); + overridden_ &= ~(1 << static_cast(event_code::mouse_leave)); } void drawer_trigger::mouse_down(graph_reference, const arg_mouse&) { - overrided_ &= ~(1 << static_cast(event_code::mouse_down)); + overridden_ &= ~(1 << static_cast(event_code::mouse_down)); } void drawer_trigger::mouse_up(graph_reference, const arg_mouse&) { - overrided_ &= ~(1 << static_cast(event_code::mouse_up)); + overridden_ &= ~(1 << static_cast(event_code::mouse_up)); } void drawer_trigger::mouse_wheel(graph_reference, const arg_wheel&) { - overrided_ &= ~(1 << static_cast(event_code::mouse_wheel)); + overridden_ &= ~(1 << static_cast(event_code::mouse_wheel)); } void drawer_trigger::mouse_dropfiles(graph_reference, const arg_dropfiles&) { - overrided_ &= ~(1 << static_cast(event_code::mouse_drop)); + overridden_ &= ~(1 << static_cast(event_code::mouse_drop)); } void drawer_trigger::focus(graph_reference, const arg_focus&) { - overrided_ &= ~(1 << static_cast(event_code::focus)); + overridden_ &= ~(1 << static_cast(event_code::focus)); } void drawer_trigger::key_press(graph_reference, const arg_keyboard&) { - overrided_ &= ~(1 << static_cast(event_code::key_press)); + overridden_ &= ~(1 << static_cast(event_code::key_press)); } void drawer_trigger::key_char(graph_reference, const arg_keyboard&) { - overrided_ &= ~(1 << static_cast(event_code::key_char)); + overridden_ &= ~(1 << static_cast(event_code::key_char)); } void drawer_trigger::key_release(graph_reference, const arg_keyboard&) { - overrided_ &= ~(1 << static_cast(event_code::key_release)); + overridden_ &= ~(1 << static_cast(event_code::key_release)); } void drawer_trigger::shortkey(graph_reference, const arg_keyboard&) { - overrided_ &= ~(1 << static_cast(event_code::shortkey)); + overridden_ &= ~(1 << static_cast(event_code::shortkey)); } - void drawer_trigger::_m_reset_overrided() + void drawer_trigger::_m_reset_overridden() { - overrided_ = 0xFFFFFFFF; + overridden_ = 0xFFFFFFFF; } - bool drawer_trigger::_m_overrided(event_code evt_code) const + bool drawer_trigger::_m_overridden(event_code evt_code) const { - return 0 != (overrided_ & (1 << static_cast(evt_code))); + return 0 != (overridden_ & (1 << static_cast(evt_code))); } void drawer_trigger::filter_event(const event_code evt_code, const bool bDisabled) @@ -396,7 +396,7 @@ namespace nana *i = method_state::pending; data_impl_->realizer = &realizer; - realizer._m_reset_overrided(); + realizer._m_reset_overridden(); realizer.attached(wd, graphics); realizer.typeface_changed(graphics); }