diff --git a/include/nana/audio/player.hpp b/include/nana/audio/player.hpp index c4fc3d87..0dad445f 100644 --- a/include/nana/audio/player.hpp +++ b/include/nana/audio/player.hpp @@ -1,6 +1,6 @@ #ifndef NANA_AUDIO_PLAYER_HPP #define NANA_AUDIO_PLAYER_HPP - +#include #include #ifdef NANA_ENABLE_AUDIO @@ -31,4 +31,7 @@ namespace nana{ namespace audio }//end namespace nana #endif //NANA_ENABLE_AUDIO -#endif \ No newline at end of file + +#include + +#endif diff --git a/include/nana/basic_types.hpp b/include/nana/basic_types.hpp index 4fb4385d..4d13b6ec 100644 --- a/include/nana/basic_types.hpp +++ b/include/nana/basic_types.hpp @@ -15,6 +15,7 @@ #include #include +#include namespace nana { @@ -484,7 +485,7 @@ namespace nana southeast }; }//end namespace nana - +#include #endif diff --git a/include/nana/c++defines.hpp b/include/nana/c++defines.hpp index 86159f79..2dc4c5f2 100644 --- a/include/nana/c++defines.hpp +++ b/include/nana/c++defines.hpp @@ -137,11 +137,11 @@ #if ((__GNUC__ < 5) ) # define STD_put_time_NOT_SUPPORTED - #endif + #endif - #if ((__GNUC__ > 5) || ((__GNUC__ == 5) && (__GNUC_MINOR__ >= 3 ) ) ) + #if ((__GNUC__ > 5) || ((__GNUC__ == 5) && (__GNUC_MINOR__ >= 3 ) ) ) # undef STD_FILESYSTEM_NOT_SUPPORTED - #endif + #endif #if (__GNUC__ == 4) #if ((__GNUC_MINOR__ < 8) || (__GNUC_MINOR__ == 8 && __GNUC_PATCHLEVEL__ < 1)) diff --git a/include/nana/deploy.hpp b/include/nana/deploy.hpp index 0f7cb8c9..f172fb71 100644 --- a/include/nana/deploy.hpp +++ b/include/nana/deploy.hpp @@ -14,6 +14,7 @@ #ifndef NANA_DEPLOY_HPP #define NANA_DEPLOY_HPP +#include #include #if defined(VERBOSE_PREPROCESSOR) @@ -215,5 +216,5 @@ namespace std { make_unique(Args&&...) = delete; } #endif //STD_make_unique_NOT_SUPPORTED - -#endif //NANA_MACROS_HPP +#include +#endif //NANA_DEPLOY_HPP diff --git a/include/nana/detail/linux_X11/platform_spec.hpp b/include/nana/detail/linux_X11/platform_spec.hpp index 12bb65c3..e701c203 100644 --- a/include/nana/detail/linux_X11/platform_spec.hpp +++ b/include/nana/detail/linux_X11/platform_spec.hpp @@ -18,6 +18,8 @@ #ifndef NANA_DETAIL_PLATFORM_SPEC_HPP #define NANA_DETAIL_PLATFORM_SPEC_HPP +#include + #include #include #include @@ -193,8 +195,8 @@ namespace detail native_window_type owner; std::vector * owned; }; - public: - int error_code; + public: + int error_code; public: typedef drawable_impl_type::font_ptr_t font_ptr_t; typedef void (*timer_proc_type)(unsigned tid); @@ -202,6 +204,8 @@ namespace detail typedef ::nana::event_code event_code; typedef ::nana::native_window_type native_window_type; + platform_spec(const platform_spec&) = delete; + platform_spec& operator=(const platform_spec&) = delete; platform_spec(); ~platform_spec(); @@ -332,6 +336,7 @@ namespace detail }//end namespace nana +#include // .h ward #endif diff --git a/include/nana/detail/win32/platform_spec.hpp b/include/nana/detail/win32/platform_spec.hpp index dc6329fe..dba6062a 100644 --- a/include/nana/detail/win32/platform_spec.hpp +++ b/include/nana/detail/win32/platform_spec.hpp @@ -142,6 +142,9 @@ namespace detail unsigned whitespace_pixels; }string; + drawable_impl_type(const drawable_impl_type&) = delete; + drawable_impl_type& operator=(const drawable_impl_type&) = delete; + drawable_impl_type(); ~drawable_impl_type(); diff --git a/include/nana/filesystem/filesystem.hpp b/include/nana/filesystem/filesystem.hpp index 2b44a60d..a62a5707 100644 --- a/include/nana/filesystem/filesystem.hpp +++ b/include/nana/filesystem/filesystem.hpp @@ -29,6 +29,9 @@ #ifndef NANA_FILESYSTEM_HPP #define NANA_FILESYSTEM_HPP + +#include + #include #include #include @@ -409,4 +412,5 @@ namespace nana { namespace experimental { namespace filesystem //namespace filesystem = experimental::filesystem; } //end namespace nana +#include #endif diff --git a/include/nana/gui/animation.hpp b/include/nana/gui/animation.hpp index d9a62e26..9f0df563 100644 --- a/include/nana/gui/animation.hpp +++ b/include/nana/gui/animation.hpp @@ -12,7 +12,7 @@ #ifndef NANA_GUI_ANIMATION_HPP #define NANA_GUI_ANIMATION_HPP - +#include #include #include @@ -82,4 +82,5 @@ namespace nana impl * impl_; }; } //end namespace nana +#include #endif //NANA_GUI_ANIMATION_HPP diff --git a/include/nana/gui/basis.hpp b/include/nana/gui/basis.hpp index 55518554..37fd7f69 100644 --- a/include/nana/gui/basis.hpp +++ b/include/nana/gui/basis.hpp @@ -15,6 +15,8 @@ #ifndef NANA_GUI_BASIS_HPP #define NANA_GUI_BASIS_HPP +#include + #include "../basic_types.hpp" #include "../traits.hpp" //metacomp::fixed_type_set @@ -59,9 +61,9 @@ namespace nana }; //wait for constexpr struct widget_tag{ static const flags value = flags::widget; }; - struct lite_widget_tag : widget_tag{ static const flags value = flags::lite_widget;}; - struct root_tag : widget_tag{ static const flags value = flags::root; }; - struct frame_tag: widget_tag{ static const flags value = flags::frame; }; + struct lite_widget_tag : public widget_tag{ static const flags value = flags::lite_widget; }; + struct root_tag : public widget_tag{ static const flags value = flags::root; }; + struct frame_tag : public widget_tag{ static const flags value = flags::frame; }; }// end namespace category using native_window_type = detail::native_window_handle_impl*; @@ -258,4 +260,6 @@ that return a corresponding nana::appearance with predefined values. }; };//end namespace apper }//end namespace nana + +#include #endif diff --git a/include/nana/gui/detail/basic_window.hpp b/include/nana/gui/detail/basic_window.hpp index ed2e1db4..e2e68fe1 100644 --- a/include/nana/gui/detail/basic_window.hpp +++ b/include/nana/gui/detail/basic_window.hpp @@ -12,6 +12,7 @@ #ifndef NANA_GUI_DETAIL_BASIC_WINDOW_HPP #define NANA_GUI_DETAIL_BASIC_WINDOW_HPP +#include #include "drawer.hpp" #include "events_holder.hpp" #include "widget_colors.hpp" @@ -237,5 +238,6 @@ namespace detail }//end namespace detail }//end namespace nana +#include #endif diff --git a/include/nana/gui/detail/bedrock.hpp b/include/nana/gui/detail/bedrock.hpp index 128ce532..a88e0642 100644 --- a/include/nana/gui/detail/bedrock.hpp +++ b/include/nana/gui/detail/bedrock.hpp @@ -33,6 +33,9 @@ namespace detail class bedrock { bedrock(); + + bedrock(const bedrock&) = delete; + bedrock& operator=(const bedrock&) = delete; public: using core_window_t = basic_window; diff --git a/include/nana/gui/detail/bedrock_pi_data.hpp b/include/nana/gui/detail/bedrock_pi_data.hpp index 3154a6b3..4e9e28c8 100644 --- a/include/nana/gui/detail/bedrock_pi_data.hpp +++ b/include/nana/gui/detail/bedrock_pi_data.hpp @@ -1,6 +1,8 @@ #ifndef NANA_DETAIL_BEDROCK_PI_DATA_HPP #define NANA_DETAIL_BEDROCK_PI_DATA_HPP +#include + #include #include "color_schemes.hpp" #include "events_operation.hpp" @@ -20,4 +22,7 @@ namespace nana }; } } + +#include + #endif diff --git a/include/nana/gui/detail/drawer.hpp b/include/nana/gui/detail/drawer.hpp index b680ec6a..26061033 100644 --- a/include/nana/gui/detail/drawer.hpp +++ b/include/nana/gui/detail/drawer.hpp @@ -13,6 +13,7 @@ #ifndef NANA_GUI_DETAIL_DRAWER_HPP #define NANA_GUI_DETAIL_DRAWER_HPP +#include #include #include "general_events.hpp" #include @@ -170,4 +171,6 @@ namespace nana }//end namespace detail }//end namespace nana +#include + #endif diff --git a/include/nana/gui/detail/element_store.hpp b/include/nana/gui/detail/element_store.hpp index 0035d4be..3ac5b242 100644 --- a/include/nana/gui/detail/element_store.hpp +++ b/include/nana/gui/detail/element_store.hpp @@ -15,9 +15,13 @@ #include #include + #include #include +#include + + namespace nana { namespace detail @@ -48,5 +52,6 @@ namespace detail }; }//end namespace detail } +#include #endif diff --git a/include/nana/gui/detail/general_events.hpp b/include/nana/gui/detail/general_events.hpp index c30c2d1c..e7a5911a 100644 --- a/include/nana/gui/detail/general_events.hpp +++ b/include/nana/gui/detail/general_events.hpp @@ -12,6 +12,8 @@ #ifndef NANA_DETAIL_GENERAL_EVENTS_HPP #define NANA_DETAIL_GENERAL_EVENTS_HPP +#include + #include #include "event_code.hpp" #include "internal_scope_guard.hpp" @@ -576,4 +578,6 @@ namespace nana }//end namespace detail }//end namespace nana +#include + #endif diff --git a/include/nana/gui/detail/handle_manager.hpp b/include/nana/gui/detail/handle_manager.hpp index 7e8f670d..716433be 100644 --- a/include/nana/gui/detail/handle_manager.hpp +++ b/include/nana/gui/detail/handle_manager.hpp @@ -25,6 +25,8 @@ #include #include +#include + namespace nana { @@ -288,4 +290,6 @@ namespace nana };//end class handle_manager }//end namespace detail }// end namespace nana +#include + #endif diff --git a/include/nana/gui/detail/inner_fwd_implement.hpp b/include/nana/gui/detail/inner_fwd_implement.hpp index 90589d3c..dd88b9e2 100644 --- a/include/nana/gui/detail/inner_fwd_implement.hpp +++ b/include/nana/gui/detail/inner_fwd_implement.hpp @@ -14,6 +14,7 @@ #ifndef NANA_GUI_INNER_FWD_IMPLEMENT_HPP #define NANA_GUI_INNER_FWD_IMPLEMENT_HPP +#include #include "inner_fwd.hpp" #include "basic_window.hpp" #include "../../paint/graphics.hpp" @@ -172,4 +173,7 @@ namespace nana{ }; } }//end namespace nana + +#include + #endif //NANA_GUI_INNER_FWD_IMPLEMENT_HPP diff --git a/include/nana/gui/detail/window_layout.hpp b/include/nana/gui/detail/window_layout.hpp index f4bdfe0b..34987291 100644 --- a/include/nana/gui/detail/window_layout.hpp +++ b/include/nana/gui/detail/window_layout.hpp @@ -12,6 +12,7 @@ #ifndef NANA_GUI_DETAIL_WINDOW_LAYOUT_HPP #define NANA_GUI_DETAIL_WINDOW_LAYOUT_HPP +#include #include #include @@ -84,5 +85,7 @@ namespace detail }//end namespace detail }//end namespace nana +#include + #endif //NANA_GUI_DETAIL_WINDOW_LAYOUT_HPP diff --git a/include/nana/gui/detail/window_manager.hpp b/include/nana/gui/detail/window_manager.hpp index 0b1f51c9..9a1302a2 100644 --- a/include/nana/gui/detail/window_manager.hpp +++ b/include/nana/gui/detail/window_manager.hpp @@ -18,6 +18,8 @@ #ifndef NANA_GUI_DETAIL_WINDOW_MANAGER_HPP #define NANA_GUI_DETAIL_WINDOW_MANAGER_HPP +#include + #include #include "window_layout.hpp" #include "event_code.hpp" @@ -195,4 +197,7 @@ namespace detail };//end class window_manager }//end namespace detail }//end namespace nana + +#include + #endif diff --git a/include/nana/gui/dragger.hpp b/include/nana/gui/dragger.hpp index e34094ef..9e6bbbf2 100644 --- a/include/nana/gui/dragger.hpp +++ b/include/nana/gui/dragger.hpp @@ -12,6 +12,7 @@ #ifndef NANA_GUI_DRAGGER_HPP #define NANA_GUI_DRAGGER_HPP +#include #include "basis.hpp" #include "../basic_types.hpp" #include "../traits.hpp" @@ -44,4 +45,5 @@ namespace nana dragger_impl_t * impl_; }; }//end namespace nana +#include #endif diff --git a/include/nana/gui/drawing.hpp b/include/nana/gui/drawing.hpp index fb1b966b..06ecece6 100644 --- a/include/nana/gui/drawing.hpp +++ b/include/nana/gui/drawing.hpp @@ -11,6 +11,8 @@ */ #ifndef NANA_GUI_DRAWING_HPP #define NANA_GUI_DRAWING_HPP + +#include #include "widgets/widget.hpp" #include "../traits.hpp" namespace nana @@ -46,4 +48,6 @@ namespace nana window handle_; };//end class drawing }//end namespace nana + +#include #endif diff --git a/include/nana/gui/element.hpp b/include/nana/gui/element.hpp index 599aa87a..93379052 100644 --- a/include/nana/gui/element.hpp +++ b/include/nana/gui/element.hpp @@ -12,6 +12,7 @@ #ifndef NANA_GUI_ELEMENT_HPP #define NANA_GUI_ELEMENT_HPP +#include #include #include #include @@ -349,4 +350,5 @@ namespace nana }//end namespace element }//end namespace nana +#include #endif //NANA_GUI_ELEMENT_HPP diff --git a/include/nana/gui/msgbox.hpp b/include/nana/gui/msgbox.hpp index af5a1437..e21392e0 100644 --- a/include/nana/gui/msgbox.hpp +++ b/include/nana/gui/msgbox.hpp @@ -12,6 +12,7 @@ #ifndef NANA_GUI_MSGBOX_HPP #define NANA_GUI_MSGBOX_HPP +#include #include @@ -253,5 +254,6 @@ namespace nana ::nana::rectangle valid_areas_[4]; }; }//end namespace nana +#include #endif diff --git a/include/nana/gui/notifier.hpp b/include/nana/gui/notifier.hpp index a557fd45..48442a96 100644 --- a/include/nana/gui/notifier.hpp +++ b/include/nana/gui/notifier.hpp @@ -14,6 +14,7 @@ #define NANA_GUI_NOTIFIER_HPP #include #include +#include namespace nana { @@ -65,4 +66,5 @@ namespace nana implement * impl_; }; }//end namespace nana +#include #endif diff --git a/include/nana/gui/place.hpp b/include/nana/gui/place.hpp index 8f32545b..b10a8a18 100644 --- a/include/nana/gui/place.hpp +++ b/include/nana/gui/place.hpp @@ -15,6 +15,7 @@ #ifndef NANA_GUI_PLACE_HPP #define NANA_GUI_PLACE_HPP +#include #include #include #include @@ -145,5 +146,6 @@ namespace nana implement * impl_; }; }//end namespace nana +#include #endif //#ifndef NANA_GUI_PLACE_HPP diff --git a/include/nana/gui/timer.hpp b/include/nana/gui/timer.hpp index 893a4e5d..9ae26f32 100644 --- a/include/nana/gui/timer.hpp +++ b/include/nana/gui/timer.hpp @@ -16,6 +16,7 @@ #ifndef NANA_GUI_TIMER_HPP #define NANA_GUI_TIMER_HPP #include +#include namespace nana { @@ -58,4 +59,5 @@ namespace nana implement * const impl_; }; }//end namespace nana +#include #endif diff --git a/include/nana/gui/widgets/button.hpp b/include/nana/gui/widgets/button.hpp index bddeca77..e1813917 100644 --- a/include/nana/gui/widgets/button.hpp +++ b/include/nana/gui/widgets/button.hpp @@ -14,6 +14,8 @@ #define NANA_GUI_WIDGET_BUTTON_HPP #include "widget.hpp" #include +#include + namespace nana{ namespace drawerbase @@ -105,5 +107,7 @@ namespace nana{ void _m_caption(native_string_type&&) override; }; }//end namespace nana +#include + #endif diff --git a/include/nana/gui/widgets/categorize.hpp b/include/nana/gui/widgets/categorize.hpp index 3b8f5b3c..3f211c81 100644 --- a/include/nana/gui/widgets/categorize.hpp +++ b/include/nana/gui/widgets/categorize.hpp @@ -16,6 +16,7 @@ #include #include #include +#include namespace nana { @@ -141,7 +142,7 @@ namespace nana void mouse_leave(graph_reference, const arg_mouse&) override; private: std::unique_ptr event_agent_; - scheme * scheme_; + scheme * scheme_{nullptr}; }; }//end namespace categorize }//end namespace drawerbase @@ -258,5 +259,5 @@ namespace nana } }; }//end namespace nana - +#include #endif diff --git a/include/nana/gui/widgets/checkbox.hpp b/include/nana/gui/widgets/checkbox.hpp index 8d458be3..8d06b590 100644 --- a/include/nana/gui/widgets/checkbox.hpp +++ b/include/nana/gui/widgets/checkbox.hpp @@ -12,6 +12,8 @@ #ifndef NANA_GUI_WIDGET_CHECKBOX_HPP #define NANA_GUI_WIDGET_CHECKBOX_HPP +#include + #include "widget.hpp" #include #include @@ -106,5 +108,6 @@ namespace drawerbase std::vector ui_container_; }; }//end namespace nana +#include #endif diff --git a/include/nana/gui/widgets/combox.hpp b/include/nana/gui/widgets/combox.hpp index 4d22a30e..7e478557 100644 --- a/include/nana/gui/widgets/combox.hpp +++ b/include/nana/gui/widgets/combox.hpp @@ -12,6 +12,7 @@ #ifndef NANA_GUI_WIDGETS_COMBOX_HPP #define NANA_GUI_WIDGETS_COMBOX_HPP +#include #include "widget.hpp" #include "float_listbox.hpp" #include "skeletons/text_editor_part.hpp" @@ -227,4 +228,5 @@ namespace nana nana::any * _m_anyobj(std::size_t pos, bool alloc_if_empty) const override; }; } +#include #endif diff --git a/include/nana/gui/widgets/date_chooser.hpp b/include/nana/gui/widgets/date_chooser.hpp index a4e685e1..4d02324b 100644 --- a/include/nana/gui/widgets/date_chooser.hpp +++ b/include/nana/gui/widgets/date_chooser.hpp @@ -12,7 +12,7 @@ #ifndef NANA_GUI_WIDGETS_DATE_CHOOSER_HPP #define NANA_GUI_WIDGETS_DATE_CHOOSER_HPP - +#include #include "widget.hpp" #include @@ -114,5 +114,6 @@ namespace nana void weekstr(unsigned index, const ::std::string&);/// #endif diff --git a/include/nana/gui/widgets/detail/tree_cont.hpp b/include/nana/gui/widgets/detail/tree_cont.hpp index 3618b814..c9684ba6 100644 --- a/include/nana/gui/widgets/detail/tree_cont.hpp +++ b/include/nana/gui/widgets/detail/tree_cont.hpp @@ -12,6 +12,7 @@ #ifndef NANA_GUI_WIDGETS_DETAIL_TREE_CONT_HPP #define NANA_GUI_WIDGETS_DETAIL_TREE_CONT_HPP #include +#include namespace nana { @@ -515,4 +516,6 @@ namespace detail }//end namespace detail }//end namespace widgets }//end namesace nana + +#include #endif diff --git a/include/nana/gui/widgets/float_listbox.hpp b/include/nana/gui/widgets/float_listbox.hpp index 79a66e2f..590479fd 100644 --- a/include/nana/gui/widgets/float_listbox.hpp +++ b/include/nana/gui/widgets/float_listbox.hpp @@ -12,6 +12,7 @@ #ifndef NANA_GUI_WIDGETS_FLOAT_LISTBOX_HPP #define NANA_GUI_WIDGETS_FLOAT_LISTBOX_HPP +#include #include "widget.hpp" #include @@ -101,5 +102,6 @@ namespace nana std::size_t index() const; }; } +#include #endif diff --git a/include/nana/gui/widgets/label.hpp b/include/nana/gui/widgets/label.hpp index 6b71bd88..f8c97eb9 100644 --- a/include/nana/gui/widgets/label.hpp +++ b/include/nana/gui/widgets/label.hpp @@ -12,8 +12,9 @@ #ifndef NANA_GUI_WIDGET_LABEL_HPP #define NANA_GUI_WIDGET_LABEL_HPP -#include "widget.hpp" +#include "widget.hpp" +#include namespace nana { @@ -80,4 +81,6 @@ namespace nana void _m_caption(native_string_type&&) override; }; }//end namespace nana +#include + #endif diff --git a/include/nana/gui/widgets/listbox.hpp b/include/nana/gui/widgets/listbox.hpp index f2c97612..0f1e24e2 100644 --- a/include/nana/gui/widgets/listbox.hpp +++ b/include/nana/gui/widgets/listbox.hpp @@ -17,6 +17,8 @@ #ifndef NANA_GUI_WIDGETS_LISTBOX_HPP #define NANA_GUI_WIDGETS_LISTBOX_HPP +#include + #include "widget.hpp" #include "detail/inline_widget.hpp" #include @@ -720,4 +722,6 @@ By \a clicking on one header the list get \a reordered, first up, and then down void _m_erase_key(nana::detail::key_interface*); }; }//end namespace nana + +#include #endif diff --git a/include/nana/gui/widgets/menu.hpp b/include/nana/gui/widgets/menu.hpp index 335796d4..02372079 100644 --- a/include/nana/gui/widgets/menu.hpp +++ b/include/nana/gui/widgets/menu.hpp @@ -17,6 +17,8 @@ #include #include +#include + namespace nana { namespace drawerbase @@ -198,4 +200,6 @@ namespace nana detail::popuper menu_popuper(menu&, mouse = mouse::right_button); detail::popuper menu_popuper(menu&, window owner, const point&, mouse = mouse::right_button); }//end namespace nana +#include + #endif diff --git a/include/nana/gui/widgets/menubar.hpp b/include/nana/gui/widgets/menubar.hpp index 365d9b1c..3c799936 100644 --- a/include/nana/gui/widgets/menubar.hpp +++ b/include/nana/gui/widgets/menubar.hpp @@ -14,6 +14,7 @@ #define NANA_GUI_WIDGETS_MENUBAR_HPP #include "widget.hpp" #include "menu.hpp" +#include namespace nana { @@ -117,4 +118,6 @@ namespace nana ::nana::event_handle evt_resized_{nullptr}; };//end class menubar }//end namespace nana +#include + #endif diff --git a/include/nana/gui/widgets/picture.hpp b/include/nana/gui/widgets/picture.hpp index bd40f0e0..fc8e9c63 100644 --- a/include/nana/gui/widgets/picture.hpp +++ b/include/nana/gui/widgets/picture.hpp @@ -13,6 +13,8 @@ */ #ifndef NANA_GUI_WIDGET_PICTURE_HPP #define NANA_GUI_WIDGET_PICTURE_HPP +#include + #include "widget.hpp" namespace nana @@ -67,4 +69,6 @@ namespace nana bool transparent() const; }; }//end namespace nana +#include + #endif diff --git a/include/nana/gui/widgets/scroll.hpp b/include/nana/gui/widgets/scroll.hpp index 96d1b023..458ce877 100644 --- a/include/nana/gui/widgets/scroll.hpp +++ b/include/nana/gui/widgets/scroll.hpp @@ -15,6 +15,7 @@ #include "widget.hpp" #include +#include namespace nana { @@ -502,4 +503,5 @@ namespace nana } };//end class scroll }//end namespace nana +#include #endif diff --git a/include/nana/gui/widgets/skeletons/text_editor.hpp b/include/nana/gui/widgets/skeletons/text_editor.hpp index 3189cd18..46a023fd 100644 --- a/include/nana/gui/widgets/skeletons/text_editor.hpp +++ b/include/nana/gui/widgets/skeletons/text_editor.hpp @@ -13,6 +13,8 @@ #ifndef NANA_GUI_SKELETONS_TEXT_EDITOR_HPP #define NANA_GUI_SKELETONS_TEXT_EDITOR_HPP +#include + #include "textbase.hpp" #include "text_editor_part.hpp" #include @@ -372,5 +374,7 @@ namespace nana{ namespace widgets }//end namespace widgets }//end namespace nana +#include + #endif diff --git a/include/nana/gui/widgets/skeletons/text_token_stream.hpp b/include/nana/gui/widgets/skeletons/text_token_stream.hpp index 7fbd3801..c5d5a5e7 100644 --- a/include/nana/gui/widgets/skeletons/text_token_stream.hpp +++ b/include/nana/gui/widgets/skeletons/text_token_stream.hpp @@ -22,6 +22,8 @@ #include #include +#include + namespace nana{ namespace widgets{ namespace skeletons { //The tokens are defined for representing a text, the tokens are divided @@ -941,4 +943,5 @@ namespace nana{ namespace widgets{ namespace skeletons }//end namespace skeletons }//end namespace widgets }//end namepsace nana +#include #endif //NANA_GUI_WIDGETS_SKELETONS_TEXT_TOKEN_STREAM diff --git a/include/nana/gui/widgets/skeletons/textbase.hpp b/include/nana/gui/widgets/skeletons/textbase.hpp index 99cc5799..1c4085b2 100644 --- a/include/nana/gui/widgets/skeletons/textbase.hpp +++ b/include/nana/gui/widgets/skeletons/textbase.hpp @@ -13,6 +13,7 @@ #ifndef NANA_GUI_WIDGET_DETAIL_TEXTBASE_HPP #define NANA_GUI_WIDGET_DETAIL_TEXTBASE_HPP +#include #include #include @@ -536,4 +537,6 @@ namespace skeletons }//end namespace detail }//end namespace widgets }//end namespace nana +#include + #endif diff --git a/include/nana/gui/widgets/slider.hpp b/include/nana/gui/widgets/slider.hpp index c5372034..21b92d47 100644 --- a/include/nana/gui/widgets/slider.hpp +++ b/include/nana/gui/widgets/slider.hpp @@ -11,6 +11,9 @@ */ #ifndef NANA_GUI_WIDGETS_SLIDER_HPP #define NANA_GUI_WIDGETS_SLIDER_HPP + +#include + #include "widget.hpp" #include @@ -141,5 +144,6 @@ namespace nana bool transparent() const; }; }//end namespace nana +#include #endif diff --git a/include/nana/gui/widgets/spinbox.hpp b/include/nana/gui/widgets/spinbox.hpp index fd60f070..e090426a 100644 --- a/include/nana/gui/widgets/spinbox.hpp +++ b/include/nana/gui/widgets/spinbox.hpp @@ -12,6 +12,8 @@ #ifndef NANA_GUI_WIDGET_SPINBOX_HPP #define NANA_GUI_WIDGET_SPINBOX_HPP + +#include #include "widget.hpp" #include "skeletons/text_editor_part.hpp" @@ -110,5 +112,5 @@ namespace nana void _m_caption(native_string_type&&); }; //end class spinbox }//end namespace nana - +#include #endif //NANA_GUI_WIDGET_SPINBOX_HPP diff --git a/include/nana/gui/widgets/tabbar.hpp b/include/nana/gui/widgets/tabbar.hpp index b7a88789..c7d20ad1 100644 --- a/include/nana/gui/widgets/tabbar.hpp +++ b/include/nana/gui/widgets/tabbar.hpp @@ -13,6 +13,8 @@ */ #ifndef NANA_GUI_WIDGET_TABBAR_HPP #define NANA_GUI_WIDGET_TABBAR_HPP +#include + #include "widget.hpp" #include #include @@ -410,5 +412,6 @@ namespace nana void erase(std::size_t pos, bool close_attached = true); }; } +#include #endif diff --git a/include/nana/gui/widgets/textbox.hpp b/include/nana/gui/widgets/textbox.hpp index 69fda830..4ce43a3d 100644 --- a/include/nana/gui/widgets/textbox.hpp +++ b/include/nana/gui/widgets/textbox.hpp @@ -11,6 +11,8 @@ */ #ifndef NANA_GUI_WIDGET_TEXTBOX_HPP #define NANA_GUI_WIDGET_TEXTBOX_HPP +#include + #include #include "skeletons/textbase_export_interface.hpp" #include "skeletons/text_editor_part.hpp" @@ -214,4 +216,6 @@ namespace nana void _m_typeface(const paint::font&) override; }; }//end namespace nana +#include + #endif diff --git a/include/nana/gui/widgets/toolbar.hpp b/include/nana/gui/widgets/toolbar.hpp index 8a4d3a40..24f27b32 100644 --- a/include/nana/gui/widgets/toolbar.hpp +++ b/include/nana/gui/widgets/toolbar.hpp @@ -12,6 +12,7 @@ #ifndef NANA_GUI_WIDGET_TOOLBAR_HPP #define NANA_GUI_WIDGET_TOOLBAR_HPP +#include #include "widget.hpp" @@ -101,4 +102,6 @@ namespace nana bool detached_; }; }//end namespace nana +#include + #endif diff --git a/include/nana/gui/widgets/treebox.hpp b/include/nana/gui/widgets/treebox.hpp index 487812ea..69477824 100644 --- a/include/nana/gui/widgets/treebox.hpp +++ b/include/nana/gui/widgets/treebox.hpp @@ -17,6 +17,8 @@ #ifndef NANA_GUI_WIDGETS_TREEBOX_HPP #define NANA_GUI_WIDGETS_TREEBOX_HPP + +#include #include "widget.hpp" #include "detail/compset.hpp" #include "detail/tree_cont.hpp" @@ -452,4 +454,6 @@ namespace nana item_proxy selected() const; ///< returns the selected node };//end class treebox }//end namespace nana +#include + #endif diff --git a/include/nana/gui/widgets/widget.hpp b/include/nana/gui/widgets/widget.hpp index 1fdb48fa..5caa7510 100644 --- a/include/nana/gui/widgets/widget.hpp +++ b/include/nana/gui/widgets/widget.hpp @@ -12,6 +12,8 @@ #ifndef NANA_GUI_WIDGET_HPP #define NANA_GUI_WIDGET_HPP + +#include #include "../basis.hpp" #include "../programming_interface.hpp" #include @@ -524,4 +526,6 @@ namespace nana std::unique_ptr scheme_; };//end class widget_object }//end namespace nana + +#include #endif diff --git a/include/nana/gui/wvl.hpp b/include/nana/gui/wvl.hpp index 4da60f25..0500a6a0 100644 --- a/include/nana/gui/wvl.hpp +++ b/include/nana/gui/wvl.hpp @@ -15,7 +15,6 @@ #ifndef NANA_GUI_WVL_HPP #define NANA_GUI_WVL_HPP - #include "programming_interface.hpp" #include "screen.hpp" #include "widgets/form.hpp" diff --git a/include/nana/pat/cloneable.hpp b/include/nana/pat/cloneable.hpp index cf3d9d81..7cff2638 100644 --- a/include/nana/pat/cloneable.hpp +++ b/include/nana/pat/cloneable.hpp @@ -13,6 +13,7 @@ #ifndef NANA_PAT_CLONEABLE_HPP #define NANA_PAT_CLONEABLE_HPP +#include #include #include #include @@ -96,10 +97,15 @@ namespace nana{ namespace pat{ typedef int inner_bool::* operator_bool_t; + /* template - struct member_enabled + struct member_enabled //deprecated : public std::enable_if<(!std::is_base_of::type>::value) && std::is_base_of::type>::value, int> {}; + */ + + template + using member_enabled = std::enable_if<(!std::is_base_of::type>::value) && std::is_base_of::type>::value, int>; public: cloneable() noexcept = default; @@ -207,5 +213,5 @@ namespace nana{ namespace pat{ using mutable_cloneable = cloneable; }//end namespace pat }//end namespace nana - +#include #endif diff --git a/include/nana/pop_ignore_diagnostic b/include/nana/pop_ignore_diagnostic new file mode 100644 index 00000000..23c39a69 --- /dev/null +++ b/include/nana/pop_ignore_diagnostic @@ -0,0 +1,5 @@ + +#if (__GNUC__ >= 4) && (__GNUC_MINOR__ >= 6) +# pragma GCC diagnostic pop +#endif + diff --git a/include/nana/push_ignore_diagnostic b/include/nana/push_ignore_diagnostic new file mode 100644 index 00000000..9ba463ad --- /dev/null +++ b/include/nana/push_ignore_diagnostic @@ -0,0 +1,4 @@ +#if (__GNUC__ >= 4) && (__GNUC_MINOR__ >= 6) +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Weffc++" +#endif diff --git a/include/nana/unicode_bidi.hpp b/include/nana/unicode_bidi.hpp index 766edf46..71a5f882 100644 --- a/include/nana/unicode_bidi.hpp +++ b/include/nana/unicode_bidi.hpp @@ -1,6 +1,8 @@ #ifndef NANA_UNICODE_BIDI_HPP #define NANA_UNICODE_BIDI_HPP #include +#include + namespace nana { @@ -71,5 +73,6 @@ namespace nana }; } +#include #endif diff --git a/source/audio/player.cpp b/source/audio/player.cpp index e86f1798..5ede06a4 100644 --- a/source/audio/player.cpp +++ b/source/audio/player.cpp @@ -1,5 +1,8 @@ + +#include #include + #ifdef NANA_ENABLE_AUDIO #include @@ -67,4 +70,4 @@ namespace nana{ namespace audio }//end namespace audio }//end namespace nana -#endif //NANA_ENABLE_AUDIO \ No newline at end of file +#endif //NANA_ENABLE_AUDIO diff --git a/source/charset.cpp b/source/charset.cpp index ddf7207f..686f8182 100644 --- a/source/charset.cpp +++ b/source/charset.cpp @@ -344,11 +344,11 @@ namespace nana { public: charset_string(const std::string& s) - : data_(s), is_unicode_(false) + : data_(s) {} charset_string(std::string&& s) - : data_(std::move(s)), is_unicode_(false) + : data_(std::move(s)) {} charset_string(const std::string& s, unicode encoding) @@ -501,9 +501,9 @@ namespace nana } private: std::string data_; - std::wstring wdata_for_move_; - bool is_unicode_; - unicode utf_x_; + std::wstring wdata_for_move_{}; + bool is_unicode_{ false }; + unicode utf_x_{ unicode::utf8 }; }; class charset_wstring @@ -950,11 +950,11 @@ namespace nana { public: charset_string(const std::string& s) - : data_(s), is_unicode_(false) + : data_(s) {} charset_string(std::string&& s) - : data_(std::move(s)), is_unicode_(false) + : data_(std::move(s)) {} charset_string(const std::string& s, unicode encoding) @@ -1122,9 +1122,9 @@ namespace nana } private: std::string data_; - std::wstring wdata_for_move_; - bool is_unicode_; - unicode utf_x_; + std::wstring wdata_for_move_{}; + bool is_unicode_{ false }; + unicode utf_x_{ unicode::utf8 }; }; @@ -1195,7 +1195,7 @@ namespace nana } private: std::wstring data_; - std::string data_for_move_; + std::string data_for_move_{}; }; #endif } diff --git a/source/datetime.cpp b/source/datetime.cpp index 849ec940..21cfe962 100644 --- a/source/datetime.cpp +++ b/source/datetime.cpp @@ -17,62 +17,65 @@ #include namespace { - void localtime(struct tm& tm) + std::tm localtime() { #if defined(NANA_WINDOWS) && !defined(NANA_MINGW) time_t t; ::time(&t); + std::tm tm; if(localtime_s(&tm, &t) != 0) - { assert(false); - } + + return tm; #else time_t t = std::time(nullptr); struct tm * tm_addr = std::localtime(&t); assert(tm_addr); - tm = *tm_addr; + + return *tm_addr; #endif } + + ::nana::date::value to_dateval(const std::tm& t) + { + return {static_cast(t.tm_year + 1900), static_cast(t.tm_mon + 1), static_cast(t.tm_mday)}; + } + + ::nana::time::value to_timeval(const std::tm& t) + { + return {static_cast(t.tm_hour), static_cast(t.tm_min), static_cast(t.tm_sec)}; + } + } // namespace anonymous namespace nana { - //class date + //class date void date::set(const std::tm& t) { - value_.year = t.tm_year + 1900; - value_.month = t.tm_mon + 1; - value_.day = t.tm_mday; + value_ = to_dateval(t); } date::date() + : value_(to_dateval(*std::localtime(nullptr))) { - struct tm t; - localtime(t); - set(t); } date::date(const std::tm& t) + : value_(to_dateval(t)) { - set(t); } date::date(int year, int month, int day) + : value_({static_cast(year), static_cast(month), static_cast(day)}) { if(1601 <= year && year < 30827 && 0 < month && month < 13 && day > 0) { if(day <= static_cast(date::month_days(year, month))) - { - value_.year = year; - value_.month = month; - value_.day = day; return; - } } - struct tm t; - localtime(t); - set(t); + set(localtime()); } date date::operator - (int off) const @@ -258,40 +261,27 @@ namespace nana //class time void time::set(const std::tm& t) { - value_.hour = t.tm_hour; - value_.minute = t.tm_min; - value_.second = t.tm_sec; + value_ = to_timeval(t); } time::time() - : value_{} + : value_(to_timeval(localtime())) { - struct tm t; - localtime(t); - set(t); } time::time(const std::tm& t) + : value_(to_timeval(t)) { - value_.hour = t.tm_hour; - value_.minute = t.tm_min; - value_.second = t.tm_sec; } time::time(unsigned hour, unsigned minute, unsigned second) + : value_({hour, minute, second}) { if(hour < 24 && minute < 60 && second < 62) - { - value_.hour = hour; - value_.minute = minute; - value_.second = second; return; - } - struct tm t; - localtime(t); - set(t); - } + set(localtime()); + } const time::value& time::read() const { return value_; diff --git a/source/detail/platform_spec_posix.cpp b/source/detail/platform_spec_posix.cpp index accaeed2..a2121991 100644 --- a/source/detail/platform_spec_posix.cpp +++ b/source/detail/platform_spec_posix.cpp @@ -16,6 +16,9 @@ #include #if defined(NANA_POSIX) && defined(NANA_X11) + +#include + #include #include #include @@ -1414,4 +1417,6 @@ namespace detail } }//end namespace detail }//end namespace nana + +#include #endif //NANA_POSIX && NANA_X11 diff --git a/source/gui/detail/basic_window.cpp b/source/gui/detail/basic_window.cpp index 9c1a5ae0..693a9bf7 100644 --- a/source/gui/detail/basic_window.cpp +++ b/source/gui/detail/basic_window.cpp @@ -207,10 +207,10 @@ namespace nana { switch(categ) { - case category::root_tag::value: + case category::flags::root: attribute.root = new attr_root_tag; break; - case category::frame_tag::value: + case category::flags::frame: attribute.frame = new attr_frame_tag; break; default: @@ -222,10 +222,10 @@ namespace nana { switch(category) { - case category::root_tag::value: + case category::flags::root: delete attribute.root; break; - case category::frame_tag::value: + case category::flags::frame: delete attribute.frame; break; default: break; @@ -236,7 +236,7 @@ namespace nana //basic_window //@brief: constructor for the root window basic_window::basic_window(basic_window* owner, std::unique_ptr&& wdg_notifier, category::root_tag**) - : widget_notifier(std::move(wdg_notifier)), other(category::root_tag::value) + : widget_notifier(std::move(wdg_notifier)), other(category::flags::root) { drawer.bind(this); _m_init_pos_and_size(nullptr, rectangle()); @@ -256,7 +256,7 @@ namespace nana //@brief: bind a native window and baisc_window void basic_window::bind_native_window(native_window_type wd, unsigned width, unsigned height, unsigned extra_width, unsigned extra_height, nana::paint::graphics& graphics) { - if(category::root_tag::value == this->other.category) + if(category::flags::root == this->other.category) { this->root = wd; dimension.width = width; @@ -270,7 +270,7 @@ namespace nana void basic_window::frame_window(native_window_type wd) { - if(category::frame_tag::value == this->other.category) + if(category::flags::frame == this->other.category) other.attribute.frame->container = wd; } @@ -357,12 +357,12 @@ namespace nana void basic_window::_m_initialize(basic_window* agrparent) { - if(other.category == category::root_tag::value) + if(category::flags::root == other.category) { if(agrparent && (nana::system::this_thread_id() != agrparent->thread_id)) agrparent = nullptr; - while(agrparent && (agrparent->other.category != category::root_tag::value)) + while(agrparent && (category::flags::root != agrparent->other.category)) agrparent = agrparent->parent; owner = agrparent; diff --git a/source/gui/detail/window_layout.cpp b/source/gui/detail/window_layout.cpp index d2556323..10a94e4d 100644 --- a/source/gui/detail/window_layout.cpp +++ b/source/gui/detail/window_layout.cpp @@ -53,7 +53,7 @@ namespace nana //get the root graphics auto& graph = *(wd->root_graph); - if (wd->other.category != category::lite_widget_tag::value) + if (category::flags::lite_widget != wd->other.category) graph.bitblt(vr, wd->drawer.graphics, nana::point(vr.x - wd->pos_root.x, vr.y - wd->pos_root.y)); _m_paste_children(wd, is_child_refreshed, have_refreshed, vr, graph, nana::point()); @@ -66,7 +66,7 @@ namespace nana nana::point p_src; for (auto & el : blocks) { - if (el.window->other.category == category::frame_tag::value) + if (category::flags::frame == el.window->other.category) { native_window_type container = el.window->other.attribute.frame->container; native_interface::refresh_window(container); @@ -158,7 +158,7 @@ namespace nana bool window_layout::enable_effects_bground(core_window_t * wd, bool enabled) { - if (wd->other.category != category::widget_tag::value) + if (category::flags::widget != wd->other.category) return false; if (false == enabled) @@ -199,11 +199,11 @@ namespace nana nana::point rpos{ wd->pos_root }; auto & glass_buffer = wd->other.glass_buffer; - if (wd->parent->other.category == category::lite_widget_tag::value) + if (category::flags::lite_widget == wd->parent->other.category) { std::vector layers; core_window_t * beg = wd->parent; - while (beg && (beg->other.category == category::lite_widget_tag::value)) + while (beg && (category::flags::lite_widget == beg->other.category)) { layers.push_back(beg); beg = beg->parent; @@ -229,7 +229,7 @@ namespace nana nana::rectangle ovlp; if (child->visible && overlap(r, rectangle(child->pos_owner, child->dimension), ovlp)) { - if (child->other.category != category::lite_widget_tag::value) + if (category::flags::lite_widget != child->other.category) glass_buffer.bitblt(nana::rectangle(ovlp.x - pre->pos_owner.x, ovlp.y - pre->pos_owner.y, ovlp.width, ovlp.height), child->drawer.graphics, nana::point(ovlp.x - child->pos_owner.x, ovlp.y - child->pos_owner.y)); ovlp.x += pre->pos_root.x; ovlp.y += pre->pos_root.y; @@ -250,7 +250,7 @@ namespace nana nana::rectangle ovlp; if (child->visible && overlap(r_of_wd, rectangle{ child->pos_owner, child->dimension }, ovlp)) { - if (child->other.category != category::lite_widget_tag::value) + if (category::flags::lite_widget != child->other.category) glass_buffer.bitblt(nana::rectangle{ ovlp.x - wd->pos_owner.x, ovlp.y - wd->pos_owner.y, ovlp.width, ovlp.height }, child->drawer.graphics, nana::point(ovlp.x - child->pos_owner.x, ovlp.y - child->pos_owner.y)); ovlp.x += wd->pos_root.x; @@ -285,7 +285,7 @@ namespace nana if (overlap(nana::rectangle{ child->pos_root, child->dimension }, parent_rect, rect)) { bool have_child_refreshed = false; - if (child->other.category != category::lite_widget_tag::value) + if (category::flags::lite_widget != child->other.category) { if (is_child_refreshed && (false == child->flags.refreshing)) { diff --git a/source/gui/detail/window_manager.cpp b/source/gui/detail/window_manager.cpp index 6096d543..66d0def6 100644 --- a/source/gui/detail/window_manager.cpp +++ b/source/gui/detail/window_manager.cpp @@ -312,7 +312,7 @@ namespace detail wd->bind_native_window(result.native_handle, result.width, result.height, result.extra_width, result.extra_height, value->root_graph); impl_->wd_register.insert(wd, wd->thread_id); - if (owner && owner->other.category == category::frame_tag::value) + if (owner && (category::flags::frame == owner->other.category)) insert_frame(owner, wd); bedrock::inc_window(wd->thread_id); @@ -344,7 +344,7 @@ namespace detail { //Thread-Safe Required! std::lock_guard lock(mutex_); - if(frame->other.category == category::frame_tag::value) + if(category::flags::frame == frame->other.category) frame->other.attribute.frame->attach.push_back(wd); return true; } @@ -357,9 +357,9 @@ namespace detail { //Thread-Safe Required! std::lock_guard lock(mutex_); - if(frame->other.category == category::frame_tag::value) + if(category::flags::frame == frame->other.category) { - if (impl_->wd_register.available(wd) && wd->other.category == category::root_tag::value && wd->root != frame->root) + if (impl_->wd_register.available(wd) && (category::flags::root == wd->other.category) && wd->root != frame->root) { frame->other.attribute.frame->attach.push_back(wd->root); return true; @@ -399,7 +399,7 @@ namespace detail if (wd->flags.destroying) return; - if(wd->other.category == category::root_tag::value) + if(category::flags::root == wd->other.category) { auto &brock = bedrock::instance(); arg_unload arg; @@ -464,7 +464,7 @@ namespace detail std::lock_guard lock(mutex_); if (impl_->wd_register.available(wd) == false) return; - if((wd->other.category == category::root_tag::value) || (wd->other.category != category::frame_tag::value)) + if((category::flags::root == wd->other.category) || (category::flags::frame != wd->other.category)) { impl_->misc_register.erase(wd->root); impl_->wd_register.remove(wd); @@ -484,7 +484,7 @@ namespace detail std::lock_guard lock(mutex_); if (impl_->wd_register.available(wd)) { - if(wd->other.category == category::root_tag::value) + if(category::flags::root == wd->other.category) native_interface::window_icon(wd->root, small_icon, big_icon); } } @@ -504,9 +504,9 @@ namespace detail native_window_type nv = nullptr; switch(wd->other.category) { - case category::root_tag::value: + case category::flags::root: nv = wd->root; break; - case category::frame_tag::value: + case category::flags::frame: nv = wd->other.attribute.frame->container; break; default: //category::widget_tag, category::lite_widget_tag break; @@ -703,7 +703,7 @@ namespace detail wd->dimension = sz; - if(category::lite_widget_tag::value != wd->other.category) + if(category::flags::lite_widget != wd->other.category) { bool graph_state = wd->drawer.graphics.empty(); wd->drawer.graphics.make(sz); @@ -714,13 +714,13 @@ namespace detail if(graph_state != wd->drawer.graphics.empty()) wd->drawer.typeface_changed(); - if(category::root_tag::value == wd->other.category) + if(category::flags::root == wd->other.category) { wd->root_graph->make(sz); if(false == passive) native_interface::window_size(wd->root, sz + nana::size(wd->extra_width, wd->extra_height)); } - else if(category::frame_tag::value == wd->other.category) + else if(category::flags::frame == wd->other.category) { native_interface::window_size(wd->other.attribute.frame->container, sz); for(auto natwd : wd->other.attribute.frame->attach) @@ -850,6 +850,9 @@ namespace detail { window_layer::paint(wd, false, refresh_tree); this->map(wd, force_copy_to_screen); + + wd->drawer.graphics.save_as_file("d:\\button.bmp"); + wd->root_graph->save_as_file("d:\\button_root.bmp"); } else if (effects::edge_nimbus::none != wd->effect.edge_nimbus) { @@ -1379,7 +1382,7 @@ namespace detail root_attr->menubar = nullptr; } - if (wd->other.category == category::root_tag::value) + if (wd->other.category == category::flags::root) { root_runtime(wd->root)->shortkeys.clear(); wd->other.attribute.root->focus = nullptr; @@ -1459,7 +1462,7 @@ namespace detail } } - if (wd->other.category == category::frame_tag::value) + if (category::flags::frame == wd->other.category) { //remove the frame handle from the WM frames manager. utl::erase(root_attr->frames, wd); @@ -1565,7 +1568,7 @@ namespace detail wd->drawer.detached(); wd->widget_notifier->destroy(); - if(wd->other.category == category::frame_tag::value) + if(category::flags::frame == wd->other.category) { //The frame widget does not have an owner, and close their element windows without activating owner. //close the frame container window, it's a native window. @@ -1616,7 +1619,7 @@ namespace detail for(auto i = wd->children.rbegin(); i != wd->children.rend(); ++i) { core_window_t* child = *i; - if((child->other.category != category::root_tag::value) && _m_effective(child, pos)) + if((child->other.category != category::flags::root) && _m_effective(child, pos)) { child = _m_find(child, pos); if(child) diff --git a/source/gui/place.cpp b/source/gui/place.cpp index e712b063..c8e6ea9e 100644 --- a/source/gui/place.cpp +++ b/source/gui/place.cpp @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include @@ -2851,3 +2852,5 @@ namespace nana } //end class place }//end namespace nana + +#include diff --git a/source/internationalization.cpp b/source/internationalization.cpp index 1210826e..8ac35899 100644 --- a/source/internationalization.cpp +++ b/source/internationalization.cpp @@ -10,6 +10,8 @@ * @file: nana/internationalization.cpp */ +#include + #include #include #include @@ -513,3 +515,5 @@ namespace nana } //end class i18n_eval } + +#include diff --git a/source/paint/detail/image_process_provider.cpp b/source/paint/detail/image_process_provider.cpp index 1c0c61ab..414d68dc 100644 --- a/source/paint/detail/image_process_provider.cpp +++ b/source/paint/detail/image_process_provider.cpp @@ -1,3 +1,4 @@ +#include #include #include diff --git a/source/paint/image.cpp b/source/paint/image.cpp index 3d23e3f5..529c5c44 100644 --- a/source/paint/image.cpp +++ b/source/paint/image.cpp @@ -11,7 +11,7 @@ * @contributors: * nabijaczleweli(pr#106) */ - +#include #include #include #include diff --git a/source/paint/image_process_selector.cpp b/source/paint/image_process_selector.cpp index f95ab20e..9dc76e23 100644 --- a/source/paint/image_process_selector.cpp +++ b/source/paint/image_process_selector.cpp @@ -1,3 +1,4 @@ +#include #include namespace nana