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

Conflicts:
	include/nana/gui/detail/widget_notifier_interface.hpp
This commit is contained in:
beru 2015-05-28 07:31:09 +09:00
commit 0e024d3227

View File

@ -1,22 +1,39 @@
#pragma once /*
* Widget Notifier Interface
#include <memory> * Nana C++ Library(http://www.nanapro.org)
#include <nana/gui/widgets/widget.hpp> * Copyright(C) 2003-2015 Jinhao(cnjinhao@hotmail.com)
*
namespace nana { * Distributed under the Boost Software License, Version 1.0.
namespace detail { * (See accompanying file LICENSE_1_0.txt or copy at
* http://www.boost.org/LICENSE_1_0.txt)
class widget_notifier_interface { *
public: * @file: nana/gui/detail/widget_notifier_interface.hpp
virtual widget* widget_ptr() const = 0; */
virtual void destroy() = 0;
virtual std::wstring caption() = 0; #ifndef NANA_GUI_DETAIL_WIDGET_NOTIFIER_INTERFACE_HEADER
virtual void caption(std::wstring text) = 0; #define NANA_GUI_DETAIL_WIDGET_NOTIFIER_INTERFACE_HEADER
#include <memory>
static std::unique_ptr<widget_notifier_interface> get_notifier(widget* wdg); #include <string>
private:
widget::notifier* p; namespace nana
}; {
class widget; //forward declaration
} // namespace detail
} // namespace nana namespace detail
{
class widget_notifier_interface
{
public:
virtual ~widget_notifier_interface() = default;
static std::unique_ptr<widget_notifier_interface> get_notifier(widget*); //defined in nana/gui/widgets/widget.cpp
virtual widget* widget_ptr() const = 0;
virtual void destroy() = 0;
virtual std::wstring caption() = 0;
virtual void caption(std::wstring) = 0;
};
}
}
#endif