Merge branch 'develop' of https://github.com/cnjinhao/nana into develop

This commit is contained in:
beru
2015-05-17 15:05:44 +09:00
9 changed files with 68 additions and 24 deletions

View File

@@ -21,7 +21,7 @@
#include <memory>
namespace nana{
class widget; //declaration ofr nana/widgets/widget.hpp
class widget; //declaration of nana/widgets/widget.hpp
namespace detail
{
struct basic_window;
@@ -165,9 +165,10 @@ namespace detail
bool dropable :1; //Whether the window has make mouse_drop event.
bool fullscreen :1; //When the window is maximizing whether it fit for fullscreen.
bool borderless :1;
bool make_bground_declared : 1; //explicitly make bground for bground effects
bool ignore_menubar_focus : 1; //A flag indicates whether the menubar sets the focus.
unsigned Reserved :20;
bool make_bground_declared : 1; //explicitly make bground for bground effects
bool ignore_menubar_focus : 1; //A flag indicates whether the menubar sets the focus.
bool ignore_mouse_focus : 1; //A flag indicates whether the widget accepts focus when clicking on it
unsigned Reserved :19;
unsigned char tab; //indicate a window that can receive the keyboard TAB
mouse_action action;
}flags;

View File

@@ -303,6 +303,9 @@ namespace API
nana::mouse_action mouse_action(window);
nana::element_state element_state(window);
bool ignore_mouse_focus(window, bool ignore); ///< Enables/disables the mouse focus, it returns the previous state
bool ignore_mouse_focus(window); ///< Determines whether the mouse focus is enabled
}//end namespace API
}//end namespace nana