Merge remote-tracking branch 'nana_jh/develop' into dev_nana_fs

* nana_jh/develop:
  restore travis and CMakeLists
  fix missing ~other_tag, remove some warings
  fix crash that deprecation is included in NANA_IGNORE_CONF
  debug travis
  debug travis
  debug travis
  debug travis
  debug travis
  debug travis
  debug travis
  debug travis
  debug travis
  debug travis
  debug travis
  debug crash for travis
  debug a crash for travis
  debug a crash for travis
This commit is contained in:
qPCR4vir
2016-06-25 03:58:18 +02:00
11 changed files with 59 additions and 38 deletions

View File

@@ -25,7 +25,11 @@
#include "c++defines.hpp"
//The basic configurations are ignored when NANA_IGNORE_CONF is defined.
//This marco is defined since 1.4 and until 1.5 for deprecating frame widget.
//This marco and class frame will be removed in version 1.5
#define WIDGET_FRAME_DEPRECATED
//The following basic configurations are ignored when NANA_IGNORE_CONF is defined.
//The NANA_IGNORE_CONF may be specified by CMake generated makefile.
#ifndef NANA_IGNORE_CONF
@@ -93,10 +97,6 @@
#endif
#endif
//This marco is defined since 1.4 and until 1.5 for deprecating frame widget.
//This marco and class frame will be removed in version 1.5
#define WIDGET_FRAME_DEPRECATED
///////////////////
// Support for NANA_AUTOMATIC_GUI_TESTING
// Will cause the program to self-test the GUI. A default automatic GUI test

View File

@@ -64,6 +64,7 @@ namespace detail
rectangle effect_range_;
};//end class caret
/// Define some constant about tab category, these flags can be combine with operator |
struct tab_type
{
@@ -75,7 +76,6 @@ namespace detail
};
};
class caret;
/// a window data structure descriptor
struct basic_window
@@ -212,7 +212,9 @@ namespace detail
struct attr_root_tag
{
#ifndef WIDGET_FRAME_DEPRECATED
container frames; ///< initialization is null, it will be created while creating a frame widget. Refer to WindowManager::create_frame
#endif
container tabstop;
std::vector<edge_nimbus_action> effects_edge_nimbus;
basic_window* focus{nullptr};

View File

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