From 7e310f33f739693482f220479b7c7ae19c4cfc7f Mon Sep 17 00:00:00 2001 From: Jinhao Date: Mon, 1 Jul 2019 07:56:29 +0800 Subject: [PATCH] remove deprecated code --- source/detail/mswin/platform_spec.hpp | 9 --------- source/detail/platform_spec_posix.cpp | 12 ------------ source/detail/platform_spec_windows.cpp | 12 ------------ source/detail/posix/platform_spec.hpp | 8 -------- 4 files changed, 41 deletions(-) diff --git a/source/detail/mswin/platform_spec.hpp b/source/detail/mswin/platform_spec.hpp index 5c0ad5ab..ae83562d 100644 --- a/source/detail/mswin/platform_spec.hpp +++ b/source/detail/mswin/platform_spec.hpp @@ -107,17 +107,8 @@ namespace detail drawable_impl_type(); ~drawable_impl_type(); -#if 0 //deprecated - unsigned get_color() const; - unsigned get_text_color() const; -#endif void set_color(const ::nana::color&); void set_text_color(const ::nana::color&); -#if 0 //deprecated - private: - unsigned color_{ 0xffffffff }; - unsigned text_color_{0xffffffff}; -#endif }; class platform_spec diff --git a/source/detail/platform_spec_posix.cpp b/source/detail/platform_spec_posix.cpp index 5f74dc67..b0ef6c11 100644 --- a/source/detail/platform_spec_posix.cpp +++ b/source/detail/platform_spec_posix.cpp @@ -341,18 +341,6 @@ namespace detail string.whitespace_pixels = 0; } -#if 0 //deprecated - unsigned drawable_impl_type::get_color() const - { - return color_; - } - - unsigned drawable_impl_type::get_text_color() const - { - return text_color_; - } -#endif - void drawable_impl_type::set_color(const ::nana::color& clr) { bgcolor_rgb = (clr.px_color().value & 0xFFFFFF); diff --git a/source/detail/platform_spec_windows.cpp b/source/detail/platform_spec_windows.cpp index f659b054..0fc7d8bc 100644 --- a/source/detail/platform_spec_windows.cpp +++ b/source/detail/platform_spec_windows.cpp @@ -42,18 +42,6 @@ namespace detail ::DeleteObject(pixmap); } -#if 0 //deprecated - unsigned drawable_impl_type::get_color() const - { - return color_; - } - - unsigned drawable_impl_type::get_text_color() const - { - return text_color_; - } -#endif - #define NANA_WINDOWS_RGB(a) (((DWORD)(a) & 0xFF)<<16) | ((DWORD)(a) & 0xFF00) | (((DWORD)(a) & 0xFF0000) >> 16 ) void drawable_impl_type::set_color(const ::nana::color& clr) diff --git a/source/detail/posix/platform_spec.hpp b/source/detail/posix/platform_spec.hpp index 57a61d1e..83d91616 100644 --- a/source/detail/posix/platform_spec.hpp +++ b/source/detail/posix/platform_spec.hpp @@ -90,10 +90,6 @@ namespace detail #endif drawable_impl_type(); -#if 0 //deprecated - unsigned get_color() const; - unsigned get_text_color() const; -#endif void set_color(const ::nana::color&); void set_text_color(const ::nana::color&); @@ -104,10 +100,6 @@ namespace detail drawable_impl_type& operator=(const drawable_impl_type&) = delete; unsigned current_color_{ 0xFFFFFF }; -#if 0 //deprecated - unsigned color_{ 0xFFFFFFFF }; - unsigned text_color_{ 0xFFFFFFFF }; -#endif }; struct atombase_tag