rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=9cd9c4d944805339b26a1aac6b3b4d6b5156bb9c
commit 9cd9c4d944805339b26a1aac6b3b4d6b5156bb9c Author: Vyacheslav Reutskiy <[email protected]> Date: Thu Jul 9 13:53:11 2015 +0300 Ewe: delete unnecessary widget ewe_win Change-Id: Iddde055361eda456bd3a28dc72bcd784254a1df3 --- src/lib/Ewe.h | 1 - src/lib/Makefile.am | 10 ++------ src/lib/ewe_combobox.c | 3 +-- src/lib/ewe_win.c | 50 ------------------------------------ src/lib/ewe_win.eo | 8 ------ src/lib/ewe_win.h | 40 ----------------------------- src/lib/ewe_win_legacy.h | 67 ------------------------------------------------ 7 files changed, 3 insertions(+), 176 deletions(-) diff --git a/src/lib/Ewe.h b/src/lib/Ewe.h index 73f5034..3963094 100644 --- a/src/lib/Ewe.h +++ b/src/lib/Ewe.h @@ -53,6 +53,5 @@ #include "ewe_ruler.h" #include "ewe_entry.h" #include "ewe_tabs.h" -#include "ewe_win.h" #endif /* ELEMENTARY_WIDGET_EXTENTIONS_H */ diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index a5b020a..d5f5f5f 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -56,10 +56,7 @@ ewe_ruler.h \ ewe_ruler_legacy.h \ ewe_ruler_eo.h \ ewe_ruler_common.h \ -ewe_widget_ruler.h \ -ewe_win.h \ -ewe_win.eo.h \ -ewe_win_legacy.h +ewe_widget_ruler.h includesubdir = $(pkgincludedir)-@VMAJ@ @@ -73,7 +70,6 @@ ewe_statusbar.c \ ewe_combobox.c \ ewe_entry.c \ ewe_ruler.c \ -ewe_win.c \ ewe_private.h BUILT_SOURCES = \ @@ -86,8 +82,6 @@ ewe_combobox.eo.h \ ewe_entry.eo.c \ ewe_entry.eo.h \ ewe_ruler.eo.c \ -ewe_ruler.eo.h \ -ewe_win.eo.h \ -ewe_win.eo.c +ewe_ruler.eo.h EXTRA_DIST = $(BUILT_SOURCES) diff --git a/src/lib/ewe_combobox.c b/src/lib/ewe_combobox.c index 9bea18e..35ef121 100644 --- a/src/lib/ewe_combobox.c +++ b/src/lib/ewe_combobox.c @@ -1,5 +1,4 @@ #include "ewe_private.h" -#include "ewe_win.h" #include "ewe_widget_combobox.h" EAPI Eo_Op EWE_OBJ_COMBOBOX_BASE_ID = EO_NOOP; @@ -81,7 +80,7 @@ _exp_window_create(Evas **evas, Ewe_Combobox_Smart_Data *sd) evas_object_smart_callback_del(sd->win, "unfocused", _focus_out_cb); evas_object_del(sd->win); } - win = ewe_win_add(sd->top_win, "expand_window", ELM_WIN_DROPDOWN_MENU); + win = elm_win_add(sd->top_win, "expand_window", ELM_WIN_DROPDOWN_MENU); elm_win_autodel_set(win, EINA_TRUE); elm_win_borderless_set(win, EINA_TRUE); elm_win_focus_highlight_enabled_set(win, EINA_TRUE); diff --git a/src/lib/ewe_win.c b/src/lib/ewe_win.c deleted file mode 100644 index 2053b07..0000000 --- a/src/lib/ewe_win.c +++ /dev/null @@ -1,50 +0,0 @@ -/** - * Elementary Widgets Extension - * Copyright (C) 2014 Samsung Electronics. - * - * This file is part of Elementary Widgets Extension. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; If not, see www.gnu.org/licenses/lgpl.html. - */ - -#include "ewe_private.h" - -EAPI Evas_Object * -ewe_win_add(Evas_Object *parent, const char *name, Elm_Win_Type type) -{ - return elm_win_add(parent, name, type); -} - -EAPI void -ewe_win_floating_mode_set(Evas_Object *obj, Eina_Bool floating) -{ - elm_win_floating_mode_set(obj, floating); -} - -EAPI Eina_Bool -ewe_win_floating_mode_get(const Evas_Object *obj) -{ - return elm_win_floating_mode_get(obj); -} - -EAPI void -ewe_win_render(Evas_Object *obj) -{ - elm_win_render(obj); -} - -typedef struct _Ewe_Win_Data Ewe_Win_Data; -struct _Ewe_Win_Data { -}; - -#include "ewe_win.eo.c" diff --git a/src/lib/ewe_win.eo b/src/lib/ewe_win.eo deleted file mode 100644 index 5c0a026..0000000 --- a/src/lib/ewe_win.eo +++ /dev/null @@ -1,8 +0,0 @@ -class Ewe_Win (Elm.Win) -{ - eo_prefix: ewe_obj_win; - legacy_prefix: ewe_win; - data: Ewe_Win_Data; -} - - diff --git a/src/lib/ewe_win.h b/src/lib/ewe_win.h deleted file mode 100644 index 5b4fbc8..0000000 --- a/src/lib/ewe_win.h +++ /dev/null @@ -1,40 +0,0 @@ -/** - * Elementary Widgets Extension - * Copyright (C) 2014 Samsung Electronics. - * - * This file is part of Elementary Widgets Extension. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; If not, see www.gnu.org/licenses/lgpl.html. - */ - -#ifndef EWE_WIN_H -#define EWE_WIN_H - -/** - * @defgroup Win Win - * - * The window class of Elementary. Contains functions to manipulate windows. - * The Evas engine used to render the window contents is specified in the system - * or user elementary config files (whichever is found last), and can be - * overridden with the ELM_ENGINE environment variable for testing. - **/ - -#ifdef EFL_EO_API_SUPPORT -#include "ewe_win.eo.h" -#endif - -#ifndef EFL_NOLEGACY_API_SUPPORT -#include "ewe_win_legacy.h" -#endif - -#endif /* EWE_WIN_H */ diff --git a/src/lib/ewe_win_legacy.h b/src/lib/ewe_win_legacy.h deleted file mode 100644 index 975e00e..0000000 --- a/src/lib/ewe_win_legacy.h +++ /dev/null @@ -1,67 +0,0 @@ -/** - * Elementary Widgets Extension - * Copyright (C) 2014 Samsung Electronics. - * - * This file is part of Elementary Widgets Extension. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; If not, see www.gnu.org/licenses/lgpl.html. - */ - -#ifndef EWE_WIN_LEGACY_H -#define EWE_WIN_LEGACY_H - -/** - * Adds a window onject. - * If this is the first window created, pass NULL as parent. - * - * @param parent Parent object to add the window to, or NULL - * @param name The name of the window - * @param type The window type, one of Elm_Win_Type. - * @return The created object, or NULL on failure - * - * @ingroup Win - */ -EAPI Evas_Object * -ewe_win_add(Evas_Object *parent, const char *name, Elm_Win_Type type); - -/** - * Set the floating mode of a window. - * - * @param obj The window object - * @param floating If true, the window is floating mode - * - * @ingroup Win - */ -EAPI void -ewe_win_floating_mode_set(Evas_Object *obj, Eina_Bool floating); - -/** - * Get the floating mode of a window. - * - * @param obj The window object - * - * @ingroup Win - */ -EAPI Eina_Bool -ewe_win_floating_mode_get(const Evas_Object *obj); - -/** - * This manually asks evas to render the window now. - * - * @param obj The window object - * - * @ingroup Win - */ -EAPI void ewe_win_render(Evas_Object *obj); - -#endif /* EWE_WIN_LEGACY_H */ --
