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

Merge remote-tracking branch 'cnjinhao/hotfix-1.3' into hotfix-1.3

Browse Source
This commit is contained in:
qPCR4vir 2016-03-18 22:25:43 +01:00
commit d2b08d0f26
66 changed files with 280 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/nana/audio/player.hpp
View File

@ -1,6 +1,6 @@
#ifndef NANA_AUDIO_PLAYER_HPP #ifndef NANA_AUDIO_PLAYER_HPP
#define NANA_AUDIO_PLAYER_HPP #define NANA_AUDIO_PLAYER_HPP
#include <nana/push_ignore_diagnostic>
#include <nana/deploy.hpp> #include <nana/deploy.hpp>
#ifdef NANA_ENABLE_AUDIO #ifdef NANA_ENABLE_AUDIO
@ -31,4 +31,7 @@ namespace nana{ namespace audio
}//end namespace nana }//end namespace nana
#endif //NANA_ENABLE_AUDIO #endif //NANA_ENABLE_AUDIO
#endif
#include <nana/pop_ignore_diagnostic>
#endif

3
include/nana/basic_types.hpp
View File

@ -15,6 +15,7 @@
#include <nana/deploy.hpp> #include <nana/deploy.hpp>
#include <cctype> #include <cctype>
#include <nana/push_ignore_diagnostic>
namespace nana namespace nana
{ {
@ -484,7 +485,7 @@ namespace nana
southeast southeast
}; };
}//end namespace nana }//end namespace nana
#include <nana/pop_ignore_diagnostic>
#endif #endif

6
include/nana/c++defines.hpp
View File

@ -137,11 +137,11 @@
#if ((__GNUC__ < 5) ) #if ((__GNUC__ < 5) )
# define STD_put_time_NOT_SUPPORTED # 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 # undef STD_FILESYSTEM_NOT_SUPPORTED
#endif #endif
#if (__GNUC__ == 4) #if (__GNUC__ == 4)
#if ((__GNUC_MINOR__ < 8) || (__GNUC_MINOR__ == 8 && __GNUC_PATCHLEVEL__ < 1)) #if ((__GNUC_MINOR__ < 8) || (__GNUC_MINOR__ == 8 && __GNUC_PATCHLEVEL__ < 1))

5
include/nana/deploy.hpp
View File

@ -14,6 +14,7 @@
#ifndef NANA_DEPLOY_HPP #ifndef NANA_DEPLOY_HPP
#define NANA_DEPLOY_HPP #define NANA_DEPLOY_HPP
#include <nana/push_ignore_diagnostic>
#include <nana/config.hpp> #include <nana/config.hpp>
#if defined(VERBOSE_PREPROCESSOR) #if defined(VERBOSE_PREPROCESSOR)
@ -215,5 +216,5 @@ namespace std {
make_unique(Args&&...) = delete; make_unique(Args&&...) = delete;
} }
#endif //STD_make_unique_NOT_SUPPORTED #endif //STD_make_unique_NOT_SUPPORTED
#include <nana/pop_ignore_diagnostic>
#endif //NANA_MACROS_HPP #endif //NANA_DEPLOY_HPP

9
include/nana/detail/linux_X11/platform_spec.hpp
View File

@ -18,6 +18,8 @@
#ifndef NANA_DETAIL_PLATFORM_SPEC_HPP #ifndef NANA_DETAIL_PLATFORM_SPEC_HPP
#define NANA_DETAIL_PLATFORM_SPEC_HPP #define NANA_DETAIL_PLATFORM_SPEC_HPP
#include <nana/push_ignore_diagnostic>
#include <thread> #include <thread>
#include <mutex> #include <mutex>
#include <memory> #include <memory>
@ -193,8 +195,8 @@ namespace detail
native_window_type owner; native_window_type owner;
std::vector<native_window_type> * owned; std::vector<native_window_type> * owned;
}; };
public: public:
int error_code; int error_code;
public: public:
typedef drawable_impl_type::font_ptr_t font_ptr_t; typedef drawable_impl_type::font_ptr_t font_ptr_t;
typedef void (*timer_proc_type)(unsigned tid); typedef void (*timer_proc_type)(unsigned tid);
@ -202,6 +204,8 @@ namespace detail
typedef ::nana::event_code event_code; typedef ::nana::event_code event_code;
typedef ::nana::native_window_type native_window_type; 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();
~platform_spec(); ~platform_spec();
@ -332,6 +336,7 @@ namespace detail
}//end namespace nana }//end namespace nana
#include <nana/pop_ignore_diagnostic>
// .h ward // .h ward
#endif #endif

3
include/nana/detail/win32/platform_spec.hpp
View File

@ -142,6 +142,9 @@ namespace detail
unsigned whitespace_pixels; unsigned whitespace_pixels;
}string; }string;
drawable_impl_type(const drawable_impl_type&) = delete;
drawable_impl_type& operator=(const drawable_impl_type&) = delete;
drawable_impl_type(); drawable_impl_type();
~drawable_impl_type(); ~drawable_impl_type();

4
include/nana/filesystem/filesystem.hpp
View File

@ -29,6 +29,9 @@
#ifndef NANA_FILESYSTEM_HPP #ifndef NANA_FILESYSTEM_HPP
#define NANA_FILESYSTEM_HPP #define NANA_FILESYSTEM_HPP
#include <nana/push_ignore_diagnostic>
#include <string> #include <string>
#include <system_error> #include <system_error>
#include <iterator> #include <iterator>
@ -409,4 +412,5 @@ namespace nana { namespace experimental { namespace filesystem
//namespace filesystem = experimental::filesystem; //namespace filesystem = experimental::filesystem;
} //end namespace nana } //end namespace nana
#include <nana/pop_ignore_diagnostic>
#endif #endif

3
include/nana/gui/animation.hpp
View File

@ -12,7 +12,7 @@
#ifndef NANA_GUI_ANIMATION_HPP #ifndef NANA_GUI_ANIMATION_HPP
#define NANA_GUI_ANIMATION_HPP #define NANA_GUI_ANIMATION_HPP
#include <nana/push_ignore_diagnostic>
#include <nana/paint/image.hpp> #include <nana/paint/image.hpp>
#include <functional> #include <functional>
@ -82,4 +82,5 @@ namespace nana
impl * impl_; impl * impl_;
}; };
} //end namespace nana } //end namespace nana
#include <nana/pop_ignore_diagnostic>
#endif //NANA_GUI_ANIMATION_HPP #endif //NANA_GUI_ANIMATION_HPP

10
include/nana/gui/basis.hpp
View File

@ -15,6 +15,8 @@
#ifndef NANA_GUI_BASIS_HPP #ifndef NANA_GUI_BASIS_HPP
#define NANA_GUI_BASIS_HPP #define NANA_GUI_BASIS_HPP
#include <nana/push_ignore_diagnostic>
#include "../basic_types.hpp" #include "../basic_types.hpp"
#include "../traits.hpp" //metacomp::fixed_type_set #include "../traits.hpp" //metacomp::fixed_type_set
@ -59,9 +61,9 @@ namespace nana
}; };
//wait for constexpr //wait for constexpr
struct widget_tag{ static const flags value = flags::widget; }; struct widget_tag{ static const flags value = flags::widget; };
struct lite_widget_tag : widget_tag{ static const flags value = flags::lite_widget;}; struct lite_widget_tag : public widget_tag{ static const flags value = flags::lite_widget; };
struct root_tag : widget_tag{ static const flags value = flags::root; }; struct root_tag : public widget_tag{ static const flags value = flags::root; };
struct frame_tag: widget_tag{ static const flags value = flags::frame; }; struct frame_tag : public widget_tag{ static const flags value = flags::frame; };
}// end namespace category }// end namespace category
using native_window_type = detail::native_window_handle_impl*; 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 apper
}//end namespace nana }//end namespace nana
#include <nana/pop_ignore_diagnostic>
#endif #endif

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

@ -12,6 +12,7 @@
#ifndef NANA_GUI_DETAIL_BASIC_WINDOW_HPP #ifndef NANA_GUI_DETAIL_BASIC_WINDOW_HPP
#define NANA_GUI_DETAIL_BASIC_WINDOW_HPP #define NANA_GUI_DETAIL_BASIC_WINDOW_HPP
#include <nana/push_ignore_diagnostic>
#include "drawer.hpp" #include "drawer.hpp"
#include "events_holder.hpp" #include "events_holder.hpp"
#include "widget_colors.hpp" #include "widget_colors.hpp"
@ -237,5 +238,6 @@ namespace detail
}//end namespace detail }//end namespace detail
}//end namespace nana }//end namespace nana
#include <nana/pop_ignore_diagnostic>
#endif #endif

3
include/nana/gui/detail/bedrock.hpp
View File

@ -33,6 +33,9 @@ namespace detail
class bedrock class bedrock
{ {
bedrock(); bedrock();
bedrock(const bedrock&) = delete;
bedrock& operator=(const bedrock&) = delete;
public: public:
using core_window_t = basic_window; using core_window_t = basic_window;

5
include/nana/gui/detail/bedrock_pi_data.hpp
View File

@ -1,6 +1,8 @@
#ifndef NANA_DETAIL_BEDROCK_PI_DATA_HPP #ifndef NANA_DETAIL_BEDROCK_PI_DATA_HPP
#define NANA_DETAIL_BEDROCK_PI_DATA_HPP #define NANA_DETAIL_BEDROCK_PI_DATA_HPP
#include <nana/push_ignore_diagnostic>
#include <nana/gui/detail/bedrock.hpp> #include <nana/gui/detail/bedrock.hpp>
#include "color_schemes.hpp" #include "color_schemes.hpp"
#include "events_operation.hpp" #include "events_operation.hpp"
@ -20,4 +22,7 @@ namespace nana
}; };
} }
} }
#include <nana/pop_ignore_diagnostic>
#endif #endif

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

@ -13,6 +13,7 @@
#ifndef NANA_GUI_DETAIL_DRAWER_HPP #ifndef NANA_GUI_DETAIL_DRAWER_HPP
#define NANA_GUI_DETAIL_DRAWER_HPP #define NANA_GUI_DETAIL_DRAWER_HPP
#include <nana/push_ignore_diagnostic>
#include <vector> #include <vector>
#include "general_events.hpp" #include "general_events.hpp"
#include <nana/paint/graphics.hpp> #include <nana/paint/graphics.hpp>
@ -170,4 +171,6 @@ namespace nana
}//end namespace detail }//end namespace detail
}//end namespace nana }//end namespace nana
#include <nana/pop_ignore_diagnostic>
#endif #endif

5
include/nana/gui/detail/element_store.hpp
View File

@ -15,9 +15,13 @@
#include <nana/gui/element.hpp> #include <nana/gui/element.hpp>
#include <nana/pat/cloneable.hpp> #include <nana/pat/cloneable.hpp>
#include <map> #include <map>
#include <string> #include <string>
#include <nana/push_ignore_diagnostic>
namespace nana namespace nana
{ {
namespace detail namespace detail
@ -48,5 +52,6 @@ namespace detail
}; };
}//end namespace detail }//end namespace detail
} }
#include <nana/pop_ignore_diagnostic>
#endif #endif

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

@ -12,6 +12,8 @@
#ifndef NANA_DETAIL_GENERAL_EVENTS_HPP #ifndef NANA_DETAIL_GENERAL_EVENTS_HPP
#define NANA_DETAIL_GENERAL_EVENTS_HPP #define NANA_DETAIL_GENERAL_EVENTS_HPP
#include <nana/push_ignore_diagnostic>
#include <nana/gui/basis.hpp> #include <nana/gui/basis.hpp>
#include "event_code.hpp" #include "event_code.hpp"
#include "internal_scope_guard.hpp" #include "internal_scope_guard.hpp"
@ -576,4 +578,6 @@ namespace nana
}//end namespace detail }//end namespace detail
}//end namespace nana }//end namespace nana
#include <nana/pop_ignore_diagnostic>
#endif #endif

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

@ -25,6 +25,8 @@
#include <map> #include <map>
#include <iterator> #include <iterator>
#include <nana/push_ignore_diagnostic>
namespace nana namespace nana
{ {
@ -288,4 +290,6 @@ namespace nana
};//end class handle_manager };//end class handle_manager
}//end namespace detail }//end namespace detail
}// end namespace nana }// end namespace nana
#include <nana/pop_ignore_diagnostic>
#endif #endif

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

@ -14,6 +14,7 @@
#ifndef NANA_GUI_INNER_FWD_IMPLEMENT_HPP #ifndef NANA_GUI_INNER_FWD_IMPLEMENT_HPP
#define NANA_GUI_INNER_FWD_IMPLEMENT_HPP #define NANA_GUI_INNER_FWD_IMPLEMENT_HPP
#include <nana/push_ignore_diagnostic>
#include "inner_fwd.hpp" #include "inner_fwd.hpp"
#include "basic_window.hpp" #include "basic_window.hpp"
#include "../../paint/graphics.hpp" #include "../../paint/graphics.hpp"
@ -172,4 +173,7 @@ namespace nana{
}; };
} }
}//end namespace nana }//end namespace nana
#include <nana/pop_ignore_diagnostic>
#endif //NANA_GUI_INNER_FWD_IMPLEMENT_HPP #endif //NANA_GUI_INNER_FWD_IMPLEMENT_HPP

3
include/nana/gui/detail/window_layout.hpp
View File

@ -12,6 +12,7 @@
#ifndef NANA_GUI_DETAIL_WINDOW_LAYOUT_HPP #ifndef NANA_GUI_DETAIL_WINDOW_LAYOUT_HPP
#define NANA_GUI_DETAIL_WINDOW_LAYOUT_HPP #define NANA_GUI_DETAIL_WINDOW_LAYOUT_HPP
#include <nana/push_ignore_diagnostic>
#include <nana/gui/basis.hpp> #include <nana/gui/basis.hpp>
#include <vector> #include <vector>
@ -84,5 +85,7 @@ namespace detail
}//end namespace detail }//end namespace detail
}//end namespace nana }//end namespace nana
#include <nana/pop_ignore_diagnostic>
#endif //NANA_GUI_DETAIL_WINDOW_LAYOUT_HPP #endif //NANA_GUI_DETAIL_WINDOW_LAYOUT_HPP

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

@ -18,6 +18,8 @@
#ifndef NANA_GUI_DETAIL_WINDOW_MANAGER_HPP #ifndef NANA_GUI_DETAIL_WINDOW_MANAGER_HPP
#define NANA_GUI_DETAIL_WINDOW_MANAGER_HPP #define NANA_GUI_DETAIL_WINDOW_MANAGER_HPP
#include <nana/push_ignore_diagnostic>
#include <vector> #include <vector>
#include "window_layout.hpp" #include "window_layout.hpp"
#include "event_code.hpp" #include "event_code.hpp"
@ -195,4 +197,7 @@ namespace detail
};//end class window_manager };//end class window_manager
}//end namespace detail }//end namespace detail
}//end namespace nana }//end namespace nana
#include <nana/pop_ignore_diagnostic>
#endif #endif

2
include/nana/gui/dragger.hpp
View File

@ -12,6 +12,7 @@
#ifndef NANA_GUI_DRAGGER_HPP #ifndef NANA_GUI_DRAGGER_HPP
#define NANA_GUI_DRAGGER_HPP #define NANA_GUI_DRAGGER_HPP
#include <nana/push_ignore_diagnostic>
#include "basis.hpp" #include "basis.hpp"
#include "../basic_types.hpp" #include "../basic_types.hpp"
#include "../traits.hpp" #include "../traits.hpp"
@ -44,4 +45,5 @@ namespace nana
dragger_impl_t * impl_; dragger_impl_t * impl_;
}; };
}//end namespace nana }//end namespace nana
#include <nana/pop_ignore_diagnostic>
#endif #endif

4
include/nana/gui/drawing.hpp
View File

@ -11,6 +11,8 @@
*/ */
#ifndef NANA_GUI_DRAWING_HPP #ifndef NANA_GUI_DRAWING_HPP
#define NANA_GUI_DRAWING_HPP #define NANA_GUI_DRAWING_HPP
#include <nana/push_ignore_diagnostic>
#include "widgets/widget.hpp" #include "widgets/widget.hpp"
#include "../traits.hpp" #include "../traits.hpp"
namespace nana namespace nana
@ -46,4 +48,6 @@ namespace nana
window handle_; window handle_;
};//end class drawing };//end class drawing
}//end namespace nana }//end namespace nana
#include <nana/pop_ignore_diagnostic>
#endif #endif

2
include/nana/gui/element.hpp
View File

@ -12,6 +12,7 @@
#ifndef NANA_GUI_ELEMENT_HPP #ifndef NANA_GUI_ELEMENT_HPP
#define NANA_GUI_ELEMENT_HPP #define NANA_GUI_ELEMENT_HPP
#include <nana/push_ignore_diagnostic>
#include <nana/paint/graphics.hpp> #include <nana/paint/graphics.hpp>
#include <nana/pat/cloneable.hpp> #include <nana/pat/cloneable.hpp>
#include <vector> #include <vector>
@ -349,4 +350,5 @@ namespace nana
}//end namespace element }//end namespace element
}//end namespace nana }//end namespace nana
#include <nana/pop_ignore_diagnostic>
#endif //NANA_GUI_ELEMENT_HPP #endif //NANA_GUI_ELEMENT_HPP

2
include/nana/gui/msgbox.hpp
View File

@ -12,6 +12,7 @@
#ifndef NANA_GUI_MSGBOX_HPP #ifndef NANA_GUI_MSGBOX_HPP
#define NANA_GUI_MSGBOX_HPP #define NANA_GUI_MSGBOX_HPP
#include <nana/push_ignore_diagnostic>
#include <sstream> #include <sstream>
@ -253,5 +254,6 @@ namespace nana
::nana::rectangle valid_areas_[4]; ::nana::rectangle valid_areas_[4];
}; };
}//end namespace nana }//end namespace nana
#include <nana/pop_ignore_diagnostic>
#endif #endif

2
include/nana/gui/notifier.hpp
View File

@ -14,6 +14,7 @@
#define NANA_GUI_NOTIFIER_HPP #define NANA_GUI_NOTIFIER_HPP
#include <nana/gui/basis.hpp> #include <nana/gui/basis.hpp>
#include <nana/gui/detail/general_events.hpp> #include <nana/gui/detail/general_events.hpp>
#include <nana/push_ignore_diagnostic>
namespace nana namespace nana
{ {
@ -65,4 +66,5 @@ namespace nana
implement * impl_; implement * impl_;
}; };
}//end namespace nana }//end namespace nana
#include <nana/pop_ignore_diagnostic>
#endif #endif

2
include/nana/gui/place.hpp
View File

@ -15,6 +15,7 @@
#ifndef NANA_GUI_PLACE_HPP #ifndef NANA_GUI_PLACE_HPP
#define NANA_GUI_PLACE_HPP #define NANA_GUI_PLACE_HPP
#include <nana/push_ignore_diagnostic>
#include <nana/gui/basis.hpp> #include <nana/gui/basis.hpp>
#include <utility> #include <utility>
#include <memory> #include <memory>
@ -145,5 +146,6 @@ namespace nana
implement * impl_; implement * impl_;
}; };
}//end namespace nana }//end namespace nana
#include <nana/pop_ignore_diagnostic>
#endif //#ifndef NANA_GUI_PLACE_HPP #endif //#ifndef NANA_GUI_PLACE_HPP

2
include/nana/gui/timer.hpp
View File

@ -16,6 +16,7 @@
#ifndef NANA_GUI_TIMER_HPP #ifndef NANA_GUI_TIMER_HPP
#define NANA_GUI_TIMER_HPP #define NANA_GUI_TIMER_HPP
#include <nana/gui/detail/general_events.hpp> #include <nana/gui/detail/general_events.hpp>
#include <nana/push_ignore_diagnostic>
namespace nana namespace nana
{ {
@ -58,4 +59,5 @@ namespace nana
implement * const impl_; implement * const impl_;
}; };
}//end namespace nana }//end namespace nana
#include <nana/pop_ignore_diagnostic>
#endif #endif

4
include/nana/gui/widgets/button.hpp
View File

@ -14,6 +14,8 @@
#define NANA_GUI_WIDGET_BUTTON_HPP #define NANA_GUI_WIDGET_BUTTON_HPP
#include "widget.hpp" #include "widget.hpp"
#include <nana/gui/element.hpp> #include <nana/gui/element.hpp>
#include <nana/push_ignore_diagnostic>
namespace nana{ namespace nana{
namespace drawerbase namespace drawerbase
@ -105,5 +107,7 @@ namespace nana{
void _m_caption(native_string_type&&) override; void _m_caption(native_string_type&&) override;
}; };
}//end namespace nana }//end namespace nana
#include <nana/pop_ignore_diagnostic>
#endif #endif

5
include/nana/gui/widgets/categorize.hpp
View File

@ -16,6 +16,7 @@
#include <nana/gui/widgets/widget.hpp> #include <nana/gui/widgets/widget.hpp>
#include <nana/pat/cloneable.hpp> #include <nana/pat/cloneable.hpp>
#include <nana/any.hpp> #include <nana/any.hpp>
#include <nana/push_ignore_diagnostic>
namespace nana namespace nana
{ {
@ -141,7 +142,7 @@ namespace nana
void mouse_leave(graph_reference, const arg_mouse&) override; void mouse_leave(graph_reference, const arg_mouse&) override;
private: private:
std::unique_ptr<event_agent_interface> event_agent_; std::unique_ptr<event_agent_interface> event_agent_;
scheme * scheme_; scheme * scheme_{nullptr};
}; };
}//end namespace categorize }//end namespace categorize
}//end namespace drawerbase }//end namespace drawerbase
@ -258,5 +259,5 @@ namespace nana
} }
}; };
}//end namespace nana }//end namespace nana
#include <nana/pop_ignore_diagnostic>
#endif #endif

3
include/nana/gui/widgets/checkbox.hpp
View File

@ -12,6 +12,8 @@
#ifndef NANA_GUI_WIDGET_CHECKBOX_HPP #ifndef NANA_GUI_WIDGET_CHECKBOX_HPP
#define NANA_GUI_WIDGET_CHECKBOX_HPP #define NANA_GUI_WIDGET_CHECKBOX_HPP
#include <nana/push_ignore_diagnostic>
#include "widget.hpp" #include "widget.hpp"
#include <vector> #include <vector>
#include <memory> #include <memory>
@ -106,5 +108,6 @@ namespace drawerbase
std::vector<element_tag> ui_container_; std::vector<element_tag> ui_container_;
}; };
}//end namespace nana }//end namespace nana
#include <nana/pop_ignore_diagnostic>
#endif #endif

2
include/nana/gui/widgets/combox.hpp
View File

@ -12,6 +12,7 @@
#ifndef NANA_GUI_WIDGETS_COMBOX_HPP #ifndef NANA_GUI_WIDGETS_COMBOX_HPP
#define NANA_GUI_WIDGETS_COMBOX_HPP #define NANA_GUI_WIDGETS_COMBOX_HPP
#include <nana/push_ignore_diagnostic>
#include "widget.hpp" #include "widget.hpp"
#include "float_listbox.hpp" #include "float_listbox.hpp"
#include "skeletons/text_editor_part.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; nana::any * _m_anyobj(std::size_t pos, bool alloc_if_empty) const override;
}; };
} }
#include <nana/pop_ignore_diagnostic>
#endif #endif

3
include/nana/gui/widgets/date_chooser.hpp
View File

@ -12,7 +12,7 @@
#ifndef NANA_GUI_WIDGETS_DATE_CHOOSER_HPP #ifndef NANA_GUI_WIDGETS_DATE_CHOOSER_HPP
#define NANA_GUI_WIDGETS_DATE_CHOOSER_HPP #define NANA_GUI_WIDGETS_DATE_CHOOSER_HPP
#include <nana/push_ignore_diagnostic>
#include "widget.hpp" #include "widget.hpp"
#include <nana/datetime.hpp> #include <nana/datetime.hpp>
@ -114,5 +114,6 @@ namespace nana
void weekstr(unsigned index, const ::std::string&);///<Set the week strings which will be displayed for day, index is in range of [0, 6] void weekstr(unsigned index, const ::std::string&);///<Set the week strings which will be displayed for day, index is in range of [0, 6]
}; };
}//end namespace nana }//end namespace nana
#include <nana/pop_ignore_diagnostic>
#endif #endif

3
include/nana/gui/widgets/detail/tree_cont.hpp
View File

@ -12,6 +12,7 @@
#ifndef NANA_GUI_WIDGETS_DETAIL_TREE_CONT_HPP #ifndef NANA_GUI_WIDGETS_DETAIL_TREE_CONT_HPP
#define NANA_GUI_WIDGETS_DETAIL_TREE_CONT_HPP #define NANA_GUI_WIDGETS_DETAIL_TREE_CONT_HPP
#include <stack> #include <stack>
#include <nana/push_ignore_diagnostic>
namespace nana namespace nana
{ {
@ -515,4 +516,6 @@ namespace detail
}//end namespace detail }//end namespace detail
}//end namespace widgets }//end namespace widgets
}//end namesace nana }//end namesace nana
#include <nana/pop_ignore_diagnostic>
#endif #endif

2
include/nana/gui/widgets/float_listbox.hpp
View File

@ -12,6 +12,7 @@
#ifndef NANA_GUI_WIDGETS_FLOAT_LISTBOX_HPP #ifndef NANA_GUI_WIDGETS_FLOAT_LISTBOX_HPP
#define NANA_GUI_WIDGETS_FLOAT_LISTBOX_HPP #define NANA_GUI_WIDGETS_FLOAT_LISTBOX_HPP
#include <nana/push_ignore_diagnostic>
#include "widget.hpp" #include "widget.hpp"
#include <vector> #include <vector>
@ -101,5 +102,6 @@ namespace nana
std::size_t index() const; std::size_t index() const;
}; };
} }
#include <nana/pop_ignore_diagnostic>
#endif #endif

5
include/nana/gui/widgets/label.hpp
View File

@ -12,8 +12,9 @@
#ifndef NANA_GUI_WIDGET_LABEL_HPP #ifndef NANA_GUI_WIDGET_LABEL_HPP
#define NANA_GUI_WIDGET_LABEL_HPP #define NANA_GUI_WIDGET_LABEL_HPP
#include "widget.hpp"
#include "widget.hpp"
#include <nana/push_ignore_diagnostic>
namespace nana namespace nana
{ {
@ -80,4 +81,6 @@ namespace nana
void _m_caption(native_string_type&&) override; void _m_caption(native_string_type&&) override;
}; };
}//end namespace nana }//end namespace nana
#include <nana/pop_ignore_diagnostic>
#endif #endif

4
include/nana/gui/widgets/listbox.hpp
View File

@ -17,6 +17,8 @@
#ifndef NANA_GUI_WIDGETS_LISTBOX_HPP #ifndef NANA_GUI_WIDGETS_LISTBOX_HPP
#define NANA_GUI_WIDGETS_LISTBOX_HPP #define NANA_GUI_WIDGETS_LISTBOX_HPP
#include <nana/push_ignore_diagnostic>
#include "widget.hpp" #include "widget.hpp"
#include "detail/inline_widget.hpp" #include "detail/inline_widget.hpp"
#include <nana/pat/abstract_factory.hpp> #include <nana/pat/abstract_factory.hpp>
@ -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*); void _m_erase_key(nana::detail::key_interface*);
}; };
}//end namespace nana }//end namespace nana
#include <nana/pop_ignore_diagnostic>
#endif #endif

4
include/nana/gui/widgets/menu.hpp
View File

@ -17,6 +17,8 @@
#include <nana/gui/timer.hpp> #include <nana/gui/timer.hpp>
#include <nana/pat/cloneable.hpp> #include <nana/pat/cloneable.hpp>
#include <nana/push_ignore_diagnostic>
namespace nana namespace nana
{ {
namespace drawerbase namespace drawerbase
@ -198,4 +200,6 @@ namespace nana
detail::popuper menu_popuper(menu&, mouse = mouse::right_button); detail::popuper menu_popuper(menu&, mouse = mouse::right_button);
detail::popuper menu_popuper(menu&, window owner, const point&, mouse = mouse::right_button); detail::popuper menu_popuper(menu&, window owner, const point&, mouse = mouse::right_button);
}//end namespace nana }//end namespace nana
#include <nana/pop_ignore_diagnostic>
#endif #endif

3
include/nana/gui/widgets/menubar.hpp
View File

@ -14,6 +14,7 @@
#define NANA_GUI_WIDGETS_MENUBAR_HPP #define NANA_GUI_WIDGETS_MENUBAR_HPP
#include "widget.hpp" #include "widget.hpp"
#include "menu.hpp" #include "menu.hpp"
#include <nana/push_ignore_diagnostic>
namespace nana namespace nana
{ {
@ -117,4 +118,6 @@ namespace nana
::nana::event_handle evt_resized_{nullptr}; ::nana::event_handle evt_resized_{nullptr};
};//end class menubar };//end class menubar
}//end namespace nana }//end namespace nana
#include <nana/pop_ignore_diagnostic>
#endif #endif

4
include/nana/gui/widgets/picture.hpp
View File

@ -13,6 +13,8 @@
*/ */
#ifndef NANA_GUI_WIDGET_PICTURE_HPP #ifndef NANA_GUI_WIDGET_PICTURE_HPP
#define NANA_GUI_WIDGET_PICTURE_HPP #define NANA_GUI_WIDGET_PICTURE_HPP
#include <nana/push_ignore_diagnostic>
#include "widget.hpp" #include "widget.hpp"
namespace nana namespace nana
@ -67,4 +69,6 @@ namespace nana
bool transparent() const; bool transparent() const;
}; };
}//end namespace nana }//end namespace nana
#include <nana/pop_ignore_diagnostic>
#endif #endif

2
include/nana/gui/widgets/scroll.hpp
View File

@ -15,6 +15,7 @@
#include "widget.hpp" #include "widget.hpp"
#include <nana/gui/timer.hpp> #include <nana/gui/timer.hpp>
#include <nana/push_ignore_diagnostic>
namespace nana namespace nana
{ {
@ -502,4 +503,5 @@ namespace nana
} }
};//end class scroll };//end class scroll
}//end namespace nana }//end namespace nana
#include <nana/pop_ignore_diagnostic>
#endif #endif

4
include/nana/gui/widgets/skeletons/text_editor.hpp
View File

@ -13,6 +13,8 @@
#ifndef NANA_GUI_SKELETONS_TEXT_EDITOR_HPP #ifndef NANA_GUI_SKELETONS_TEXT_EDITOR_HPP
#define NANA_GUI_SKELETONS_TEXT_EDITOR_HPP #define NANA_GUI_SKELETONS_TEXT_EDITOR_HPP
#include <nana/push_ignore_diagnostic>
#include "textbase.hpp" #include "textbase.hpp"
#include "text_editor_part.hpp" #include "text_editor_part.hpp"
#include <nana/gui/widgets/scroll.hpp> #include <nana/gui/widgets/scroll.hpp>
@ -372,5 +374,7 @@ namespace nana{ namespace widgets
}//end namespace widgets }//end namespace widgets
}//end namespace nana }//end namespace nana
#include <nana/pop_ignore_diagnostic>
#endif #endif

3
include/nana/gui/widgets/skeletons/text_token_stream.hpp
View File

@ -22,6 +22,8 @@
#include <stack> #include <stack>
#include <stdexcept> #include <stdexcept>
#include <nana/push_ignore_diagnostic>
namespace nana{ namespace widgets{ namespace skeletons namespace nana{ namespace widgets{ namespace skeletons
{ {
//The tokens are defined for representing a text, the tokens are divided //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 skeletons
}//end namespace widgets }//end namespace widgets
}//end namepsace nana }//end namepsace nana
#include <nana/pop_ignore_diagnostic>
#endif //NANA_GUI_WIDGETS_SKELETONS_TEXT_TOKEN_STREAM #endif //NANA_GUI_WIDGETS_SKELETONS_TEXT_TOKEN_STREAM

3
include/nana/gui/widgets/skeletons/textbase.hpp
View File

@ -13,6 +13,7 @@
#ifndef NANA_GUI_WIDGET_DETAIL_TEXTBASE_HPP #ifndef NANA_GUI_WIDGET_DETAIL_TEXTBASE_HPP
#define NANA_GUI_WIDGET_DETAIL_TEXTBASE_HPP #define NANA_GUI_WIDGET_DETAIL_TEXTBASE_HPP
#include <nana/push_ignore_diagnostic>
#include <nana/charset.hpp> #include <nana/charset.hpp>
#include <nana/basic_types.hpp> #include <nana/basic_types.hpp>
@ -536,4 +537,6 @@ namespace skeletons
}//end namespace detail }//end namespace detail
}//end namespace widgets }//end namespace widgets
}//end namespace nana }//end namespace nana
#include <nana/pop_ignore_diagnostic>
#endif #endif

4
include/nana/gui/widgets/slider.hpp
View File

@ -11,6 +11,9 @@
*/ */
#ifndef NANA_GUI_WIDGETS_SLIDER_HPP #ifndef NANA_GUI_WIDGETS_SLIDER_HPP
#define NANA_GUI_WIDGETS_SLIDER_HPP #define NANA_GUI_WIDGETS_SLIDER_HPP
#include <nana/push_ignore_diagnostic>
#include "widget.hpp" #include "widget.hpp"
#include <nana/pat/cloneable.hpp> #include <nana/pat/cloneable.hpp>
@ -141,5 +144,6 @@ namespace nana
bool transparent() const; bool transparent() const;
}; };
}//end namespace nana }//end namespace nana
#include <nana/pop_ignore_diagnostic>
#endif #endif

4
include/nana/gui/widgets/spinbox.hpp
View File

@ -12,6 +12,8 @@
#ifndef NANA_GUI_WIDGET_SPINBOX_HPP #ifndef NANA_GUI_WIDGET_SPINBOX_HPP
#define NANA_GUI_WIDGET_SPINBOX_HPP #define NANA_GUI_WIDGET_SPINBOX_HPP
#include <nana/push_ignore_diagnostic>
#include "widget.hpp" #include "widget.hpp"
#include "skeletons/text_editor_part.hpp" #include "skeletons/text_editor_part.hpp"
@ -110,5 +112,5 @@ namespace nana
void _m_caption(native_string_type&&); void _m_caption(native_string_type&&);
}; //end class spinbox }; //end class spinbox
}//end namespace nana }//end namespace nana
#include <nana/pop_ignore_diagnostic>
#endif //NANA_GUI_WIDGET_SPINBOX_HPP #endif //NANA_GUI_WIDGET_SPINBOX_HPP

3
include/nana/gui/widgets/tabbar.hpp
View File

@ -13,6 +13,8 @@
*/ */
#ifndef NANA_GUI_WIDGET_TABBAR_HPP #ifndef NANA_GUI_WIDGET_TABBAR_HPP
#define NANA_GUI_WIDGET_TABBAR_HPP #define NANA_GUI_WIDGET_TABBAR_HPP
#include <nana/push_ignore_diagnostic>
#include "widget.hpp" #include "widget.hpp"
#include <nana/pat/cloneable.hpp> #include <nana/pat/cloneable.hpp>
#include <nana/any.hpp> #include <nana/any.hpp>
@ -410,5 +412,6 @@ namespace nana
void erase(std::size_t pos, bool close_attached = true); void erase(std::size_t pos, bool close_attached = true);
}; };
} }
#include <nana/pop_ignore_diagnostic>
#endif #endif

4
include/nana/gui/widgets/textbox.hpp
View File

@ -11,6 +11,8 @@
*/ */
#ifndef NANA_GUI_WIDGET_TEXTBOX_HPP #ifndef NANA_GUI_WIDGET_TEXTBOX_HPP
#define NANA_GUI_WIDGET_TEXTBOX_HPP #define NANA_GUI_WIDGET_TEXTBOX_HPP
#include <nana/push_ignore_diagnostic>
#include <nana/gui/widgets/widget.hpp> #include <nana/gui/widgets/widget.hpp>
#include "skeletons/textbase_export_interface.hpp" #include "skeletons/textbase_export_interface.hpp"
#include "skeletons/text_editor_part.hpp" #include "skeletons/text_editor_part.hpp"
@ -214,4 +216,6 @@ namespace nana
void _m_typeface(const paint::font&) override; void _m_typeface(const paint::font&) override;
}; };
}//end namespace nana }//end namespace nana
#include <nana/pop_ignore_diagnostic>
#endif #endif

3
include/nana/gui/widgets/toolbar.hpp
View File

@ -12,6 +12,7 @@
#ifndef NANA_GUI_WIDGET_TOOLBAR_HPP #ifndef NANA_GUI_WIDGET_TOOLBAR_HPP
#define NANA_GUI_WIDGET_TOOLBAR_HPP #define NANA_GUI_WIDGET_TOOLBAR_HPP
#include <nana/push_ignore_diagnostic>
#include "widget.hpp" #include "widget.hpp"
@ -101,4 +102,6 @@ namespace nana
bool detached_; bool detached_;
}; };
}//end namespace nana }//end namespace nana
#include <nana/pop_ignore_diagnostic>
#endif #endif

4
include/nana/gui/widgets/treebox.hpp
View File

@ -17,6 +17,8 @@
#ifndef NANA_GUI_WIDGETS_TREEBOX_HPP #ifndef NANA_GUI_WIDGETS_TREEBOX_HPP
#define NANA_GUI_WIDGETS_TREEBOX_HPP #define NANA_GUI_WIDGETS_TREEBOX_HPP
#include <nana/push_ignore_diagnostic>
#include "widget.hpp" #include "widget.hpp"
#include "detail/compset.hpp" #include "detail/compset.hpp"
#include "detail/tree_cont.hpp" #include "detail/tree_cont.hpp"
@ -452,4 +454,6 @@ namespace nana
item_proxy selected() const; ///< returns the selected node item_proxy selected() const; ///< returns the selected node
};//end class treebox };//end class treebox
}//end namespace nana }//end namespace nana
#include <nana/pop_ignore_diagnostic>
#endif #endif

4
include/nana/gui/widgets/widget.hpp
View File

@ -12,6 +12,8 @@
#ifndef NANA_GUI_WIDGET_HPP #ifndef NANA_GUI_WIDGET_HPP
#define NANA_GUI_WIDGET_HPP #define NANA_GUI_WIDGET_HPP
#include <nana/push_ignore_diagnostic>
#include "../basis.hpp" #include "../basis.hpp"
#include "../programming_interface.hpp" #include "../programming_interface.hpp"
#include <nana/internationalization.hpp> #include <nana/internationalization.hpp>
@ -524,4 +526,6 @@ namespace nana
std::unique_ptr<scheme_type> scheme_; std::unique_ptr<scheme_type> scheme_;
};//end class widget_object<category::frame_tag> };//end class widget_object<category::frame_tag>
}//end namespace nana }//end namespace nana
#include <nana/pop_ignore_diagnostic>
#endif #endif

1
include/nana/gui/wvl.hpp
View File

@ -15,7 +15,6 @@
#ifndef NANA_GUI_WVL_HPP #ifndef NANA_GUI_WVL_HPP
#define NANA_GUI_WVL_HPP #define NANA_GUI_WVL_HPP
#include "programming_interface.hpp" #include "programming_interface.hpp"
#include "screen.hpp" #include "screen.hpp"
#include "widgets/form.hpp" #include "widgets/form.hpp"

10
include/nana/pat/cloneable.hpp
View File

@ -13,6 +13,7 @@
#ifndef NANA_PAT_CLONEABLE_HPP #ifndef NANA_PAT_CLONEABLE_HPP
#define NANA_PAT_CLONEABLE_HPP #define NANA_PAT_CLONEABLE_HPP
#include <nana/push_ignore_diagnostic>
#include <nana/c++defines.hpp> #include <nana/c++defines.hpp>
#include <cstddef> #include <cstddef>
#include <type_traits> #include <type_traits>
@ -96,10 +97,15 @@ namespace nana{ namespace pat{
typedef int inner_bool::* operator_bool_t; typedef int inner_bool::* operator_bool_t;
/*
template<typename U> template<typename U>
struct member_enabled struct member_enabled //deprecated
: public std::enable_if<(!std::is_base_of<cloneable, typename std::remove_reference<U>::type>::value) && std::is_base_of<base_t, typename std::remove_reference<U>::type>::value, int> : public std::enable_if<(!std::is_base_of<cloneable, typename std::remove_reference<U>::type>::value) && std::is_base_of<base_t, typename std::remove_reference<U>::type>::value, int>
{}; {};
*/
template<typename U>
using member_enabled = std::enable_if<(!std::is_base_of<cloneable, typename std::remove_reference<U>::type>::value) && std::is_base_of<base_t, typename std::remove_reference<U>::type>::value, int>;
public: public:
cloneable() noexcept = default; cloneable() noexcept = default;
@ -207,5 +213,5 @@ namespace nana{ namespace pat{
using mutable_cloneable = cloneable<T, true>; using mutable_cloneable = cloneable<T, true>;
}//end namespace pat }//end namespace pat
}//end namespace nana }//end namespace nana
#include <nana/pop_ignore_diagnostic>
#endif #endif

5
include/nana/pop_ignore_diagnostic Normal file
View File

@ -0,0 +1,5 @@
#if (__GNUC__ >= 4) && (__GNUC_MINOR__ >= 6)
# pragma GCC diagnostic pop
#endif

4
include/nana/push_ignore_diagnostic Normal file
View File

@ -0,0 +1,4 @@
#if (__GNUC__ >= 4) && (__GNUC_MINOR__ >= 6)
# pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Weffc++"
#endif

3
include/nana/unicode_bidi.hpp
View File

@ -1,6 +1,8 @@
#ifndef NANA_UNICODE_BIDI_HPP #ifndef NANA_UNICODE_BIDI_HPP
#define NANA_UNICODE_BIDI_HPP #define NANA_UNICODE_BIDI_HPP
#include <vector> #include <vector>
#include <nana/push_ignore_diagnostic>
namespace nana namespace nana
{ {
@ -71,5 +73,6 @@ namespace nana
}; };
} }
#include <nana/pop_ignore_diagnostic>
#endif #endif

5
source/audio/player.cpp
View File

@ -1,5 +1,8 @@
#include <nana/push_ignore_diagnostic>
#include <nana/audio/player.hpp> #include <nana/audio/player.hpp>
#ifdef NANA_ENABLE_AUDIO #ifdef NANA_ENABLE_AUDIO
#include <nana/audio/detail/audio_stream.hpp> #include <nana/audio/detail/audio_stream.hpp>
@ -67,4 +70,4 @@ namespace nana{ namespace audio
}//end namespace audio }//end namespace audio
}//end namespace nana }//end namespace nana
#endif //NANA_ENABLE_AUDIO #endif //NANA_ENABLE_AUDIO

22
source/charset.cpp
View File

@ -344,11 +344,11 @@ namespace nana
{ {
public: public:
charset_string(const std::string& s) charset_string(const std::string& s)
: data_(s), is_unicode_(false) : data_(s)
{} {}
charset_string(std::string&& 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) charset_string(const std::string& s, unicode encoding)
@ -501,9 +501,9 @@ namespace nana
} }
private: private:
std::string data_; std::string data_;
std::wstring wdata_for_move_; std::wstring wdata_for_move_{};
bool is_unicode_; bool is_unicode_{ false };
unicode utf_x_; unicode utf_x_{ unicode::utf8 };
}; };
class charset_wstring class charset_wstring
@ -950,11 +950,11 @@ namespace nana
{ {
public: public:
charset_string(const std::string& s) charset_string(const std::string& s)
: data_(s), is_unicode_(false) : data_(s)
{} {}
charset_string(std::string&& 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) charset_string(const std::string& s, unicode encoding)
@ -1122,9 +1122,9 @@ namespace nana
} }
private: private:
std::string data_; std::string data_;
std::wstring wdata_for_move_; std::wstring wdata_for_move_{};
bool is_unicode_; bool is_unicode_{ false };
unicode utf_x_; unicode utf_x_{ unicode::utf8 };
}; };
@ -1195,7 +1195,7 @@ namespace nana
} }
private: private:
std::wstring data_; std::wstring data_;
std::string data_for_move_; std::string data_for_move_{};
}; };
#endif #endif
} }

68
source/datetime.cpp
View File

@ -17,62 +17,65 @@
#include <cassert> #include <cassert>
namespace { namespace {
void localtime(struct tm& tm) std::tm localtime()
{ {
#if defined(NANA_WINDOWS) && !defined(NANA_MINGW) #if defined(NANA_WINDOWS) && !defined(NANA_MINGW)
time_t t; time_t t;
::time(&t); ::time(&t);
std::tm tm;
if(localtime_s(&tm, &t) != 0) if(localtime_s(&tm, &t) != 0)
{
assert(false); assert(false);
}
return tm;
#else #else
time_t t = std::time(nullptr); time_t t = std::time(nullptr);
struct tm * tm_addr = std::localtime(&t); struct tm * tm_addr = std::localtime(&t);
assert(tm_addr); assert(tm_addr);
tm = *tm_addr;
return *tm_addr;
#endif #endif
} }
::nana::date::value to_dateval(const std::tm& t)
{
return {static_cast<unsigned>(t.tm_year + 1900), static_cast<unsigned>(t.tm_mon + 1), static_cast<unsigned>(t.tm_mday)};
}
::nana::time::value to_timeval(const std::tm& t)
{
return {static_cast<unsigned>(t.tm_hour), static_cast<unsigned>(t.tm_min), static_cast<unsigned>(t.tm_sec)};
}
} // namespace anonymous } // namespace anonymous
namespace nana namespace nana
{ {
//class date //class date
void date::set(const std::tm& t) void date::set(const std::tm& t)
{ {
value_.year = t.tm_year + 1900; value_ = to_dateval(t);
value_.month = t.tm_mon + 1;
value_.day = t.tm_mday;
} }
date::date() date::date()
: value_(to_dateval(*std::localtime(nullptr)))
{ {
struct tm t;
localtime(t);
set(t);
} }
date::date(const std::tm& t) date::date(const std::tm& t)
: value_(to_dateval(t))
{ {
set(t);
} }
date::date(int year, int month, int day) date::date(int year, int month, int day)
: value_({static_cast<unsigned>(year), static_cast<unsigned>(month), static_cast<unsigned>(day)})
{ {
if(1601 <= year && year < 30827 && 0 < month && month < 13 && day > 0) if(1601 <= year && year < 30827 && 0 < month && month < 13 && day > 0)
{ {
if(day <= static_cast<int>(date::month_days(year, month))) if(day <= static_cast<int>(date::month_days(year, month)))
{
value_.year = year;
value_.month = month;
value_.day = day;
return; return;
}
} }
struct tm t; set(localtime());
localtime(t);
set(t);
} }
date date::operator - (int off) const date date::operator - (int off) const
@ -258,40 +261,27 @@ namespace nana
//class time //class time
void time::set(const std::tm& t) void time::set(const std::tm& t)
{ {
value_.hour = t.tm_hour; value_ = to_timeval(t);
value_.minute = t.tm_min;
value_.second = t.tm_sec;
} }
time::time() time::time()
: value_{} : value_(to_timeval(localtime()))
{ {
struct tm t;
localtime(t);
set(t);
} }
time::time(const std::tm& 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) time::time(unsigned hour, unsigned minute, unsigned second)
: value_({hour, minute, second})
{ {
if(hour < 24 && minute < 60 && second < 62) if(hour < 24 && minute < 60 && second < 62)
{
value_.hour = hour;
value_.minute = minute;
value_.second = second;
return; return;
}
struct tm t;
localtime(t);
set(t);
}
set(localtime());
}
const time::value& time::read() const const time::value& time::read() const
{ {
return value_; return value_;

5
source/detail/platform_spec_posix.cpp
View File

@ -16,6 +16,9 @@
#include <nana/detail/platform_spec_selector.hpp> #include <nana/detail/platform_spec_selector.hpp>
#if defined(NANA_POSIX) && defined(NANA_X11) #if defined(NANA_POSIX) && defined(NANA_X11)
#include <nana/push_ignore_diagnostic>
#include <X11/Xlocale.h> #include <X11/Xlocale.h>
#include <locale> #include <locale>
#include <map> #include <map>
@ -1414,4 +1417,6 @@ namespace detail
} }
}//end namespace detail }//end namespace detail
}//end namespace nana }//end namespace nana
#include <nana/pop_ignore_diagnostic>
#endif //NANA_POSIX && NANA_X11 #endif //NANA_POSIX && NANA_X11

18
source/gui/detail/basic_window.cpp
View File

@ -207,10 +207,10 @@ namespace nana
{ {
switch(categ) switch(categ)
{ {
case category::root_tag::value: case category::flags::root:
attribute.root = new attr_root_tag; attribute.root = new attr_root_tag;
break; break;
case category::frame_tag::value: case category::flags::frame:
attribute.frame = new attr_frame_tag; attribute.frame = new attr_frame_tag;
break; break;
default: default:
@ -222,10 +222,10 @@ namespace nana
{ {
switch(category) switch(category)
{ {
case category::root_tag::value: case category::flags::root:
delete attribute.root; delete attribute.root;
break; break;
case category::frame_tag::value: case category::flags::frame:
delete attribute.frame; delete attribute.frame;
break; break;
default: break; default: break;
@ -236,7 +236,7 @@ namespace nana
//basic_window //basic_window
//@brief: constructor for the root window //@brief: constructor for the root window
basic_window::basic_window(basic_window* owner, std::unique_ptr<widget_notifier_interface>&& wdg_notifier, category::root_tag**) basic_window::basic_window(basic_window* owner, std::unique_ptr<widget_notifier_interface>&& 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); drawer.bind(this);
_m_init_pos_and_size(nullptr, rectangle()); _m_init_pos_and_size(nullptr, rectangle());
@ -256,7 +256,7 @@ namespace nana
//@brief: bind a native window and baisc_window //@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) 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; this->root = wd;
dimension.width = width; dimension.width = width;
@ -270,7 +270,7 @@ namespace nana
void basic_window::frame_window(native_window_type wd) 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; other.attribute.frame->container = wd;
} }
@ -357,12 +357,12 @@ namespace nana
void basic_window::_m_initialize(basic_window* agrparent) 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)) if(agrparent && (nana::system::this_thread_id() != agrparent->thread_id))
agrparent = nullptr; agrparent = nullptr;
while(agrparent && (agrparent->other.category != category::root_tag::value)) while(agrparent && (category::flags::root != agrparent->other.category))
agrparent = agrparent->parent; agrparent = agrparent->parent;
owner = agrparent; owner = agrparent;

16
source/gui/detail/window_layout.cpp
View File

@ -53,7 +53,7 @@ namespace nana
//get the root graphics //get the root graphics
auto& graph = *(wd->root_graph); 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)); 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()); _m_paste_children(wd, is_child_refreshed, have_refreshed, vr, graph, nana::point());
@ -66,7 +66,7 @@ namespace nana
nana::point p_src; nana::point p_src;
for (auto & el : blocks) 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_window_type container = el.window->other.attribute.frame->container;
native_interface::refresh_window(container); native_interface::refresh_window(container);
@ -158,7 +158,7 @@ namespace nana
bool window_layout::enable_effects_bground(core_window_t * wd, bool enabled) 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; return false;
if (false == enabled) if (false == enabled)
@ -199,11 +199,11 @@ namespace nana
nana::point rpos{ wd->pos_root }; nana::point rpos{ wd->pos_root };
auto & glass_buffer = wd->other.glass_buffer; 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<core_window_t*> layers; std::vector<core_window_t*> layers;
core_window_t * beg = wd->parent; 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); layers.push_back(beg);
beg = beg->parent; beg = beg->parent;
@ -229,7 +229,7 @@ namespace nana
nana::rectangle ovlp; nana::rectangle ovlp;
if (child->visible && overlap(r, rectangle(child->pos_owner, child->dimension), 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)); 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.x += pre->pos_root.x;
ovlp.y += pre->pos_root.y; ovlp.y += pre->pos_root.y;
@ -250,7 +250,7 @@ namespace nana
nana::rectangle ovlp; nana::rectangle ovlp;
if (child->visible && overlap(r_of_wd, rectangle{ child->pos_owner, child->dimension }, 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)); 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; ovlp.x += wd->pos_root.x;
@ -285,7 +285,7 @@ namespace nana
if (overlap(nana::rectangle{ child->pos_root, child->dimension }, parent_rect, rect)) if (overlap(nana::rectangle{ child->pos_root, child->dimension }, parent_rect, rect))
{ {
bool have_child_refreshed = false; 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)) if (is_child_refreshed && (false == child->flags.refreshing))
{ {

35
source/gui/detail/window_manager.cpp
View File

@ -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); 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); 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); insert_frame(owner, wd);
bedrock::inc_window(wd->thread_id); bedrock::inc_window(wd->thread_id);
@ -344,7 +344,7 @@ namespace detail
{ {
//Thread-Safe Required! //Thread-Safe Required!
std::lock_guard<decltype(mutex_)> lock(mutex_); std::lock_guard<decltype(mutex_)> 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); frame->other.attribute.frame->attach.push_back(wd);
return true; return true;
} }
@ -357,9 +357,9 @@ namespace detail
{ {
//Thread-Safe Required! //Thread-Safe Required!
std::lock_guard<decltype(mutex_)> lock(mutex_); std::lock_guard<decltype(mutex_)> 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); frame->other.attribute.frame->attach.push_back(wd->root);
return true; return true;
@ -399,7 +399,7 @@ namespace detail
if (wd->flags.destroying) if (wd->flags.destroying)
return; return;
if(wd->other.category == category::root_tag::value) if(category::flags::root == wd->other.category)
{ {
auto &brock = bedrock::instance(); auto &brock = bedrock::instance();
arg_unload arg; arg_unload arg;
@ -464,7 +464,7 @@ namespace detail
std::lock_guard<decltype(mutex_)> lock(mutex_); std::lock_guard<decltype(mutex_)> lock(mutex_);
if (impl_->wd_register.available(wd) == false) return; 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_->misc_register.erase(wd->root);
impl_->wd_register.remove(wd); impl_->wd_register.remove(wd);
@ -484,7 +484,7 @@ namespace detail
std::lock_guard<decltype(mutex_)> lock(mutex_); std::lock_guard<decltype(mutex_)> lock(mutex_);
if (impl_->wd_register.available(wd)) 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); native_interface::window_icon(wd->root, small_icon, big_icon);
} }
} }
@ -504,9 +504,9 @@ namespace detail
native_window_type nv = nullptr; native_window_type nv = nullptr;
switch(wd->other.category) switch(wd->other.category)
{ {
case category::root_tag::value: case category::flags::root:
nv = wd->root; break; nv = wd->root; break;
case category::frame_tag::value: case category::flags::frame:
nv = wd->other.attribute.frame->container; break; nv = wd->other.attribute.frame->container; break;
default: //category::widget_tag, category::lite_widget_tag default: //category::widget_tag, category::lite_widget_tag
break; break;
@ -703,7 +703,7 @@ namespace detail
wd->dimension = sz; 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(); bool graph_state = wd->drawer.graphics.empty();
wd->drawer.graphics.make(sz); wd->drawer.graphics.make(sz);
@ -714,13 +714,13 @@ namespace detail
if(graph_state != wd->drawer.graphics.empty()) if(graph_state != wd->drawer.graphics.empty())
wd->drawer.typeface_changed(); wd->drawer.typeface_changed();
if(category::root_tag::value == wd->other.category) if(category::flags::root == wd->other.category)
{ {
wd->root_graph->make(sz); wd->root_graph->make(sz);
if(false == passive) if(false == passive)
native_interface::window_size(wd->root, sz + nana::size(wd->extra_width, wd->extra_height)); 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); native_interface::window_size(wd->other.attribute.frame->container, sz);
for(auto natwd : wd->other.attribute.frame->attach) for(auto natwd : wd->other.attribute.frame->attach)
@ -850,6 +850,9 @@ namespace detail
{ {
window_layer::paint(wd, false, refresh_tree); window_layer::paint(wd, false, refresh_tree);
this->map(wd, force_copy_to_screen); 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) else if (effects::edge_nimbus::none != wd->effect.edge_nimbus)
{ {
@ -1379,7 +1382,7 @@ namespace detail
root_attr->menubar = nullptr; 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(); root_runtime(wd->root)->shortkeys.clear();
wd->other.attribute.root->focus = nullptr; 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. //remove the frame handle from the WM frames manager.
utl::erase(root_attr->frames, wd); utl::erase(root_attr->frames, wd);
@ -1565,7 +1568,7 @@ namespace detail
wd->drawer.detached(); wd->drawer.detached();
wd->widget_notifier->destroy(); 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. //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. //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) for(auto i = wd->children.rbegin(); i != wd->children.rend(); ++i)
{ {
core_window_t* child = *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); child = _m_find(child, pos);
if(child) if(child)

3
source/gui/place.cpp
View File

@ -15,6 +15,7 @@
#include <cmath> #include <cmath>
#include <map> #include <map>
#include <deque> #include <deque>
#include <nana/push_ignore_diagnostic>
#include <nana/deploy.hpp> #include <nana/deploy.hpp>
#include <nana/gui/place.hpp> #include <nana/gui/place.hpp>
#include <nana/gui/programming_interface.hpp> #include <nana/gui/programming_interface.hpp>
@ -2851,3 +2852,5 @@ namespace nana
} }
//end class place //end class place
}//end namespace nana }//end namespace nana
#include <nana/pop_ignore_diagnostic>

4
source/internationalization.cpp
View File

@ -10,6 +10,8 @@
* @file: nana/internationalization.cpp * @file: nana/internationalization.cpp
*/ */
#include <nana/push_ignore_diagnostic>
#include <nana/internationalization.hpp> #include <nana/internationalization.hpp>
#include <nana/gui/widgets/widget.hpp> #include <nana/gui/widgets/widget.hpp>
#include <unordered_map> #include <unordered_map>
@ -513,3 +515,5 @@ namespace nana
} }
//end class i18n_eval //end class i18n_eval
} }
#include <nana/pop_ignore_diagnostic>

1
source/paint/detail/image_process_provider.cpp
View File

@ -1,3 +1,4 @@
#include <nana/push_ignore_diagnostic>
#include <nana/paint/detail/image_process_provider.hpp> #include <nana/paint/detail/image_process_provider.hpp>
#include <nana/paint/detail/image_processor.hpp> #include <nana/paint/detail/image_processor.hpp>

2
source/paint/image.cpp
View File

@ -11,7 +11,7 @@
* @contributors: * @contributors:
* nabijaczleweli(pr#106) * nabijaczleweli(pr#106)
*/ */
#include <nana/push_ignore_diagnostic>
#include <nana/detail/platform_spec_selector.hpp> #include <nana/detail/platform_spec_selector.hpp>
#include <nana/paint/image.hpp> #include <nana/paint/image.hpp>
#include <algorithm> #include <algorithm>

1
source/paint/image_process_selector.cpp
View File

@ -1,3 +1,4 @@
#include <nana/push_ignore_diagnostic>
#include <nana/paint/image_process_selector.hpp> #include <nana/paint/image_process_selector.hpp>
namespace nana namespace nana