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

debug travis

Browse Source
This commit is contained in:
Jinhao 2016-06-24 23:30:07 +08:00
parent cff4bee6fb
commit aee106206a
3 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
include/nana/gui/detail/basic_window.hpp
View File

@ -64,6 +64,7 @@ namespace detail
rectangle effect_range_; rectangle effect_range_;
};//end class caret };//end class caret
/// Define some constant about tab category, these flags can be combine with operator | /// Define some constant about tab category, these flags can be combine with operator |
struct tab_type struct tab_type
{ {
@ -75,7 +76,6 @@ namespace detail
}; };
}; };
class caret;
/// a window data structure descriptor /// a window data structure descriptor
struct basic_window struct basic_window
@ -212,9 +212,18 @@ namespace detail
struct attr_root_tag struct attr_root_tag
{ {
attr_root_tag(const attr_root_tag&) = delete;
attr_root_tag(attr_root_tag&&) = delete;
#ifndef WIDGET_FRAME_DEPRECATED
container frames; ///< initialization is null, it will be created while creating a frame widget. Refer to WindowManager::create_frame container frames; ///< initialization is null, it will be created while creating a frame widget. Refer to WindowManager::create_frame
container tabstop; #endif
std::vector<edge_nimbus_action> effects_edge_nimbus; //Following p_xxx pointers are used for debugging
container * p_tabstop;
std::vector<edge_nimbus_action> * p_effects;
std::function<void()> * p_draw_through;
container& tabstop;
std::vector<edge_nimbus_action>& effects_edge_nimbus;
basic_window* focus{nullptr}; basic_window* focus{nullptr};
basic_window* menubar{nullptr}; basic_window* menubar{nullptr};
bool ime_enabled{false}; bool ime_enabled{false};
@ -224,7 +233,18 @@ namespace detail
cursor state_cursor{nana::cursor::arrow}; cursor state_cursor{nana::cursor::arrow};
basic_window* state_cursor_window{ nullptr }; basic_window* state_cursor_window{ nullptr };
std::function<void()> draw_through; ///< A draw through renderer for root widgets. std::function<void()>& draw_through; ///< A draw through renderer for root widgets.
attr_root_tag():
p_tabstop(new container),
p_effects(new std::vector<edge_nimbus_action>),
p_draw_through(new std::function<void()>),
tabstop(*p_tabstop),
effects_edge_nimbus(*p_effects),
draw_through(*p_draw_through)
{
}
}; };
const category::flags category; const category::flags category;

4
include/nana/gui/detail/drawer.hpp
View File

@ -148,8 +148,8 @@ namespace nana
//Check realizer, when the window is closed in that event handler, the drawer will be //Check realizer, when the window is closed in that event handler, the drawer will be
//detached and realizer will be a nullptr //detached and realizer will be a nullptr
//if (realizer) if (realizer)
// mth_state = (realizer->_m_overrided(evt_code) ? method_state::overrided : method_state::not_overrided); mth_state = (realizer->_m_overrided(evt_code) ? method_state::overrided : method_state::not_overrided);
} }
else else
(realizer->*mfptr)(graphics, arg); (realizer->*mfptr)(graphics, arg);

4
include/nana/gui/detail/window_manager.hpp
View File

@ -10,8 +10,8 @@
* @file: nana/gui/detail/window_manager.hpp * @file: nana/gui/detail/window_manager.hpp
* *
* <Knowledge: 1, 2007-8-17, "Difference between destroy and destroy_handle"> * <Knowledge: 1, 2007-8-17, "Difference between destroy and destroy_handle">
* destroy method destroys a window handle and the handles of its children, but it doesn't delete the handle which type is a root window or a frame * destroy method destroys a window handle and the handles of its children, but it doesn't delete the handle which type is a root window
* destroy_handle method just destroys the handle which type is a root window or a frame * destroy_handle method just destroys the handle which type is a root window
* *
*/ */