From b73ff1db5f86387c07dbaa134adb867eee602a36 Mon Sep 17 00:00:00 2001 From: Kangho Hur Date: Wed, 7 Sep 2016 20:42:39 +0900 Subject: [PATCH] Change EvasObject's API visibility to protected from internal. * CreateHandle(), OnInstantiated(), OnRealize(), OnUnrealized() has been changed to protected. Change-Id: I32319d5336bb6b61c91bffa2c01695afa2d4257d --- src/ElmSharp/ElmSharp/Background.cs | 2 +- src/ElmSharp/ElmSharp/Box.cs | 2 +- src/ElmSharp/ElmSharp/Button.cs | 9 +++++++-- src/ElmSharp/ElmSharp/Calendar.cs | 2 +- src/ElmSharp/ElmSharp/Check.cs | 4 ++-- src/ElmSharp/ElmSharp/ColorSelector.cs | 4 ++-- src/ElmSharp/ElmSharp/Conformant.cs | 2 +- src/ElmSharp/ElmSharp/ContextPopup.cs | 2 +- src/ElmSharp/ElmSharp/DateTimeSelector.cs | 2 +- src/ElmSharp/ElmSharp/Entry.cs | 2 +- src/ElmSharp/ElmSharp/EvasObject.cs | 8 ++++---- src/ElmSharp/ElmSharp/GenGrid.cs | 2 +- src/ElmSharp/ElmSharp/GenList.cs | 2 +- src/ElmSharp/ElmSharp/Icon.cs | 2 +- src/ElmSharp/ElmSharp/Image.cs | 2 +- src/ElmSharp/ElmSharp/Index.cs | 2 +- src/ElmSharp/ElmSharp/Label.cs | 2 +- src/ElmSharp/ElmSharp/Layout.cs | 2 +- src/ElmSharp/ElmSharp/List.cs | 2 +- src/ElmSharp/ElmSharp/Naviframe.cs | 2 +- src/ElmSharp/ElmSharp/Panel.cs | 2 +- src/ElmSharp/ElmSharp/Panes.cs | 2 +- src/ElmSharp/ElmSharp/Popup.cs | 2 +- src/ElmSharp/ElmSharp/ProgressBar.cs | 2 +- src/ElmSharp/ElmSharp/Radio.cs | 2 +- src/ElmSharp/ElmSharp/Rectangle.cs | 2 +- src/ElmSharp/ElmSharp/Scroller.cs | 2 +- src/ElmSharp/ElmSharp/Slider.cs | 2 +- src/ElmSharp/ElmSharp/Spinner.cs | 2 +- src/ElmSharp/ElmSharp/Table.cs | 2 +- src/ElmSharp/ElmSharp/Toolbar.cs | 2 +- src/ElmSharp/ElmSharp/Window.cs | 2 +- 32 files changed, 43 insertions(+), 38 deletions(-) diff --git a/src/ElmSharp/ElmSharp/Background.cs b/src/ElmSharp/ElmSharp/Background.cs index 791ec12..4335941 100644 --- a/src/ElmSharp/ElmSharp/Background.cs +++ b/src/ElmSharp/ElmSharp/Background.cs @@ -60,7 +60,7 @@ namespace ElmSharp } } - internal override IntPtr CreateHandle(EvasObject parent) + protected override IntPtr CreateHandle(EvasObject parent) { return Interop.Elementary.elm_bg_add(parent.Handle); } diff --git a/src/ElmSharp/ElmSharp/Box.cs b/src/ElmSharp/ElmSharp/Box.cs index 9bb3586..9d6d2d4 100644 --- a/src/ElmSharp/ElmSharp/Box.cs +++ b/src/ElmSharp/ElmSharp/Box.cs @@ -58,7 +58,7 @@ namespace ElmSharp Interop.Elementary.elm_box_layout_set(Handle, _layoutCallback, IntPtr.Zero, null); } - internal override IntPtr CreateHandle(EvasObject parent) + protected override IntPtr CreateHandle(EvasObject parent) { return Interop.Elementary.elm_box_add(parent); } diff --git a/src/ElmSharp/ElmSharp/Button.cs b/src/ElmSharp/ElmSharp/Button.cs index 013bbd2..458f443 100644 --- a/src/ElmSharp/ElmSharp/Button.cs +++ b/src/ElmSharp/ElmSharp/Button.cs @@ -81,9 +81,14 @@ namespace ElmSharp } } - internal override IntPtr CreateHandle(EvasObject parent) + public void DeleteColorClass(string part) + { + Interop.Elementary.edje_object_color_class_del(Handle, part); + } + + protected override IntPtr CreateHandle(EvasObject parent) { return Interop.Elementary.elm_button_add(parent.Handle); } } -} \ No newline at end of file +} diff --git a/src/ElmSharp/ElmSharp/Calendar.cs b/src/ElmSharp/ElmSharp/Calendar.cs index 6f9ede6..e577159 100644 --- a/src/ElmSharp/ElmSharp/Calendar.cs +++ b/src/ElmSharp/ElmSharp/Calendar.cs @@ -129,7 +129,7 @@ namespace ElmSharp } } - internal override IntPtr CreateHandle(EvasObject parent) + protected override IntPtr CreateHandle(EvasObject parent) { return Interop.Elementary.elm_calendar_add(parent.Handle); } diff --git a/src/ElmSharp/ElmSharp/Check.cs b/src/ElmSharp/ElmSharp/Check.cs index 40f6b1a..e3b7f60 100644 --- a/src/ElmSharp/ElmSharp/Check.cs +++ b/src/ElmSharp/ElmSharp/Check.cs @@ -31,9 +31,9 @@ namespace ElmSharp } } - internal override IntPtr CreateHandle(EvasObject parent) + protected override IntPtr CreateHandle(EvasObject parent) { return Interop.Elementary.elm_check_add(parent.Handle); } } -} \ No newline at end of file +} diff --git a/src/ElmSharp/ElmSharp/ColorSelector.cs b/src/ElmSharp/ElmSharp/ColorSelector.cs index 8bfcd2b..b9db578 100644 --- a/src/ElmSharp/ElmSharp/ColorSelector.cs +++ b/src/ElmSharp/ElmSharp/ColorSelector.cs @@ -72,9 +72,9 @@ namespace ElmSharp } } - internal override IntPtr CreateHandle(EvasObject parent) + protected override IntPtr CreateHandle(EvasObject parent) { return Interop.Elementary.elm_colorselector_add(parent.Handle); } } -} \ No newline at end of file +} diff --git a/src/ElmSharp/ElmSharp/Conformant.cs b/src/ElmSharp/ElmSharp/Conformant.cs index e7fd763..8914a70 100644 --- a/src/ElmSharp/ElmSharp/Conformant.cs +++ b/src/ElmSharp/ElmSharp/Conformant.cs @@ -11,7 +11,7 @@ namespace ElmSharp Interop.Elementary.elm_win_resize_object_add(parent.Handle, Handle); } - internal override IntPtr CreateHandle(EvasObject parent) + protected override IntPtr CreateHandle(EvasObject parent) { return Interop.Elementary.elm_conformant_add(parent.Handle); } diff --git a/src/ElmSharp/ElmSharp/ContextPopup.cs b/src/ElmSharp/ElmSharp/ContextPopup.cs index 263cc61..8f9d5b3 100644 --- a/src/ElmSharp/ElmSharp/ContextPopup.cs +++ b/src/ElmSharp/ElmSharp/ContextPopup.cs @@ -94,7 +94,7 @@ namespace ElmSharp return Interop.Elementary.elm_ctxpopup_direction_available_get(Handle, (int)direction); } - internal override IntPtr CreateHandle(EvasObject parent) + protected override IntPtr CreateHandle(EvasObject parent) { return Interop.Elementary.elm_ctxpopup_add(parent.Handle); } diff --git a/src/ElmSharp/ElmSharp/DateTimeSelector.cs b/src/ElmSharp/ElmSharp/DateTimeSelector.cs index 953385e..9327c75 100644 --- a/src/ElmSharp/ElmSharp/DateTimeSelector.cs +++ b/src/ElmSharp/ElmSharp/DateTimeSelector.cs @@ -103,7 +103,7 @@ namespace ElmSharp Interop.Elementary.elm_datetime_field_visible_set(Handle, (int)type, visible); } - internal override IntPtr CreateHandle(EvasObject parent) + protected override IntPtr CreateHandle(EvasObject parent) { return Interop.Elementary.elm_datetime_add(parent.Handle); } diff --git a/src/ElmSharp/ElmSharp/Entry.cs b/src/ElmSharp/ElmSharp/Entry.cs index 312f3b7..5378a8d 100644 --- a/src/ElmSharp/ElmSharp/Entry.cs +++ b/src/ElmSharp/ElmSharp/Entry.cs @@ -262,7 +262,7 @@ namespace ElmSharp Interop.Elementary.elm_entry_input_panel_return_key_type_set(Handle, (Interop.Elementary.ReturnKeyType)keyType); } - internal override IntPtr CreateHandle(EvasObject parent) + protected override IntPtr CreateHandle(EvasObject parent) { return Interop.Elementary.elm_entry_add(parent.Handle); } diff --git a/src/ElmSharp/ElmSharp/EvasObject.cs b/src/ElmSharp/ElmSharp/EvasObject.cs index ddbb441..b7d0393 100644 --- a/src/ElmSharp/ElmSharp/EvasObject.cs +++ b/src/ElmSharp/ElmSharp/EvasObject.cs @@ -268,19 +268,19 @@ namespace ElmSharp { } - internal virtual void OnInstantiated() + protected virtual void OnInstantiated() { } - internal virtual void OnRealized() + protected virtual void OnRealized() { } - internal virtual void OnUnrealize() + protected virtual void OnUnrealize() { } - internal abstract IntPtr CreateHandle(EvasObject parent); + protected abstract IntPtr CreateHandle(EvasObject parent); public void Realize(EvasObject parent) { diff --git a/src/ElmSharp/ElmSharp/GenGrid.cs b/src/ElmSharp/ElmSharp/GenGrid.cs index e36c820..712a77f 100644 --- a/src/ElmSharp/ElmSharp/GenGrid.cs +++ b/src/ElmSharp/ElmSharp/GenGrid.cs @@ -207,7 +207,7 @@ namespace ElmSharp Interop.Elementary.elm_gengrid_realized_items_update(Handle); } - internal override IntPtr CreateHandle(EvasObject parent) + protected override IntPtr CreateHandle(EvasObject parent) { return Interop.Elementary.elm_gengrid_add(parent); } diff --git a/src/ElmSharp/ElmSharp/GenList.cs b/src/ElmSharp/ElmSharp/GenList.cs index fbfc938..c210463 100644 --- a/src/ElmSharp/ElmSharp/GenList.cs +++ b/src/ElmSharp/ElmSharp/GenList.cs @@ -174,7 +174,7 @@ namespace ElmSharp Interop.Elementary.elm_genlist_realized_items_update(Handle); } - internal override IntPtr CreateHandle(EvasObject parent) + protected override IntPtr CreateHandle(EvasObject parent) { return Interop.Elementary.elm_genlist_add(parent); } diff --git a/src/ElmSharp/ElmSharp/Icon.cs b/src/ElmSharp/ElmSharp/Icon.cs index 7c6cbd8..80a4041 100644 --- a/src/ElmSharp/ElmSharp/Icon.cs +++ b/src/ElmSharp/ElmSharp/Icon.cs @@ -48,7 +48,7 @@ namespace ElmSharp Interop.Elementary.elm_icon_thumb_set(Handle, file, group); } - internal override IntPtr CreateHandle(EvasObject parent) + protected override IntPtr CreateHandle(EvasObject parent) { return Interop.Elementary.elm_icon_add(parent); } diff --git a/src/ElmSharp/ElmSharp/Image.cs b/src/ElmSharp/ElmSharp/Image.cs index da4a8b4..84c4227 100644 --- a/src/ElmSharp/ElmSharp/Image.cs +++ b/src/ElmSharp/ElmSharp/Image.cs @@ -282,7 +282,7 @@ namespace ElmSharp } - internal override IntPtr CreateHandle(EvasObject parent) + protected override IntPtr CreateHandle(EvasObject parent) { return Interop.Elementary.elm_image_add(parent.Handle); } diff --git a/src/ElmSharp/ElmSharp/Index.cs b/src/ElmSharp/ElmSharp/Index.cs index d76ecb6..d87b20f 100644 --- a/src/ElmSharp/ElmSharp/Index.cs +++ b/src/ElmSharp/ElmSharp/Index.cs @@ -99,7 +99,7 @@ namespace ElmSharp Interop.Elementary.elm_index_level_go(Handle, level); } - internal override IntPtr CreateHandle(EvasObject parent) + protected override IntPtr CreateHandle(EvasObject parent) { return Interop.Elementary.elm_index_add(parent); } diff --git a/src/ElmSharp/ElmSharp/Label.cs b/src/ElmSharp/ElmSharp/Label.cs index 732918b..4153d76 100644 --- a/src/ElmSharp/ElmSharp/Label.cs +++ b/src/ElmSharp/ElmSharp/Label.cs @@ -82,7 +82,7 @@ namespace ElmSharp Interop.Elementary.elm_label_slide_go(Handle); } - internal override IntPtr CreateHandle(EvasObject parent) + protected override IntPtr CreateHandle(EvasObject parent) { return Interop.Elementary.elm_label_add(parent.Handle); } diff --git a/src/ElmSharp/ElmSharp/Layout.cs b/src/ElmSharp/ElmSharp/Layout.cs index 5610837..5c17bba 100644 --- a/src/ElmSharp/ElmSharp/Layout.cs +++ b/src/ElmSharp/ElmSharp/Layout.cs @@ -47,7 +47,7 @@ namespace ElmSharp Interop.Elementary.elm_layout_file_set(Handle, file, group); } - internal override IntPtr CreateHandle(EvasObject parent) + protected override IntPtr CreateHandle(EvasObject parent) { return Interop.Elementary.elm_layout_add(parent.Handle); } diff --git a/src/ElmSharp/ElmSharp/List.cs b/src/ElmSharp/ElmSharp/List.cs index 378e996..65f7c18 100644 --- a/src/ElmSharp/ElmSharp/List.cs +++ b/src/ElmSharp/ElmSharp/List.cs @@ -113,7 +113,7 @@ namespace ElmSharp _children.Clear(); } - internal override IntPtr CreateHandle(EvasObject parent) + protected override IntPtr CreateHandle(EvasObject parent) { return Interop.Elementary.elm_list_add(parent); } diff --git a/src/ElmSharp/ElmSharp/Naviframe.cs b/src/ElmSharp/ElmSharp/Naviframe.cs index aecf575..1deec51 100644 --- a/src/ElmSharp/ElmSharp/Naviframe.cs +++ b/src/ElmSharp/ElmSharp/Naviframe.cs @@ -83,7 +83,7 @@ namespace ElmSharp Interop.Elementary.elm_naviframe_item_pop(Handle); } - internal override IntPtr CreateHandle(EvasObject parent) + protected override IntPtr CreateHandle(EvasObject parent) { return Interop.Elementary.elm_naviframe_add(parent.Handle); } diff --git a/src/ElmSharp/ElmSharp/Panel.cs b/src/ElmSharp/ElmSharp/Panel.cs index 1686e4e..fa3ae2d 100644 --- a/src/ElmSharp/ElmSharp/Panel.cs +++ b/src/ElmSharp/ElmSharp/Panel.cs @@ -71,7 +71,7 @@ namespace ElmSharp Interop.Elementary.elm_panel_toggle(Handle); } - internal override IntPtr CreateHandle(EvasObject parent) + protected override IntPtr CreateHandle(EvasObject parent) { return Interop.Elementary.elm_panel_add(parent); } diff --git a/src/ElmSharp/ElmSharp/Panes.cs b/src/ElmSharp/ElmSharp/Panes.cs index d37801a..8d4e3c3 100644 --- a/src/ElmSharp/ElmSharp/Panes.cs +++ b/src/ElmSharp/ElmSharp/Panes.cs @@ -53,7 +53,7 @@ namespace ElmSharp } } - internal override IntPtr CreateHandle(EvasObject parent) + protected override IntPtr CreateHandle(EvasObject parent) { return Interop.Elementary.elm_panes_add(parent); } diff --git a/src/ElmSharp/ElmSharp/Popup.cs b/src/ElmSharp/ElmSharp/Popup.cs index 4d2c205..545c412 100644 --- a/src/ElmSharp/ElmSharp/Popup.cs +++ b/src/ElmSharp/ElmSharp/Popup.cs @@ -139,7 +139,7 @@ namespace ElmSharp Interop.Elementary.elm_popup_dismiss(Handle); } - internal override IntPtr CreateHandle(EvasObject parent) + protected override IntPtr CreateHandle(EvasObject parent) { return Interop.Elementary.elm_popup_add(parent.Handle); } diff --git a/src/ElmSharp/ElmSharp/ProgressBar.cs b/src/ElmSharp/ElmSharp/ProgressBar.cs index be27802..db20f46 100644 --- a/src/ElmSharp/ElmSharp/ProgressBar.cs +++ b/src/ElmSharp/ElmSharp/ProgressBar.cs @@ -99,7 +99,7 @@ namespace ElmSharp Interop.Elementary.elm_progressbar_pulse(Handle, false); } - internal override IntPtr CreateHandle(EvasObject parent) + protected override IntPtr CreateHandle(EvasObject parent) { return Interop.Elementary.elm_progressbar_add(parent); } diff --git a/src/ElmSharp/ElmSharp/Radio.cs b/src/ElmSharp/ElmSharp/Radio.cs index cb69cce..6a13202 100644 --- a/src/ElmSharp/ElmSharp/Radio.cs +++ b/src/ElmSharp/ElmSharp/Radio.cs @@ -51,7 +51,7 @@ namespace ElmSharp Interop.Elementary.elm_radio_group_add(Handle, group.Handle); } - internal override IntPtr CreateHandle(EvasObject parent) + protected override IntPtr CreateHandle(EvasObject parent) { return Interop.Elementary.elm_radio_add(parent); } diff --git a/src/ElmSharp/ElmSharp/Rectangle.cs b/src/ElmSharp/ElmSharp/Rectangle.cs index 7e2a1af..7e7b490 100644 --- a/src/ElmSharp/ElmSharp/Rectangle.cs +++ b/src/ElmSharp/ElmSharp/Rectangle.cs @@ -24,7 +24,7 @@ namespace ElmSharp Interop.Evas.evas_object_size_hint_weight_set(Handle, 1.0, 1.0); } - internal override IntPtr CreateHandle(EvasObject parent) + protected override IntPtr CreateHandle(EvasObject parent) { IntPtr evas = Interop.Evas.evas_object_evas_get(parent.Handle); return Interop.Evas.evas_object_rectangle_add(evas); diff --git a/src/ElmSharp/ElmSharp/Scroller.cs b/src/ElmSharp/ElmSharp/Scroller.cs index ce3fd88..1ed8955 100644 --- a/src/ElmSharp/ElmSharp/Scroller.cs +++ b/src/ElmSharp/ElmSharp/Scroller.cs @@ -212,7 +212,7 @@ namespace ElmSharp } } - internal override IntPtr CreateHandle(EvasObject parent) + protected override IntPtr CreateHandle(EvasObject parent) { return Interop.Elementary.elm_scroller_add(parent); } diff --git a/src/ElmSharp/ElmSharp/Slider.cs b/src/ElmSharp/ElmSharp/Slider.cs index de26875..68d2b26 100644 --- a/src/ElmSharp/ElmSharp/Slider.cs +++ b/src/ElmSharp/ElmSharp/Slider.cs @@ -161,7 +161,7 @@ namespace ElmSharp } } - internal override IntPtr CreateHandle(EvasObject parent) + protected override IntPtr CreateHandle(EvasObject parent) { return Interop.Elementary.elm_slider_add(parent); } diff --git a/src/ElmSharp/ElmSharp/Spinner.cs b/src/ElmSharp/ElmSharp/Spinner.cs index 832c9d4..aa01dca 100644 --- a/src/ElmSharp/ElmSharp/Spinner.cs +++ b/src/ElmSharp/ElmSharp/Spinner.cs @@ -161,7 +161,7 @@ namespace ElmSharp return Interop.Elementary.elm_spinner_special_value_get(Handle, value); } - internal override IntPtr CreateHandle(EvasObject parent) + protected override IntPtr CreateHandle(EvasObject parent) { return Interop.Elementary.elm_spinner_add(parent); } diff --git a/src/ElmSharp/ElmSharp/Table.cs b/src/ElmSharp/ElmSharp/Table.cs index ea01411..4f90210 100644 --- a/src/ElmSharp/ElmSharp/Table.cs +++ b/src/ElmSharp/ElmSharp/Table.cs @@ -79,7 +79,7 @@ namespace ElmSharp ClearChildren(); } - internal override IntPtr CreateHandle(EvasObject parent) + protected override IntPtr CreateHandle(EvasObject parent) { return Interop.Elementary.elm_table_add(parent); } diff --git a/src/ElmSharp/ElmSharp/Toolbar.cs b/src/ElmSharp/ElmSharp/Toolbar.cs index 53b4cf9..fd2fcc0 100644 --- a/src/ElmSharp/ElmSharp/Toolbar.cs +++ b/src/ElmSharp/ElmSharp/Toolbar.cs @@ -164,7 +164,7 @@ namespace ElmSharp } } - internal override IntPtr CreateHandle(EvasObject parent) + protected override IntPtr CreateHandle(EvasObject parent) { return Interop.Elementary.elm_toolbar_add(parent); } diff --git a/src/ElmSharp/ElmSharp/Window.cs b/src/ElmSharp/ElmSharp/Window.cs index aaf16cd..744ae86 100644 --- a/src/ElmSharp/ElmSharp/Window.cs +++ b/src/ElmSharp/ElmSharp/Window.cs @@ -138,7 +138,7 @@ namespace ElmSharp Interop.Elementary.elm_win_resize_object_add(Handle, obj); } - internal override IntPtr CreateHandle(EvasObject parent) + protected override IntPtr CreateHandle(EvasObject parent) { Interop.Elementary.elm_config_accel_preference_set("3d"); return Interop.Elementary.elm_win_add(parent != null ? parent.Handle : IntPtr.Zero, Name, 0); -- 2.7.4