Index: trunk/src/change_act.c
===================================================================
--- trunk/src/change_act.c	(revision 24060)
+++ trunk/src/change_act.c	(revision 24061)
@@ -198,9 +198,11 @@
 
 			pcb_hid_get_coords("Click on object to change", &x, &y, 0);
 
-			if ((type = pcb_search_screen(x, y, PCB_CHANGESIZE_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_OBJ_VOID)
-				if (PCB_FLAG_TEST(PCB_FLAG_LOCK, (pcb_any_obj_t *) ptr2))
-					pcb_message(PCB_MSG_WARNING, "Sorry, the object is locked\n");
+			if ((type = pcb_search_screen(x, y, PCB_CHANGESIZE_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_OBJ_VOID) {
+				pcb_any_obj_t *obj = (pcb_any_obj_t *)ptr2;
+				if (PCB_FLAG_TEST(PCB_FLAG_LOCK, obj))
+					pcb_message(PCB_MSG_WARNING, "Sorry, %s object is locked\n", pcb_obj_type_name(obj->type));
+			}
 			if (set_object(type, ptr1, ptr2, ptr3))
 				pcb_board_set_changed_flag(pcb_true);
 			break;
@@ -304,9 +306,11 @@
 		switch (funcid) {
 		case F_Object:
 			{
-				if (type != PCB_OBJ_VOID)
-					if (PCB_FLAG_TEST(PCB_FLAG_LOCK, (pcb_any_obj_t *) ptr2))
-						pcb_message(PCB_MSG_WARNING, "Sorry, the object is locked\n");
+				if (type != PCB_OBJ_VOID) {
+					pcb_any_obj_t *obj = (pcb_any_obj_t *)ptr2;
+					if (PCB_FLAG_TEST(PCB_FLAG_LOCK, obj))
+						pcb_message(PCB_MSG_WARNING, "Sorry, %s object is locked\n", pcb_obj_type_name(obj->type));
+				}
 				if (tostyle) {
 					if (pcb_chg_obj_1st_size(type, ptr1, ptr2, ptr3, value, absolute))
 						pcb_board_set_changed_flag(pcb_true);
@@ -862,8 +866,9 @@
 		case F_Object:
 			{
 				if (type != PCB_OBJ_VOID) {
-					if (PCB_FLAG_TEST(PCB_FLAG_LOCK, (pcb_any_obj_t *) ptr2))
-						pcb_message(PCB_MSG_WARNING, "Sorry, the object is locked\n");
+					pcb_any_obj_t *obj = (pcb_any_obj_t *)ptr2;
+					if (PCB_FLAG_TEST(PCB_FLAG_LOCK, obj))
+						pcb_message(PCB_MSG_WARNING, "Sorry, %s object is locked\n", pcb_obj_type_name(obj->type));
 					else {
 						if (pcb_chg_obj_angle(type, ptr1, ptr2, ptr3, which, value, absolute))
 							pcb_board_set_changed_flag(pcb_true);
@@ -930,8 +935,9 @@
 		case F_Object:
 			{
 				if (type != PCB_OBJ_VOID) {
-					if (PCB_FLAG_TEST(PCB_FLAG_LOCK, (pcb_any_obj_t *) ptr2))
-						pcb_message(PCB_MSG_WARNING, "Sorry, the object is locked\n");
+					pcb_any_obj_t *obj = (pcb_any_obj_t *)ptr2;
+					if (PCB_FLAG_TEST(PCB_FLAG_LOCK, obj))
+						pcb_message(PCB_MSG_WARNING, "Sorry, %s object is locked\n", pcb_obj_type_name(obj->type));
 					else {
 						if (pcb_chg_obj_radius(type, ptr1, ptr2, ptr3, which, value, absolute))
 							pcb_board_set_changed_flag(pcb_true);
Index: trunk/src/obj_arc.c
===================================================================
--- trunk/src/obj_arc.c	(revision 24060)
+++ trunk/src/obj_arc.c	(revision 24061)
@@ -656,7 +656,7 @@
 	pcb_arc_t *newone;
 
 	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Arc)) {
-		pcb_message(PCB_MSG_WARNING, "Sorry, the object is locked\n");
+		pcb_message(PCB_MSG_WARNING, "Sorry, arc object is locked\n");
 		return NULL;
 	}
 	if (ctx->move.dst_layer == Layer && Layer->meta.real.vis)
Index: trunk/src/obj_line.c
===================================================================
--- trunk/src/obj_line.c	(revision 24060)
+++ trunk/src/obj_line.c	(revision 24061)
@@ -702,7 +702,7 @@
 	void *ptr1, *ptr2, *ptr3;
 
 	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Line)) {
-		pcb_message(PCB_MSG_WARNING, "Sorry, the object is locked\n");
+		pcb_message(PCB_MSG_WARNING, "Sorry, line object is locked\n");
 		return NULL;
 	}
 	if (ctx->move.dst_layer == Layer && Layer->meta.real.vis)
Index: trunk/src/obj_poly.c
===================================================================
--- trunk/src/obj_poly.c	(revision 24060)
+++ trunk/src/obj_poly.c	(revision 24061)
@@ -752,7 +752,7 @@
 	pcb_poly_t *newone;
 
 	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Polygon)) {
-		pcb_message(PCB_MSG_WARNING, "Sorry, the object is locked\n");
+		pcb_message(PCB_MSG_WARNING, "Sorry, polygon object is locked\n");
 		return NULL;
 	}
 	if (Layer == ctx->move.dst_layer)
Index: trunk/src/obj_text.c
===================================================================
--- trunk/src/obj_text.c	(revision 24060)
+++ trunk/src/obj_text.c	(revision 24061)
@@ -649,7 +649,7 @@
 void *pcb_textop_move_to_layer(pcb_opctx_t *ctx, pcb_layer_t * layer, pcb_text_t * text)
 {
 	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, text)) {
-		pcb_message(PCB_MSG_WARNING, "Sorry, the object is locked\n");
+		pcb_message(PCB_MSG_WARNING, "Sorry, text object is locked\n");
 		return NULL;
 	}
 	if (ctx->move.dst_layer != layer) {
Index: trunk/src/rotate.c
===================================================================
--- trunk/src/rotate.c	(revision 24060)
+++ trunk/src/rotate.c	(revision 24061)
@@ -139,8 +139,9 @@
 	int type;
 	void *ptr1, *ptr2, *ptr3;
 	if ((type = pcb_search_screen(X, Y, PCB_ROTATE_TYPES | PCB_LOOSE_SUBC, &ptr1, &ptr2, &ptr3)) != PCB_OBJ_VOID) {
-		if (PCB_FLAG_TEST(PCB_FLAG_LOCK, (pcb_arc_t *) ptr2)) {
-			pcb_message(PCB_MSG_WARNING, "Sorry, the object is locked\n");
+		pcb_any_obj_t *obj = (pcb_any_obj_t *)ptr2;
+		if (PCB_FLAG_TEST(PCB_FLAG_LOCK, obj)) {
+			pcb_message(PCB_MSG_WARNING, "Sorry, %s object is locked\n", pcb_obj_type_name(obj->type));
 			return;
 		}
 		pcb_event(PCB_EVENT_RUBBER_RESET, NULL);
@@ -158,8 +159,9 @@
 	int type;
 	void *ptr1, *ptr2, *ptr3;
 	if ((type = pcb_search_screen(X, Y, PCB_ROTATE_TYPES | PCB_LOOSE_SUBC, &ptr1, &ptr2, &ptr3)) != PCB_OBJ_VOID) {
-		if (PCB_FLAG_TEST(PCB_FLAG_LOCK, (pcb_arc_t *) ptr2)) {
-			pcb_message(PCB_MSG_WARNING, "Sorry, the object is locked\n");
+		pcb_any_obj_t *obj = (pcb_any_obj_t *)ptr2;
+		if (PCB_FLAG_TEST(PCB_FLAG_LOCK, obj)) {
+			pcb_message(PCB_MSG_WARNING, "Sorry, %s object is locked\n", pcb_obj_type_name(obj->type));
 			return;
 		}
 		pcb_event(PCB_EVENT_RUBBER_RESET, NULL);
Index: trunk/src/tool_insert.c
===================================================================
--- trunk/src/tool_insert.c	(revision 24060)
+++ trunk/src/tool_insert.c	(revision 24061)
@@ -69,9 +69,9 @@
 									 &pcb_crosshair.AttachedObject.Ptr1, &pcb_crosshair.AttachedObject.Ptr2, &pcb_crosshair.AttachedObject.Ptr3);
 
 		if (pcb_crosshair.AttachedObject.Type != PCB_OBJ_VOID) {
-			if (PCB_FLAG_TEST(PCB_FLAG_LOCK, (pcb_poly_t *)
-										pcb_crosshair.AttachedObject.Ptr2)) {
-				pcb_message(PCB_MSG_WARNING, "Sorry, the object is locked\n");
+			pcb_any_obj_t *obj = (pcb_any_obj_t *)pcb_crosshair.AttachedObject.Ptr2;
+			if (PCB_FLAG_TEST(PCB_FLAG_LOCK, obj)) {
+				pcb_message(PCB_MSG_WARNING, "Sorry, %s object is locked\n", pcb_obj_type_name(obj->type));
 				pcb_crosshair.AttachedObject.Type = PCB_OBJ_VOID;
 				break;
 			}
Index: trunk/src/tool_move.c
===================================================================
--- trunk/src/tool_move.c	(revision 24060)
+++ trunk/src/tool_move.c	(revision 24061)
@@ -63,8 +63,9 @@
 				pcb_search_screen(pcb_tool_note.X, pcb_tool_note.Y, types,
 										 &pcb_crosshair.AttachedObject.Ptr1, &pcb_crosshair.AttachedObject.Ptr2, &pcb_crosshair.AttachedObject.Ptr3);
 			if (pcb_crosshair.AttachedObject.Type != PCB_OBJ_VOID) {
-				if (PCB_FLAG_TEST(PCB_FLAG_LOCK, (pcb_any_obj_t *) pcb_crosshair.AttachedObject.Ptr2)) {
-					pcb_message(PCB_MSG_WARNING, "Sorry, the object is locked\n");
+				pcb_any_obj_t *obj = (pcb_any_obj_t *)pcb_crosshair.AttachedObject.Ptr2;
+				if (PCB_FLAG_TEST(PCB_FLAG_LOCK, obj)) {
+					pcb_message(PCB_MSG_WARNING, "Sorry, %s object is locked\n", pcb_obj_type_name(obj->type));
 					pcb_crosshair.AttachedObject.Type = PCB_OBJ_VOID;
 				}
 				else
Index: trunk/src/tool_polyhole.c
===================================================================
--- trunk/src/tool_polyhole.c	(revision 24060)
+++ trunk/src/tool_polyhole.c	(revision 24061)
@@ -65,9 +65,8 @@
 			break; /* don't start doing anything if clicket out of polys */
 		}
 
-		if (PCB_FLAG_TEST(PCB_FLAG_LOCK, (pcb_poly_t *)
-									pcb_crosshair.AttachedObject.Ptr2)) {
-			pcb_message(PCB_MSG_WARNING, "Sorry, the object is locked\n");
+		if (PCB_FLAG_TEST(PCB_FLAG_LOCK, (pcb_poly_t *)pcb_crosshair.AttachedObject.Ptr2)) {
+			pcb_message(PCB_MSG_WARNING, "Sorry, poly object is locked\n");
 			pcb_crosshair.AttachedObject.Type = PCB_OBJ_VOID;
 			break;
 		}
Index: trunk/src/tool_remove.c
===================================================================
--- trunk/src/tool_remove.c	(revision 24060)
+++ trunk/src/tool_remove.c	(revision 24061)
@@ -50,8 +50,9 @@
 	int type;
 	
 	if ((type = pcb_search_screen(pcb_tool_note.X, pcb_tool_note.Y, PCB_REMOVE_TYPES | PCB_LOOSE_SUBC, &ptr1, &ptr2, &ptr3)) != PCB_OBJ_VOID) {
-		if (PCB_FLAG_TEST(PCB_FLAG_LOCK, (pcb_line_t *) ptr2)) {
-			pcb_message(PCB_MSG_WARNING, "Sorry, the object is locked\n");
+		obj = (pcb_any_obj_t *)ptr2;
+		if (PCB_FLAG_TEST(PCB_FLAG_LOCK, obj)) {
+			pcb_message(PCB_MSG_WARNING, "Sorry, %s object is locked\n", pcb_obj_type_name(obj->type));
 			return;
 		}