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

remove paint::gadget

Browse Source
This commit is contained in:
Jinhao
2015-08-20 01:09:29 +08:00
parent 4323977908
commit 42443dcafd
27 changed files with 1024 additions and 763 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,7 +14,6 @@
#define NANA_GUI_WIDGET_SCROLL_HPP
#include "widget.hpp"
//#include <nana/paint/gadget.hpp> //deprecated
#include <nana/gui/timer.hpp>
namespace nana
@@ -444,7 +443,7 @@ namespace nana
/// @return true if the vlaue is changed.
bool make_page_scroll(bool forward)
{
return this->make_step(forward, range() - 1);
return this->make_step(forward, static_cast<unsigned>(range() - 1));
}
};//end class scroll
}//end namespace nana

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

@@ -14,7 +14,6 @@
#ifndef NANA_GUI_WIDGET_TABBAR_HPP
#define NANA_GUI_WIDGET_TABBAR_HPP
#include "widget.hpp"
//#include "../../paint/gadget.hpp" //deprecated
#include <nana/pat/cloneable.hpp>
#include <nana/any.hpp>
@@ -30,7 +29,7 @@ namespace nana
T & value;
arg_tabbar(tabbar<T>& wdg, T& v)
: widget{ wdg }, value{ v }
: widget(wdg), value{ v }
{}
};

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

@@ -19,7 +19,6 @@
#define NANA_GUI_WIDGETS_TREEBOX_HPP
#include "widget.hpp"
#include "detail/compset.hpp"
//#include <nana/paint/gadget.hpp> //deprecated
#include "detail/tree_cont.hpp"
#include <nana/gui/timer.hpp>
#include <nana/any.hpp>

33
include/nana/paint/gadget.hpp
View File

@@ -1,33 +0,0 @@
/*
* Graphics Gadget Implementation
* Nana C++ Library(http://www.nanapro.org)
* Copyright(C) 2003-2015 Jinhao(cnjinhao@hotmail.com)
*
* Distributed under the Boost Software License, Version 1.0.
* (See accompanying file LICENSE_1_0.txt or copy at
* http://www.boost.org/LICENSE_1_0.txt)
*
* @file: nana/paint/gadget.hpp
*/
#ifndef NANA_PAINT_GADGET_HPP
#define NANA_PAINT_GADGET_HPP
#include "graphics.hpp"
#include "image.hpp"
#include <nana/basic_types.hpp>
namespace nana
{
namespace paint
{
namespace gadget
{
void close_16_pixels(::nana::paint::graphics&, int x, int y, unsigned style, const color&);
void cross(::nana::paint::graphics&, int x, int y, unsigned size, unsigned thickness, const nana::color&);
}//end namespace gadget
}//end namespace paint
}//end namespace nana
#endif

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

@@ -21,75 +21,6 @@ namespace nana{ namespace pat{
namespace detail
{
/*
template<typename T>
class cloneable_interface //deprecated
{
public:
using interface_t = T;
typedef cloneable_interface cloneable_t;
virtual ~cloneable_interface() = default;
virtual interface_t& refer() = 0;
virtual const interface_t& refer() const = 0;
virtual cloneable_t* clone() const = 0;
virtual void self_delete() const = 0;
};
*/
/*
template<typename T, typename SuperOfT>
class cloneable_wrapper
: public cloneable_interface<SuperOfT> //deprecated
{
public:
using value_type = T;
using interface_t = typename cloneable_interface<SuperOfT>::interface_t;
cloneable_wrapper() = default;
cloneable_wrapper(const value_type& obj)
:object_(obj)
{}
cloneable_wrapper(value_type&& rv)
:object_(std::move(rv))
{}
template<typename U>
cloneable_wrapper(const U& u)
: object_(u)
{}
template<typename U>
cloneable_wrapper(U& u)
:object_(u)
{}
virtual interface_t& refer() override
{
return value_obj_;
}
virtual const interface_t& refer() const override
{
return value_obj_;
}
virtual cloneable_interface<interface_t>* clone() const override
{
return (new cloneable_wrapper{ value_obj_ });
}
virtual void self_delete() const override
{
(delete this);
}
private:
value_type value_obj_;
};
*/
class cloneable_interface
{
public:
@@ -124,18 +55,6 @@ namespace nana{ namespace pat{
cloneable_wrapper(value_type&& rv)
:value_obj_(std::move(rv))
{}
/*
template<typename U>
cloneable_wrapper(const U& u) //deprecated
: object_(u)
{}
template<typename U>
cloneable_wrapper(U&& u)
: object_(std::move(u))
{}
*/
private:
//Implement cloneable_interface
virtual void* get() override