diff --git a/collects/mred/private/kernel.ss b/collects/mred/private/kernel.ss index 013790272f..003f04926b 100644 --- a/collects/mred/private/kernel.ss +++ b/collects/mred/private/kernel.ss @@ -226,7 +226,7 @@ load-file insert-port save-port - get-default-style-name + default-style-name get-flattened-text put-file get-file @@ -886,7 +886,7 @@ get-end-position get-start-position get-position - get-default-style-name + default-style-name get-flattened-text put-file get-file @@ -1097,7 +1097,7 @@ do-copy delete insert - get-default-style-name + default-style-name get-flattened-text put-file get-file diff --git a/src/mred/wxs/wxs_mbuf.xci b/src/mred/wxs/wxs_mbuf.xci index 596879e2d8..65ab5a3680 100644 --- a/src/mred/wxs/wxs_mbuf.xci +++ b/src/mred/wxs/wxs_mbuf.xci @@ -92,4 +92,4 @@ @ X "get-flattened-text" : mzstring/makeNoCopyFlatString[_x0] GetFlattenedText(-long*); -@ Z "get-default-style-name" : string GetDefaultStyleName() +@ Z "default-style-name" : string GetDefaultStyleName() diff --git a/src/mred/wxs/wxs_mede.cxx b/src/mred/wxs/wxs_mede.cxx index bb6f01bfcd..2c16fe4ab2 100644 --- a/src/mred/wxs/wxs_mede.cxx +++ b/src/mred/wxs/wxs_mede.cxx @@ -1944,7 +1944,7 @@ string os_wxMediaEdit::GetDefaultStyleName() VAR_STACK_PUSH_ARRAY(2, p, POFFSET+0); SET_VAR_STACK(); - method = objscheme_find_method((Scheme_Object *) ASSELF __gc_external, os_wxMediaEdit_class, "get-default-style-name", &mcache); + method = objscheme_find_method((Scheme_Object *) ASSELF __gc_external, os_wxMediaEdit_class, "default-style-name", &mcache); if (!method || OBJSCHEME_PRIM_METHOD(method, os_wxMediaEditGetDefaultStyleName)) { SET_VAR_STACK(); READY_TO_RETURN; return ASSELF wxMediaEdit::GetDefaultStyleName(); @@ -1958,7 +1958,7 @@ string os_wxMediaEdit::GetDefaultStyleName() { string resval; - resval = (string)WITH_VAR_STACK(objscheme_unbundle_string(v, "get-default-style-name in text%"", extracting return value")); + resval = (string)WITH_VAR_STACK(objscheme_unbundle_string(v, "default-style-name in text%"", extracting return value")); READY_TO_RETURN; return resval; } @@ -7132,7 +7132,7 @@ static Scheme_Object *os_wxMediaEditGetDefaultStyleName(int n, Scheme_Object *p WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p) REMEMBER_VAR_STACK(); string r; - objscheme_check_valid(os_wxMediaEdit_class, "get-default-style-name in text%", n, p); + objscheme_check_valid(os_wxMediaEdit_class, "default-style-name in text%", n, p); SETUP_VAR_STACK_REMEMBERED(1); VAR_STACK_PUSH(0, p); @@ -8671,7 +8671,7 @@ void objscheme_setup_wxMediaEdit(Scheme_Env *env) WITH_VAR_STACK(scheme_add_method_w_arity(os_wxMediaEdit_class, "get-end-position" " method", (Scheme_Method_Prim *)os_wxMediaEditGetEndPosition, 0, 0)); WITH_VAR_STACK(scheme_add_method_w_arity(os_wxMediaEdit_class, "get-start-position" " method", (Scheme_Method_Prim *)os_wxMediaEditGetStartPosition, 0, 0)); WITH_VAR_STACK(scheme_add_method_w_arity(os_wxMediaEdit_class, "get-position" " method", (Scheme_Method_Prim *)os_wxMediaEditGetPosition, 1, 2)); - WITH_VAR_STACK(scheme_add_method_w_arity(os_wxMediaEdit_class, "get-default-style-name" " method", (Scheme_Method_Prim *)os_wxMediaEditGetDefaultStyleName, 0, 0)); + WITH_VAR_STACK(scheme_add_method_w_arity(os_wxMediaEdit_class, "default-style-name" " method", (Scheme_Method_Prim *)os_wxMediaEditGetDefaultStyleName, 0, 0)); WITH_VAR_STACK(scheme_add_method_w_arity(os_wxMediaEdit_class, "get-flattened-text" " method", (Scheme_Method_Prim *)os_wxMediaEditGetFlattenedText, 0, 0)); WITH_VAR_STACK(scheme_add_method_w_arity(os_wxMediaEdit_class, "put-file" " method", (Scheme_Method_Prim *)os_wxMediaEditPutFile, 2, 2)); WITH_VAR_STACK(scheme_add_method_w_arity(os_wxMediaEdit_class, "get-file" " method", (Scheme_Method_Prim *)os_wxMediaEditGetFile, 1, 1)); diff --git a/src/mred/wxs/wxs_mpb.cxx b/src/mred/wxs/wxs_mpb.cxx index 2258ccf0f2..9b438afd5e 100644 --- a/src/mred/wxs/wxs_mpb.cxx +++ b/src/mred/wxs/wxs_mpb.cxx @@ -1728,7 +1728,7 @@ string os_wxMediaPasteboard::GetDefaultStyleName() VAR_STACK_PUSH_ARRAY(2, p, POFFSET+0); SET_VAR_STACK(); - method = objscheme_find_method((Scheme_Object *) ASSELF __gc_external, os_wxMediaPasteboard_class, "get-default-style-name", &mcache); + method = objscheme_find_method((Scheme_Object *) ASSELF __gc_external, os_wxMediaPasteboard_class, "default-style-name", &mcache); if (!method || OBJSCHEME_PRIM_METHOD(method, os_wxMediaPasteboardGetDefaultStyleName)) { SET_VAR_STACK(); READY_TO_RETURN; return ASSELF wxMediaPasteboard::GetDefaultStyleName(); @@ -1742,7 +1742,7 @@ string os_wxMediaPasteboard::GetDefaultStyleName() { string resval; - resval = (string)WITH_VAR_STACK(objscheme_unbundle_string(v, "get-default-style-name in pasteboard%"", extracting return value")); + resval = (string)WITH_VAR_STACK(objscheme_unbundle_string(v, "default-style-name in pasteboard%"", extracting return value")); READY_TO_RETURN; return resval; } @@ -5301,7 +5301,7 @@ static Scheme_Object *os_wxMediaPasteboardGetDefaultStyleName(int n, Scheme_Obj WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p) REMEMBER_VAR_STACK(); string r; - objscheme_check_valid(os_wxMediaPasteboard_class, "get-default-style-name in pasteboard%", n, p); + objscheme_check_valid(os_wxMediaPasteboard_class, "default-style-name in pasteboard%", n, p); SETUP_VAR_STACK_REMEMBERED(1); VAR_STACK_PUSH(0, p); @@ -6973,7 +6973,7 @@ void objscheme_setup_wxMediaPasteboard(Scheme_Env *env) WITH_VAR_STACK(scheme_add_method_w_arity(os_wxMediaPasteboard_class, "do-copy" " method", (Scheme_Method_Prim *)os_wxMediaPasteboardDoCopy, 2, 2)); WITH_VAR_STACK(scheme_add_method_w_arity(os_wxMediaPasteboard_class, "delete" " method", (Scheme_Method_Prim *)os_wxMediaPasteboardDelete, 0, 1)); WITH_VAR_STACK(scheme_add_method_w_arity(os_wxMediaPasteboard_class, "insert" " method", (Scheme_Method_Prim *)os_wxMediaPasteboardInsert, 1, 4)); - WITH_VAR_STACK(scheme_add_method_w_arity(os_wxMediaPasteboard_class, "get-default-style-name" " method", (Scheme_Method_Prim *)os_wxMediaPasteboardGetDefaultStyleName, 0, 0)); + WITH_VAR_STACK(scheme_add_method_w_arity(os_wxMediaPasteboard_class, "default-style-name" " method", (Scheme_Method_Prim *)os_wxMediaPasteboardGetDefaultStyleName, 0, 0)); WITH_VAR_STACK(scheme_add_method_w_arity(os_wxMediaPasteboard_class, "get-flattened-text" " method", (Scheme_Method_Prim *)os_wxMediaPasteboardGetFlattenedText, 0, 0)); WITH_VAR_STACK(scheme_add_method_w_arity(os_wxMediaPasteboard_class, "put-file" " method", (Scheme_Method_Prim *)os_wxMediaPasteboardPutFile, 2, 2)); WITH_VAR_STACK(scheme_add_method_w_arity(os_wxMediaPasteboard_class, "get-file" " method", (Scheme_Method_Prim *)os_wxMediaPasteboardGetFile, 1, 1));