Menu
▾
▴
[elj-commits] CVS: elj-2002/lib/ifs/eiffel/ewxw/spec/r_2_2 wx_app_base.e,1.4,1.5 wx_dialog.e,1.4,1.5 wx_frame.e,1.5,1.6 wx_list_event.e,1.2,1.3 wx_window.e,1.5,1.6
|
From: Uwe S. <us...@us...> - 2003-05-17 17:34:37
|
Update of /cvsroot/elj/elj-2002/lib/ifs/eiffel/ewxw/spec/r_2_2
In directory sc8-pr-cvs1:/tmp/cvs-serv11420/spec/r_2_2
Modified Files:
wx_app_base.e wx_dialog.e wx_frame.e wx_list_event.e
wx_window.e
Log Message:
more ISE / SE work
Index: wx_app_base.e
===================================================================
RCS file: /cvsroot/elj/elj-2002/lib/ifs/eiffel/ewxw/spec/r_2_2/wx_app_base.e,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** wx_app_base.e 17 May 2003 13:12:30 -0000 1.4
--- wx_app_base.e 17 May 2003 17:33:58 -0000 1.5
***************
*** 80,85 ****
end -- if
! Result := ELJApp_ExecuteProcess(a_command_line.to_external, a_syncronous.to_integer, prc)
! end -- execute
exit is
--- 80,86 ----
end -- if
! Result := ELJApp_ExecuteProcess(string_to_frozen_external (a_command_line), a_syncronous.to_integer, prc)
! unfreeze_string (a_command_line)
! end
exit is
***************
*** 102,106 ****
end -- if
! prt := ELJApp_FindWindowByLabel(a_label.to_external, prt)
if prt /= default_pointer then
--- 103,109 ----
end -- if
! prt := ELJApp_FindWindowByLabel(string_to_frozen_external (a_label), prt)
!
! unfreeze_string (a_label)
if prt /= default_pointer then
***************
*** 126,130 ****
end -- if
! prt := ELJApp_FindWindowByName(a_name.to_external, prt)
if prt /= default_pointer then
--- 129,135 ----
end -- if
! prt := ELJApp_FindWindowByName(string_to_frozen_external (a_name), prt)
!
! unfreeze_string (a_name)
if prt /= default_pointer then
***************
*** 165,169 ****
suc: CMEM_32
do
! Result := wxDllLoader_LoadLibrary (a_name.to_external, suc.to_external)
library_loaded := suc.to_integer /= 0
end -- load_library
--- 170,175 ----
suc: CMEM_32
do
! Result := wxDllLoader_LoadLibrary (string_to_frozen_external (a_name), suc.to_external)
! unfreeze_string (a_name)
library_loaded := suc.to_integer /= 0
end -- load_library
***************
*** 185,189 ****
do
create Result.make_filled (' ', ELJApp_GetOsDescription (default_pointer))
! res := ELJApp_GetOsDescription (Result.to_external)
end -- os_description
--- 191,196 ----
do
create Result.make_filled (' ', ELJApp_GetOsDescription (default_pointer))
! res := ELJApp_GetOsDescription (string_to_frozen_external (Result))
! unfreeze_string (Result)
end -- os_description
***************
*** 285,294 ****
non_empty_name: a_name.count > 0
do
! Result := wxDllLoader_GetSymbol(a_handle, a_name.to_external)
end -- symbol
translate (a_text: STRING): STRING is
do
! a_text.from_external_copy (wxGetELJTranslation (a_text.to_external))
Result := a_text
end -- translate
--- 292,303 ----
non_empty_name: a_name.count > 0
do
! Result := wxDllLoader_GetSymbol(a_handle, string_to_frozen_external (a_name))
! unfreeze_string (Result)
end -- symbol
translate (a_text: STRING): STRING is
do
! a_text.from_external_copy (wxGetELJTranslation (string_to_frozen_external (a_text)))
! unfreeze_string (a_text)
Result := a_text
end -- translate
***************
*** 305,309 ****
do
create Result.make_filled (' ', ELJApp_GetUserId (default_pointer))
! res := ELJApp_GetUserId(Result.to_external)
end -- user_id
--- 314,319 ----
do
create Result.make_filled (' ', ELJApp_GetUserId (default_pointer))
! res := ELJApp_GetUserId (string_to_frozen_external (Result))
! unfreeze_string (Result)
end -- user_id
***************
*** 313,317 ****
do
create Result.make_filled (' ', ELJApp_GetUserName (default_pointer))
! res := ELJApp_GetUserId(Result.to_external)
end -- user_name
--- 323,328 ----
do
create Result.make_filled (' ', ELJApp_GetUserName (default_pointer))
! res := ELJApp_GetUserName (string_to_frozen_external (Result))
! unfreeze_string (Result)
end -- user_name
***************
*** 323,327 ****
do
create Result.make_filled (' ', ELJApp_GetUserHome (a_user.to_external, default_pointer))
! res := ELJApp_GetUserHome (a_user.to_external, Result.to_external)
end -- user_name
--- 334,339 ----
do
create Result.make_filled (' ', ELJApp_GetUserHome (a_user.to_external, default_pointer))
! res := ELJApp_GetUserHome (string_to_frozen_external (Result))
! unfreeze_string (Result)
end -- user_name
Index: wx_dialog.e
===================================================================
RCS file: /cvsroot/elj/elj-2002/lib/ifs/eiffel/ewxw/spec/r_2_2/wx_dialog.e,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** wx_dialog.e 17 Feb 2003 05:28:38 -0000 1.4
--- wx_dialog.e 17 May 2003 17:34:00 -0000 1.5
***************
*** 73,77 ****
end -- if
! wx_handle := wxDialog_Create (prt, a_id, a_text.to_external, a_left, a_top, a_width, a_height, a_style.to_integer)
link_to_external
ensure
--- 73,78 ----
end -- if
! wx_handle := wxDialog_Create (prt, a_id, string_to_frozen_external (a_text), a_left, a_top, a_width, a_height, a_style.to_integer)
! unfreeze_string (a_text)
link_to_external
ensure
Index: wx_frame.e
===================================================================
RCS file: /cvsroot/elj/elj-2002/lib/ifs/eiffel/ewxw/spec/r_2_2/wx_frame.e,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** wx_frame.e 17 Feb 2003 05:28:38 -0000 1.5
--- wx_frame.e 17 May 2003 17:34:01 -0000 1.6
***************
*** 63,67 ****
wx_handle := wxFrame_Create ( parent_handle,
a_id,
! a_caption.to_external,
a_left,
a_top,
--- 63,67 ----
wx_handle := wxFrame_Create ( parent_handle,
a_id,
! string_to_frozen_external (a_caption),
a_left,
a_top,
***************
*** 70,73 ****
--- 70,74 ----
a_style.to_integer)
+ unfreeze_string (a_caption)
link_to_external
ensure
Index: wx_list_event.e
===================================================================
RCS file: /cvsroot/elj/elj-2002/lib/ifs/eiffel/ewxw/spec/r_2_2/wx_list_event.e,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** wx_list_event.e 17 May 2003 13:12:30 -0000 1.2
--- wx_list_event.e 17 May 2003 17:34:01 -0000 1.3
***************
*** 93,97 ****
do
create Result.make_filled (' ', wxListEvent_GetText(a_event, default_pointer))
! res := wxListEvent_GetText(a_event, Result.to_external)
end -- item_text
--- 93,98 ----
do
create Result.make_filled (' ', wxListEvent_GetText(a_event, default_pointer))
! res := wxListEvent_GetText(a_event, string_to_frozen_external (Result))
! unfreeze_string (Result)
end -- item_text
***************
*** 104,108 ****
do
create Result.make_filled (' ', wxListEvent_GetLabel(a_event, default_pointer))
! res := wxListEvent_GetLabel(a_event, Result.to_external)
end -- label
--- 105,110 ----
do
create Result.make_filled (' ', wxListEvent_GetLabel(a_event, default_pointer))
! res := wxListEvent_GetLabel(a_event, string_to_frozen_external (Result))
! unfreeze_string (Result)
end -- label
Index: wx_window.e
===================================================================
RCS file: /cvsroot/elj/elj-2002/lib/ifs/eiffel/ewxw/spec/r_2_2/wx_window.e,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** wx_window.e 17 May 2003 13:12:30 -0000 1.5
--- wx_window.e 17 May 2003 17:34:01 -0000 1.6
***************
*** 315,319 ****
do
create Result.make_filled (' ', wxWindow_GetLabel(wx_handle, default_pointer))
! sze := wxWindow_GetLabel(wx_handle, Result.to_external)
end -- label
--- 315,320 ----
do
create Result.make_filled (' ', wxWindow_GetLabel(wx_handle, default_pointer))
! sze := wxWindow_GetLabel(wx_handle, string_to_frozen_external (Result))
! unfreeze_string (Result)
end -- label
***************
*** 399,403 ****
do
create Result.make_filled (' ', wxWindow_GetName(wx_handle, default_pointer))
! sze := wxWindow_GetName(wx_handle, Result.to_external)
end -- name
--- 400,405 ----
do
create Result.make_filled (' ', wxWindow_GetName(wx_handle, default_pointer))
! sze := wxWindow_GetName(wx_handle, string_to_frozen_external (Result))
! unfreeze_string (Result)
end -- name
***************
*** 707,711 ****
end -- if
! wxWindow_SetLabel(wx_handle, txt.to_external)
end -- set_label
--- 709,715 ----
end -- if
! wxWindow_SetLabel(wx_handle, string_to_frozen_external (txt))
!
! unfreeze_string (txt)
end -- set_label
***************
*** 716,720 ****
non_void_text: a_text /= Void
do
! wxWindow_SetName(wx_handle, a_text.to_external)
ensure
name_set: name.is_equal (a_text)
--- 720,725 ----
non_void_text: a_text /= Void
do
! wxWindow_SetName(wx_handle, string_to_frozen_external (a_text))
! unfreeze_string (a_text)
ensure
name_set: name.is_equal (a_text)
***************
*** 786,790 ****
non_void_tip: a_tip /= Void
do
! wxWindow_SetToolTip (wx_handle, a_tip.to_external)
ensure
tool_tip_set: tool_tip.is_equal (a_tip)
--- 791,796 ----
non_void_tip: a_tip /= Void
do
! wxWindow_SetToolTip (wx_handle, string_to_frozen_external (a_tip))
! unfreeze_string (a_tip)
ensure
tool_tip_set: tool_tip.is_equal (a_tip)
***************
*** 846,850 ****
if len > 0 then
create Result.make_filled ('%U', len)
! len := wxWindow_GetToolTip(wx_handle, Result.to_external)
end -- if
end -- tool_tip
--- 852,857 ----
if len > 0 then
create Result.make_filled ('%U', len)
! len := wxWindow_GetToolTip(wx_handle, string_to_frozen_external (Result))
! unfreeze_string (Result)
end -- if
end -- tool_tip
***************
*** 881,885 ****
end -- if
! wxWindow_GetTextExtent(wx_handle, a_string.to_external, xmm.to_external, ymm.to_external, default_pointer, default_pointer, fnt)
Result := [xmm.to_integer, ymm.to_integer]
--- 888,893 ----
end -- if
! wxWindow_GetTextExtent(wx_handle, string_to_frozen_external (a_string), xmm.to_external, ymm.to_external, default_pointer, default_pointer, fnt)
! unfreeze_string (a_string)
Result := [xmm.to_integer, ymm.to_integer]
|