summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/modules/elm/CElmFileSelectorButton.cc16
-rw-r--r--src/modules/elm/CElmFileSelectorEntry.cc20
-rw-r--r--src/modules/elm/CElmWeb.cc6
3 files changed, 21 insertions, 21 deletions
diff --git a/src/modules/elm/CElmFileSelectorButton.cc b/src/modules/elm/CElmFileSelectorButton.cc
index 8ba4e8d..0110c57 100644
--- a/src/modules/elm/CElmFileSelectorButton.cc
+++ b/src/modules/elm/CElmFileSelectorButton.cc
@@ -51,13 +51,13 @@ void CElmFileSelectorButton::win_title_set(Handle<Value> val)
51 51
52Handle<Value> CElmFileSelectorButton::path_get() const 52Handle<Value> CElmFileSelectorButton::path_get() const
53{ 53{
54 return String::New(elm_fileselector_button_path_get(eo)); 54 return String::New(elm_fileselector_path_get(eo));
55} 55}
56 56
57void CElmFileSelectorButton::path_set(Handle<Value> val) 57void CElmFileSelectorButton::path_set(Handle<Value> val)
58{ 58{
59 if (val->IsString() || val->IsNumber()) 59 if (val->IsString() || val->IsNumber())
60 elm_fileselector_button_path_set(eo, *String::Utf8Value(val)); 60 elm_fileselector_path_set(eo, *String::Utf8Value(val));
61} 61}
62 62
63void CElmFileSelectorButton::win_size_set(Handle<Value> val) 63void CElmFileSelectorButton::win_size_set(Handle<Value> val)
@@ -88,32 +88,32 @@ Handle<Value> CElmFileSelectorButton::win_size_get(void) const
88 88
89Handle<Value> CElmFileSelectorButton::expandable_get() const 89Handle<Value> CElmFileSelectorButton::expandable_get() const
90{ 90{
91 return Boolean::New(elm_fileselector_button_expandable_get(eo)); 91 return Boolean::New(elm_fileselector_expandable_get(eo));
92} 92}
93 93
94void CElmFileSelectorButton::expandable_set(Handle<Value> val) 94void CElmFileSelectorButton::expandable_set(Handle<Value> val)
95{ 95{
96 elm_fileselector_button_expandable_set(eo, val->BooleanValue()); 96 elm_fileselector_expandable_set(eo, val->BooleanValue());
97} 97}
98 98
99Handle<Value> CElmFileSelectorButton::folder_only_get() const 99Handle<Value> CElmFileSelectorButton::folder_only_get() const
100{ 100{
101 return Boolean::New(elm_fileselector_button_folder_only_get(eo)); 101 return Boolean::New(elm_fileselector_folder_only_get(eo));
102} 102}
103 103
104void CElmFileSelectorButton::folder_only_set(Handle<Value> val) 104void CElmFileSelectorButton::folder_only_set(Handle<Value> val)
105{ 105{
106 elm_fileselector_button_folder_only_set(eo, val->BooleanValue()); 106 elm_fileselector_folder_only_set(eo, val->BooleanValue());
107} 107}
108 108
109Handle<Value> CElmFileSelectorButton::is_save_get() const 109Handle<Value> CElmFileSelectorButton::is_save_get() const
110{ 110{
111 return Boolean::New(elm_fileselector_button_is_save_get (eo)); 111 return Boolean::New(elm_fileselector_is_save_get (eo));
112} 112}
113 113
114void CElmFileSelectorButton::is_save_set(Handle<Value> val) 114void CElmFileSelectorButton::is_save_set(Handle<Value> val)
115{ 115{
116 elm_fileselector_button_is_save_set(eo, val->BooleanValue()); 116 elm_fileselector_is_save_set(eo, val->BooleanValue());
117} 117}
118 118
119Handle<Value> CElmFileSelectorButton::inwin_mode_get() const 119Handle<Value> CElmFileSelectorButton::inwin_mode_get() const
diff --git a/src/modules/elm/CElmFileSelectorEntry.cc b/src/modules/elm/CElmFileSelectorEntry.cc
index 8e33cc0..6d0961c 100644
--- a/src/modules/elm/CElmFileSelectorEntry.cc
+++ b/src/modules/elm/CElmFileSelectorEntry.cc
@@ -68,26 +68,26 @@ void CElmFileSelectorEntry::win_title_set(Handle<Value> val)
68 68
69Handle<Value> CElmFileSelectorEntry::selected_get() const 69Handle<Value> CElmFileSelectorEntry::selected_get() const
70{ 70{
71 const char *entry_selected = elm_fileselector_entry_selected_get(eo); 71 const char *entry_selected = elm_fileselector_selected_get(eo);
72 return entry_selected ? String::New(entry_selected) : Undefined(); 72 return entry_selected ? String::New(entry_selected) : Undefined();
73} 73}
74 74
75void CElmFileSelectorEntry::selected_set(Handle<Value> val) 75void CElmFileSelectorEntry::selected_set(Handle<Value> val)
76{ 76{
77 if (val->IsString()) 77 if (val->IsString())
78 elm_fileselector_entry_selected_set(eo, *String::Utf8Value(val)); 78 elm_fileselector_selected_set(eo, *String::Utf8Value(val));
79} 79}
80 80
81Handle<Value> CElmFileSelectorEntry::path_get() const 81Handle<Value> CElmFileSelectorEntry::path_get() const
82{ 82{
83 const char *entry_path = elm_fileselector_entry_path_get(eo); 83 const char *entry_path = elm_fileselector_path_get(eo);
84 return entry_path ? String::New(entry_path) : Undefined(); 84 return entry_path ? String::New(entry_path) : Undefined();
85} 85}
86 86
87void CElmFileSelectorEntry::path_set(Handle<Value> val) 87void CElmFileSelectorEntry::path_set(Handle<Value> val)
88{ 88{
89 if (val->IsString()) 89 if (val->IsString())
90 elm_fileselector_entry_path_set(eo, *String::Utf8Value(val)); 90 elm_fileselector_path_set(eo, *String::Utf8Value(val));
91} 91}
92 92
93void CElmFileSelectorEntry::win_size_set(Handle<Value> val) 93void CElmFileSelectorEntry::win_size_set(Handle<Value> val)
@@ -116,30 +116,30 @@ Handle<Value> CElmFileSelectorEntry::win_size_get(void) const
116 116
117Handle<Value> CElmFileSelectorEntry::expandable_get() const 117Handle<Value> CElmFileSelectorEntry::expandable_get() const
118{ 118{
119 return Boolean::New(elm_fileselector_entry_expandable_get(eo)); 119 return Boolean::New(elm_fileselector_expandable_get(eo));
120} 120}
121 121
122void CElmFileSelectorEntry::expandable_set(Handle<Value> val) 122void CElmFileSelectorEntry::expandable_set(Handle<Value> val)
123{ 123{
124 elm_fileselector_entry_expandable_set(eo, val->BooleanValue()); 124 elm_fileselector_expandable_set(eo, val->BooleanValue());
125} 125}
126Handle<Value> CElmFileSelectorEntry::folder_only_get() const 126Handle<Value> CElmFileSelectorEntry::folder_only_get() const
127{ 127{
128 return Boolean::New(elm_fileselector_entry_folder_only_get(eo)); 128 return Boolean::New(elm_fileselector_folder_only_get(eo));
129} 129}
130 130
131void CElmFileSelectorEntry::folder_only_set(Handle<Value> val) 131void CElmFileSelectorEntry::folder_only_set(Handle<Value> val)
132{ 132{
133 elm_fileselector_entry_folder_only_set(eo, val->BooleanValue()); 133 elm_fileselector_folder_only_set(eo, val->BooleanValue());
134} 134}
135Handle<Value> CElmFileSelectorEntry::is_save_get() const 135Handle<Value> CElmFileSelectorEntry::is_save_get() const
136{ 136{
137 return Boolean::New(elm_fileselector_entry_is_save_get (eo)); 137 return Boolean::New(elm_fileselector_is_save_get (eo));
138} 138}
139 139
140void CElmFileSelectorEntry::is_save_set(Handle<Value> val) 140void CElmFileSelectorEntry::is_save_set(Handle<Value> val)
141{ 141{
142 elm_fileselector_entry_is_save_set(eo, val->BooleanValue()); 142 elm_fileselector_is_save_set(eo, val->BooleanValue());
143} 143}
144 144
145Handle<Value> CElmFileSelectorEntry::inwin_mode_get() const 145Handle<Value> CElmFileSelectorEntry::inwin_mode_get() const
diff --git a/src/modules/elm/CElmWeb.cc b/src/modules/elm/CElmWeb.cc
index b5c2f7d..ab6ab59 100644
--- a/src/modules/elm/CElmWeb.cc
+++ b/src/modules/elm/CElmWeb.cc
@@ -114,7 +114,7 @@ void CElmWeb::tab_propagate_set(Handle<Value> val)
114 114
115Handle<Value> CElmWeb::uri_get() const 115Handle<Value> CElmWeb::uri_get() const
116{ 116{
117 const char *current_uri = elm_web_uri_get(eo); 117 const char *current_uri = elm_web_url_get(eo);
118 118
119 return current_uri ? String::New(current_uri) : Undefined(); 119 return current_uri ? String::New(current_uri) : Undefined();
120} 120}
@@ -122,7 +122,7 @@ Handle<Value> CElmWeb::uri_get() const
122void CElmWeb::uri_set(Handle<Value> val) 122void CElmWeb::uri_set(Handle<Value> val)
123{ 123{
124 if (val->IsString()) 124 if (val->IsString())
125 elm_web_uri_set(eo, *String::Utf8Value(val)); 125 elm_web_url_set(eo, *String::Utf8Value(val));
126} 126}
127 127
128Handle<Value> CElmWeb::bg_color_get() const 128Handle<Value> CElmWeb::bg_color_get() const
@@ -398,7 +398,7 @@ void CElmWeb::on_uri_change_set(Handle<Value> val)
398void CElmWeb::OnUriChange() 398void CElmWeb::OnUriChange()
399{ 399{
400 HandleScope scope; 400 HandleScope scope;
401 const char *uri = elm_web_uri_get(eo); 401 const char *uri = elm_web_url_get(eo);
402 Handle<Function> callback(Function::Cast(*cb.on_uri_change)); 402 Handle<Function> callback(Function::Cast(*cb.on_uri_change));
403 Handle<Value> args[1] = { String::New(uri ? uri : "") }; 403 Handle<Value> args[1] = { String::New(uri ? uri : "") };
404 callback->Call(jsObject, 1, args); 404 callback->Call(jsObject, 1, args);