diff options
author | Felipe Magno de Almeida <felipe@expertisesolutions.com.br> | 2014-07-23 16:51:01 -0300 |
---|---|---|
committer | Felipe Magno de Almeida <felipe@expertisesolutions.com.br> | 2014-07-23 16:51:01 -0300 |
commit | 1857e0df0b29a19a6aea330c85ffed0482b58041 (patch) | |
tree | 69d84595f7318c8bf41f9534d852091c2b656cf7 /src/lib | |
parent | b425ec957a2dc92b872c26b80559bfaca625b121 (diff) |
Fix C++ box_cxx_example_02.cc and removed text_part_{set/get} from elm_button
As discussed in IRC, the commit that added text_part_set,
text_part_get functions to elm_button are wrong. The correct functions
to be used are from elm_layout: text_set and text_get.
Fixed the example to use these functions that are inherited on
elm_button from elm_layout and fixed the cleanup of childrens
in the parent window by using the del event callback.
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/elm_button.c | 20 | ||||
-rw-r--r-- | src/lib/elm_button.eo | 66 |
2 files changed, 0 insertions, 86 deletions
diff --git a/src/lib/elm_button.c b/src/lib/elm_button.c index 6db3487d1..d9376c08f 100644 --- a/src/lib/elm_button.c +++ b/src/lib/elm_button.c | |||
@@ -433,26 +433,6 @@ _elm_button_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSE | |||
433 | return &key_actions[0]; | 433 | return &key_actions[0]; |
434 | } | 434 | } |
435 | 435 | ||
436 | EOLIAN const char* _elm_button_part_text_get(Eo* obj, Elm_Button_Data* pd EINA_UNUSED, const char* part) | ||
437 | { | ||
438 | return elm_object_part_text_get(obj, part); | ||
439 | } | ||
440 | |||
441 | EOLIAN void _elm_button_part_text_set(Eo* obj, Elm_Button_Data* pd EINA_UNUSED, const char* part, const char* text) | ||
442 | { | ||
443 | return elm_object_part_text_set(obj, part, text); | ||
444 | } | ||
445 | |||
446 | EOLIAN const char* _elm_button_text_get(Eo* obj, Elm_Button_Data* pd EINA_UNUSED) | ||
447 | { | ||
448 | return _elm_button_part_text_get(obj, pd, NULL); | ||
449 | } | ||
450 | |||
451 | EOLIAN void _elm_button_text_set(Eo* obj, Elm_Button_Data* pd EINA_UNUSED, const char* text) | ||
452 | { | ||
453 | return _elm_button_part_text_set(obj, pd, NULL, text); | ||
454 | } | ||
455 | |||
456 | static void | 436 | static void |
457 | _elm_button_class_constructor(Eo_Class *klass) | 437 | _elm_button_class_constructor(Eo_Class *klass) |
458 | { | 438 | { |
diff --git a/src/lib/elm_button.eo b/src/lib/elm_button.eo index 1b40c2d1e..4e0d567fa 100644 --- a/src/lib/elm_button.eo +++ b/src/lib/elm_button.eo | |||
@@ -96,72 +96,6 @@ class Elm_Button (Elm_Layout, Evas.Clickable_Interface, | |||
96 | } | 96 | } |
97 | } | 97 | } |
98 | } | 98 | } |
99 | methods { | ||
100 | part_text_set { | ||
101 | /** | ||
102 | * Set a text of an object | ||
103 | * | ||
104 | * @param obj The Elementary object | ||
105 | * @param part The text part name to set (NULL for the default part) | ||
106 | * @param text The new text of the part | ||
107 | * | ||
108 | * @note Elementary objects may have many text parts (e.g. Action Slider) | ||
109 | * | ||
110 | * @ingroup General | ||
111 | */ | ||
112 | params { | ||
113 | @in const(char)* part; | ||
114 | @in const(char)* text; | ||
115 | } | ||
116 | } | ||
117 | part_text_get { | ||
118 | /** | ||
119 | * Get a text of an object | ||
120 | * | ||
121 | * @param obj The Elementary object | ||
122 | * @param part The text part name to get (NULL for the default part) | ||
123 | * @return text of the part or NULL for any error | ||
124 | * | ||
125 | * @note Elementary objects may have many text parts (e.g. Action Slider) | ||
126 | * | ||
127 | * @ingroup General | ||
128 | */ | ||
129 | params { | ||
130 | @in const(char)* part; | ||
131 | } | ||
132 | return const(char)*; | ||
133 | } | ||
134 | text_set { | ||
135 | /** | ||
136 | * Set a text of an object | ||
137 | * | ||
138 | * @param obj The Elementary object | ||
139 | * @param part The text part name to set (NULL for the default part) | ||
140 | * @param text The new text of the part | ||
141 | * | ||
142 | * @note Elementary objects may have many text parts (e.g. Action Slider) | ||
143 | * | ||
144 | * @ingroup General | ||
145 | */ | ||
146 | params { | ||
147 | @in const(char)* text; | ||
148 | } | ||
149 | } | ||
150 | text_get { | ||
151 | /** | ||
152 | * Get a text of an object | ||
153 | * | ||
154 | * @param obj The Elementary object | ||
155 | * @param part The text part name to get (NULL for the default part) | ||
156 | * @return text of the part or NULL for any error | ||
157 | * | ||
158 | * @note Elementary objects may have many text parts (e.g. Action Slider) | ||
159 | * | ||
160 | * @ingroup General | ||
161 | */ | ||
162 | return const(char)*; | ||
163 | } | ||
164 | } | ||
165 | implements { | 99 | implements { |
166 | class.constructor; | 100 | class.constructor; |
167 | Eo.Base.constructor; | 101 | Eo.Base.constructor; |