[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

gEDA-cvs: pcb.git: branch: master updated (2c683cfb8bdc22ca9e16de39917a4f4dfc39b298)



The branch, master has been updated
       via  2c683cfb8bdc22ca9e16de39917a4f4dfc39b298 (commit)
      from  ebcc08a6d4d8d3071e4fb31e7e010d0c095c7ad9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


=========
 Summary
=========

 src/hid/lesstif/dialogs.c |   44 ++++++++++++++++++++++----------------------
 src/hid/lesstif/lesstif.h |    1 +
 src/hid/lesstif/library.c |    4 ++--
 src/hid/lesstif/main.c    |   18 +++++++++---------
 src/hid/lesstif/menu.c    |   16 ++++++++--------
 src/hid/lesstif/netlist.c |   20 ++++++++++----------
 src/hid/lesstif/styles.c  |   14 +++++++-------
 7 files changed, 59 insertions(+), 58 deletions(-)


=================
 Commit Messages
=================

commit 2c683cfb8bdc22ca9e16de39917a4f4dfc39b298
Author: DJ Delorie <dj@xxxxxxxxxxx>
Commit: DJ Delorie <dj@xxxxxxxxxxx>

    Centralize Lesstif XmStringCreate*
    
    Closes-bug: lp-699472
    
    To save time in the future, all XmString creation is done via
    XmStringCreatePCB which is a macro in lesstif.h.  Meanwhile, this macro
    is defined to XmStringCreateLtoR instead of XmStringCreateLocalized.

:100644 100644 8d606ae... 2f956a9... M	src/hid/lesstif/dialogs.c
:100644 100644 1bd368f... c4a2df4... M	src/hid/lesstif/lesstif.h
:100644 100644 f818fe5... 5ce77f7... M	src/hid/lesstif/library.c
:100644 100644 9335490... ff6d8cd... M	src/hid/lesstif/main.c
:100644 100644 09bf74b... 4647fea... M	src/hid/lesstif/menu.c
:100644 100644 42d1263... e5575d2... M	src/hid/lesstif/netlist.c
:100644 100644 9e9b61c... 91e8c79... M	src/hid/lesstif/styles.c

=========
 Changes
=========

commit 2c683cfb8bdc22ca9e16de39917a4f4dfc39b298
Author: DJ Delorie <dj@xxxxxxxxxxx>
Commit: DJ Delorie <dj@xxxxxxxxxxx>

    Centralize Lesstif XmStringCreate*
    
    Closes-bug: lp-699472
    
    To save time in the future, all XmString creation is done via
    XmStringCreatePCB which is a macro in lesstif.h.  Meanwhile, this macro
    is defined to XmStringCreateLtoR instead of XmStringCreateLocalized.

diff --git a/src/hid/lesstif/dialogs.c b/src/hid/lesstif/dialogs.c
index 8d606ae..2f956a9 100644
--- a/src/hid/lesstif/dialogs.c
+++ b/src/hid/lesstif/dialogs.c
@@ -74,14 +74,14 @@ setup_fsb_dialog ()
   if (fsb)
     return;
 
-  xms_pcb = XmStringCreateLocalized ("*.pcb");
-  xms_fp = XmStringCreateLocalized ("*.fp");
-  xms_net = XmStringCreateLocalized ("*.net");
-  xms_vend = XmStringCreateLocalized ("*.vend");
-  xms_all = XmStringCreateLocalized ("*");
-  xms_load = XmStringCreateLocalized ("Load From");
-  xms_loadv = XmStringCreateLocalized ("Load Vendor");
-  xms_save = XmStringCreateLocalized ("Save As");
+  xms_pcb = XmStringCreatePCB ("*.pcb");
+  xms_fp = XmStringCreatePCB ("*.fp");
+  xms_net = XmStringCreatePCB ("*.net");
+  xms_vend = XmStringCreatePCB ("*.vend");
+  xms_all = XmStringCreatePCB ("*");
+  xms_load = XmStringCreatePCB ("Load From");
+  xms_loadv = XmStringCreatePCB ("Load Vendor");
+  xms_save = XmStringCreatePCB ("Save As");
 
   n = 0;
   fsb = XmCreateFileSelectionDialog (mainwind, "file", args, n);
@@ -455,12 +455,12 @@ lesstif_confirm_dialog (char *msg, ...)
     }
 
   n = 0;
-  xs = XmStringCreateLocalized (cancelmsg);
+  xs = XmStringCreatePCB (cancelmsg);
 
   if (okmsg)
     {
       stdarg (XmNcancelLabelString, xs);
-      xs = XmStringCreateLocalized (okmsg);
+      xs = XmStringCreatePCB (okmsg);
       XtManageChild (confirm_cancel);
     }
   else
@@ -468,7 +468,7 @@ lesstif_confirm_dialog (char *msg, ...)
 
   stdarg (XmNokLabelString, xs);
 
-  xs = XmStringCreateLocalized (msg);
+  xs = XmStringCreatePCB (msg);
   stdarg (XmNmessageString, xs);
   XtSetValues (confirm_dialog, args, n);
 
@@ -590,7 +590,7 @@ lesstif_prompt_for (const char *msg, const char *default_string)
   if (!msg)
     msg = "Enter text:";
   n = 0;
-  xs = XmStringCreateLocalized ((char *)msg);
+  xs = XmStringCreatePCB ((char *)msg);
   stdarg (XmNlabelString, xs);
   XtSetValues (prompt_label, args, n);
   XmTextSetString (prompt_text, (char *)default_string);
@@ -663,7 +663,7 @@ lesstif_attribute_dialog (HID_Attribute * attrs,
   int attrcount = 0;
 
   if (!empty)
-    empty = XmStringCreateLocalized (" ");
+    empty = XmStringCreatePCB (" ");
 
   for (i = 0; i < n_attrs; i++)
     {
@@ -778,7 +778,7 @@ lesstif_attribute_dialog (HID_Attribute * attrs,
 	    int sn = n;
 
 	    if (empty == 0)
-	      empty = XmStringCreateLocalized ("");
+	      empty = XmStringCreatePCB ("");
 
 	    submenu = XmCreatePulldownMenu (form, attrs[i].name, args+sn, n-sn);
 
@@ -792,7 +792,7 @@ lesstif_attribute_dialog (HID_Attribute * attrs,
 		Widget btn;
 		XmString label;
 		n = 0;
-		label = XmStringCreateLocalized ((char *)attrs[i].enumerations[sn]);
+		label = XmStringCreatePCB ((char *)attrs[i].enumerations[sn]);
 		stdarg (XmNuserData, & attrs[i].enumerations[sn]);
 		stdarg (XmNlabelString, label);
 		btn = XmCreatePushButton (submenu, "menubutton", args, n);
@@ -952,7 +952,7 @@ About (int argc, char **argv, int x, int y)
   if (!about)
     {
       Cardinal n = 0;
-      XmString xs = XmStringCreateLocalized (GetInfoString ());
+      XmString xs = XmStringCreatePCB (GetInfoString ());
       stdarg (XmNmessageString, xs);
       stdarg (XmNtitle, "About PCB");
       about = XmCreateInformationDialog (mainwind, "about", args, n);
@@ -1207,7 +1207,7 @@ lesstif_sizes_reset ()
   else
     ls = "Units are Mils";
   n = 0;
-  stdarg (XmNlabelString, XmStringCreateLocalized (ls));
+  stdarg (XmNlabelString, XmStringCreatePCB (ls));
   XtSetValues (sz_units, args, n);
 }
 
@@ -1233,7 +1233,7 @@ size_field (Widget parent, char *label, int posn)
   stdarg (XmNtopPosition, posn);
   stdarg (XmNbottomAttachment, XmATTACH_POSITION);
   stdarg (XmNbottomPosition, posn + 1);
-  stdarg (XmNlabelString, XmStringCreateLocalized (label));
+  stdarg (XmNlabelString, XmStringCreatePCB (label));
   stdarg (XmNalignment, XmALIGNMENT_END);
   l = XmCreateLabel (parent, "label", args, n);
   XtManageChild (l);
@@ -1525,7 +1525,7 @@ lesstif_update_layer_groups ()
 	name = SOLDER_SIDE_NAME;
       else if (i == component_silk_layer)
 	name = COMPONENT_SIDE_NAME;
-      stdarg (XmNlabelString, XmStringCreateLocalized (name));
+      stdarg (XmNlabelString, XmStringCreatePCB (name));
       XtSetValues (lglabels[i], args, n);
       for (j = 0; j < max_group; j++)
 	{
@@ -1637,7 +1637,7 @@ EditLayerGroups (int argc, char **argv, int x, int y)
 	      stdarg (XmNtopPosition, i * MAX_LAYER);
 	      stdarg (XmNbottomAttachment, XmATTACH_POSITION);
 	      stdarg (XmNbottomPosition, (i + 1) * MAX_LAYER);
-	      stdarg (XmNlabelString, XmStringCreateLocalized (" "));
+	      stdarg (XmNlabelString, XmStringCreatePCB (" "));
 	      stdarg (XmNspacing, 0);
 	      stdarg (XmNvisibleWhenOff, True);
 	      stdarg (XmNfillOnSelect, True);
@@ -2036,9 +2036,9 @@ ImportGUI (int argc, char **argv, int x, int y)
     return 1;
 
   if (xms_sch == 0)
-    xms_sch = XmStringCreateLocalized ("*.sch");
+    xms_sch = XmStringCreatePCB ("*.sch");
   if (xms_import == 0)
-    xms_import = XmStringCreateLocalized ("Import from");
+    xms_import = XmStringCreatePCB ("Import from");
 
   setup_fsb_dialog ();
 
diff --git a/src/hid/lesstif/lesstif.h b/src/hid/lesstif/lesstif.h
index 1bd368f..c4a2df4 100644
--- a/src/hid/lesstif/lesstif.h
+++ b/src/hid/lesstif/lesstif.h
@@ -60,3 +60,4 @@ extern void lesstif_attributes_dialog (char *, AttributeListType *);
 #define need_idle_proc lesstif_need_idle_proc
 #define show_crosshair lesstif_show_crosshair
 
+#define XmStringCreatePCB(x) XmStringCreateLtoR((x), XmFONTLIST_DEFAULT_TAG)
diff --git a/src/hid/lesstif/library.c b/src/hid/lesstif/library.c
index f818fe5..5ce77f7 100644
--- a/src/hid/lesstif/library.c
+++ b/src/hid/lesstif/library.c
@@ -53,7 +53,7 @@ pick_net (int pick)
     free (libnode_strings);
   libnode_strings = (XmString *) malloc (menu->EntryN * sizeof (XmString));
   for (i = 0; i < menu->EntryN; i++)
-    libnode_strings[i] = XmStringCreateLocalized (menu->Entry[i].ListEntry);
+    libnode_strings[i] = XmStringCreatePCB (menu->Entry[i].ListEntry);
   n = 0;
   stdarg (XmNitems, libnode_strings);
   stdarg (XmNitemCount, menu->EntryN);
@@ -135,7 +135,7 @@ LibraryChanged (int argc, char **argv, int x, int y)
     free (library_strings);
   library_strings = (XmString *) malloc (Library.MenuN * sizeof (XmString));
   for (i = 0; i < Library.MenuN; i++)
-    library_strings[i] = XmStringCreateLocalized (Library.Menu[i].Name);
+    library_strings[i] = XmStringCreatePCB (Library.Menu[i].Name);
   n = 0;
   stdarg (XmNitems, library_strings);
   stdarg (XmNitemCount, Library.MenuN);
diff --git a/src/hid/lesstif/main.c b/src/hid/lesstif/main.c
index 9335490..ff6d8cd 100644
--- a/src/hid/lesstif/main.c
+++ b/src/hid/lesstif/main.c
@@ -1871,7 +1871,7 @@ lesstif_do_export (HID_Attr_Val * options)
   stdarg (XmNtopAttachment, XmATTACH_FORM);
   stdarg (XmNbottomAttachment, XmATTACH_FORM);
   stdarg (XmNleftAttachment, XmATTACH_FORM);
-  stdarg (XmNlabelString, XmStringCreateLocalized ("Command: "));
+  stdarg (XmNlabelString, XmStringCreatePCB ("Command: "));
   m_cmd_label = XmCreateLabel (messages, "command", args, n);
 
   n = 0;
@@ -2333,7 +2333,7 @@ mark_delta_to_widget (BDimension dx, BDimension dy, Widget w)
                              prec, dx, prec, dy, prec, dist, angle);
     }
 
-  ms = XmStringCreateLocalized (buf);
+  ms = XmStringCreatePCB (buf);
   n = 0;
   stdarg (XmNlabelString, ms);
   XtSetValues (w, args, n);
@@ -2372,7 +2372,7 @@ cursor_pos_to_widget (BDimension x, BDimension y, Widget w, int prev_state)
   else
     buf = pcb_g_strdup_printf ("%m+%.*mS, %.*mS", UUNIT, prec, x, prec, y);
 
-  ms = XmStringCreateLocalized (buf);
+  ms = XmStringCreatePCB (buf);
   n = 0;
   stdarg (XmNlabelString, ms);
   XtSetValues (w, args, n);
@@ -2425,7 +2425,7 @@ lesstif_update_status_line ()
       break;
     }
 
-  xs = XmStringCreateLocalized (buf);
+  xs = XmStringCreatePCB (buf);
   n = 0;
   stdarg (XmNlabelString, xs);
   XtSetValues (m_status, args, n);
@@ -2634,7 +2634,7 @@ idle_proc (XtPointer dummy)
 	    else
 	      pcb_sprintf (buf, "%m+%$mS", UUNIT, (BDimension) old_grid);
 	  }
-	ms = XmStringCreateLocalized (buf);
+	ms = XmStringCreatePCB (buf);
 	n = 0;
 	stdarg (XmNlabelString, ms);
 	XtSetValues (m_grid, args, n);
@@ -2668,7 +2668,7 @@ idle_proc (XtPointer dummy)
 	  sprintf (buf, "%d %s/pix", (int) (g + 0.005), units);
 	else
 	  sprintf (buf, "%.2f %s/pix", g, units);
-	ms = XmStringCreateLocalized (buf);
+	ms = XmStringCreatePCB (buf);
 	n = 0;
 	stdarg (XmNlabelString, ms);
 	XtSetValues (m_zoom, args, n);
@@ -2762,7 +2762,7 @@ idle_proc (XtPointer dummy)
 	    cursor = XC_hand2;
 	    break;
 	  }
-	ms = XmStringCreateLocalized (s);
+	ms = XmStringCreatePCB (s);
 	n = 0;
 	stdarg (XmNlabelString, ms);
 	XtSetValues (m_mode, args, n);
@@ -2833,7 +2833,7 @@ idle_proc (XtPointer dummy)
 	  }
 
 	n = 0;
-	stdarg (XmNlabelString, XmStringCreateLocalized (buf));
+	stdarg (XmNlabelString, XmStringCreatePCB (buf));
 	XtSetValues (m_rats, args, n);
 
 	if (!PCB->Data->RatN)
@@ -3892,7 +3892,7 @@ lesstif_progress_dialog (int so_far, int total, const char *msg)
   XtSetValues (progress_scale, args, n);
 
   n = 0;
-  xs = XmStringCreateLocalized ((char *)msg);
+  xs = XmStringCreatePCB ((char *)msg);
   stdarg (XmNmessageString, xs);
   XtSetValues (progress_dialog, args, n);
 
diff --git a/src/hid/lesstif/menu.c b/src/hid/lesstif/menu.c
index 09bf74b..4647fea 100644
--- a/src/hid/lesstif/menu.c
+++ b/src/hid/lesstif/menu.c
@@ -249,7 +249,7 @@ LayersChanged (int argc, char **argv, int x, int y)
 	  n = 0;
 	  if (i < MAX_LAYER && PCB->Data->Layer[i].Name)
 	    {
-	      XmString s = XmStringCreateLocalized (PCB->Data->Layer[i].Name);
+	      XmString s = XmStringCreatePCB (PCB->Data->Layer[i].Name);
 	      stdarg (XmNlabelString, s);
 	    }
 	  if (!lb->is_pick)
@@ -297,7 +297,7 @@ LayersChanged (int argc, char **argv, int x, int y)
       n = 0;
       stdarg (XmNbackground, fg_colors[current_layer]);
       stdarg (XmNforeground, bg_color);
-      stdarg (XmNlabelString, XmStringCreateLocalized (name));
+      stdarg (XmNlabelString, XmStringCreatePCB (name));
       XtSetValues (lesstif_m_layer, args, n);
     }
 
@@ -414,7 +414,7 @@ layerpick_button_callback (Widget w, int layer,
   n = 0;
   stdarg (XmNbackground, fg_colors[layer]);
   stdarg (XmNforeground, bg_color);
-  stdarg (XmNlabelString, XmStringCreateLocalized (name));
+  stdarg (XmNlabelString, XmStringCreatePCB (name));
   XtSetValues (lesstif_m_layer, args, n);
   lesstif_invalidate_all ();
 }
@@ -560,7 +560,7 @@ insert_layerview_buttons (Widget menu)
 	  Resource *ar;
 	  XmString as;
 	  sprintf (buf, "Ctrl-%d", accel_idx + 1);
-	  as = XmStringCreateLocalized (buf);
+	  as = XmStringCreatePCB (buf);
 	  stdarg (XmNacceleratorText, as);
 	  ar = resource_create (0);
 	  sprintf (av, "ToggleView(%d)", i + 1);
@@ -632,7 +632,7 @@ insert_layerpick_buttons (Widget menu)
 	  resource_add_val (ar, 0, strdup (av), 0);
 	  ar->flags |= FLAG_V;
 	  sprintf (buf, "%d", i + 1);
-	  as = XmStringCreateLocalized (buf);
+	  as = XmStringCreatePCB (buf);
 	  stdarg (XmNacceleratorText, as);
 	  sprintf (av, "<Key>%d", accel_idx + 1);
 	  note_accelerator (av, ar);
@@ -779,7 +779,7 @@ lesstif_button_event (Widget w, XEvent * e)
 void
 lesstif_get_xy (const char *message)
 {
-  XmString ls = XmStringCreateLocalized ((char *)message);
+  XmString ls = XmStringCreatePCB ((char *)message);
 
   XtManageChild (m_click);
   n = 0;
@@ -1265,7 +1265,7 @@ add_resource_to_menu (Widget menu, Resource * node, XtCallbackProc callback)
 	  }
 	if ((r = resource_subres (node->v[i].subres, "a")))
 	  {
-	    XmString as = XmStringCreateLocalized (r->v[0].value);
+	    XmString as = XmStringCreatePCB (r->v[0].value);
 	    stdarg (XmNacceleratorText, as);
 	    //stdarg(XmNaccelerator, r->v[1].value);
 	    note_accelerator (r->v[1].value, node->v[i].subres);
@@ -1277,7 +1277,7 @@ add_resource_to_menu (Widget menu, Resource * node, XtCallbackProc callback)
 	      v = node->v[i].subres->v[j].value;
 	      break;
 	    }
-	stdarg (XmNlabelString, XmStringCreateLocalized (v));
+	stdarg (XmNlabelString, XmStringCreatePCB (v));
 	if (node->v[i].subres->flags & FLAG_S)
 	  {
 	    int nn = n;
diff --git a/src/hid/lesstif/netlist.c b/src/hid/lesstif/netlist.c
index 42d1263..e5575d2 100644
--- a/src/hid/lesstif/netlist.c
+++ b/src/hid/lesstif/netlist.c
@@ -62,7 +62,7 @@ pick_net (int pick)
   n_netnode_strings = menu->EntryN;
   netnode_strings = (XmString *) malloc (menu->EntryN * sizeof (XmString));
   for (i = 0; i < menu->EntryN; i++)
-    netnode_strings[i] = XmStringCreateLocalized (menu->Entry[i].ListEntry);
+    netnode_strings[i] = XmStringCreatePCB (menu->Entry[i].ListEntry);
   n = 0;
   stdarg (XmNitems, netnode_strings);
   stdarg (XmNitemCount, menu->EntryN);
@@ -87,7 +87,7 @@ netlist_select (Widget w, void *v, XmListCallbackStruct * cbs)
       net->flag = 1;
     }
 
-  str = XmStringCreateLocalized (name);
+  str = XmStringCreatePCB (name);
   XmListReplaceItemsPos (netlist_list, &str, 1, pos);
   XmStringFree (str);
   XmListSelectPos (netlist_list, pos, False);
@@ -109,7 +109,7 @@ nbcb_rat_on (LibraryMenuTypePtr net, int pos)
   char *name = net->Name;
   name[0] = ' ';
   net->flag = 1;
-  str = XmStringCreateLocalized (name);
+  str = XmStringCreatePCB (name);
   XmListReplaceItemsPos (netlist_list, &str, 1, pos);
   XmStringFree (str);
 }
@@ -121,7 +121,7 @@ nbcb_rat_off (LibraryMenuTypePtr net, int pos)
   char *name = net->Name;
   name[0] = '*';
   net->flag = 0;
-  str = XmStringCreateLocalized (name);
+  str = XmStringCreatePCB (name);
   XmListReplaceItemsPos (netlist_list, &str, 1, pos);
   XmStringFree (str);
 }
@@ -289,7 +289,7 @@ netlist_button (Widget parent, char *name, char *string,
   NLB_W (bottom);
   NLB_W (left);
   NLB_W (right);
-  str = XmStringCreateLocalized (string);
+  str = XmStringCreatePCB (string);
   stdarg(XmNlabelString, str);
   rv = XmCreatePushButton (parent, name, args, n);
   XtManageChild (rv);
@@ -351,7 +351,7 @@ build_netlist_dialog ()
   stdarg (XmNbottomAttachment, XmATTACH_WIDGET);
   stdarg (XmNbottomWidget, b_sel);
   stdarg (XmNleftAttachment, XmATTACH_FORM);
-  ops_str = XmStringCreateLocalized ("Operations on selected net names:");
+  ops_str = XmStringCreatePCB ("Operations on selected net names:");
   stdarg (XmNlabelString, ops_str);
   l_ops = XmCreateLabel (netlist_dialog, "ops", args, n);
   XtManageChild (l_ops);
@@ -399,7 +399,7 @@ LesstifNetlistChanged (int argc, char **argv, int x, int y)
     (XmString *) malloc (PCB->NetlistLib.MenuN * sizeof (XmString));
   for (i = 0; i < PCB->NetlistLib.MenuN; i++)
     netlist_strings[i] =
-      XmStringCreateLocalized (PCB->NetlistLib.Menu[i].Name);
+      XmStringCreatePCB (PCB->NetlistLib.Menu[i].Name);
   n = 0;
   stdarg (XmNitems, netlist_strings);
   stdarg (XmNitemCount, PCB->NetlistLib.MenuN);
@@ -435,13 +435,13 @@ LesstifNetlistShow (int argc, char **argv, int x, int y)
 	  int vis = 0;
 
 	  /* Select net first, 'True' causes pick_net() to be invoked */
-	  item = XmStringCreateLocalized (net->Name);
+	  item = XmStringCreatePCB (net->Name);
 	  XmListSelectItem (netlist_list, item, True);
 	  XmListSetItem (netlist_list, item);
 	  XmStringFree (item);
 
 	  /* Now the netnode_list has the right contents */
-	  item = XmStringCreateLocalized (argv[0]);
+	  item = XmStringCreatePCB (argv[0]);
 	  XmListSelectItem (netnode_list, item, False);
 
 	  /*
@@ -467,7 +467,7 @@ LesstifNetlistShow (int argc, char **argv, int x, int y)
 	    {
 	      XmString item;
 
-	      item = XmStringCreateLocalized (net->Name);
+	      item = XmStringCreatePCB (net->Name);
 	      XmListSetItem (netlist_list, item);
 	      XmListSelectItem (netlist_list, item, True);
 	      XmStringFree (item);
diff --git a/src/hid/lesstif/styles.c b/src/hid/lesstif/styles.c
index 9e9b61c..91e8c79 100644
--- a/src/hid/lesstif/styles.c
+++ b/src/hid/lesstif/styles.c
@@ -308,7 +308,7 @@ style_button (int i)
   stdarg (XmNtopAttachment, XmATTACH_WIDGET);
   stdarg (XmNtopWidget, i ? style_pb[i - 1] : value_form);
   stdarg (XmNleftAttachment, XmATTACH_FORM);
-  stdarg (XmNlabelString, XmStringCreateLocalized ("Name"));
+  stdarg (XmNlabelString, XmStringCreatePCB ("Name"));
   set = XmCreatePushButton (style_dialog, "style", args, n);
   XtManageChild (set);
   XtAddCallback (set, XmNactivateCallback,
@@ -319,7 +319,7 @@ style_button (int i)
   stdarg (XmNtopWidget, i ? style_pb[i - 1] : value_form);
   stdarg (XmNleftAttachment, XmATTACH_WIDGET);
   stdarg (XmNleftWidget, set);
-  stdarg (XmNlabelString, XmStringCreateLocalized ("Set"));
+  stdarg (XmNlabelString, XmStringCreatePCB ("Set"));
   set = XmCreatePushButton (style_dialog, "style", args, n);
   XtManageChild (set);
   XtAddCallback (set, XmNactivateCallback,
@@ -331,7 +331,7 @@ style_button (int i)
   stdarg (XmNrightAttachment, XmATTACH_FORM);
   stdarg (XmNleftAttachment, XmATTACH_WIDGET);
   stdarg (XmNleftWidget, set);
-  stdarg (XmNlabelString, XmStringCreateLocalized (PCB->RouteStyle[i].Name));
+  stdarg (XmNlabelString, XmStringCreatePCB (PCB->RouteStyle[i].Name));
   stdarg (XmNindicatorType, XmONE_OF_MANY);
   stdarg (XmNalignment, XmALIGNMENT_BEGINNING);
   pb = XmCreateToggleButton (style_dialog, "style", args, n);
@@ -360,8 +360,8 @@ AdjustStyle (int argc, char **argv, int x, int y)
     {
       int i;
 
-      xms_mm = XmStringCreateLocalized ("mm");
-      xms_mil = XmStringCreateLocalized ("mil");
+      xms_mm = XmStringCreatePCB ("mm");
+      xms_mil = XmStringCreatePCB ("mil");
 
       n = 0;
       stdarg (XmNautoUnmanage, False);
@@ -434,7 +434,7 @@ RouteStylesChanged (int argc, char **argv, int x, int y)
       name_hashes[j] = h;
       n = 0;
       stdarg (XmNlabelString,
-	      XmStringCreateLocalized (PCB->RouteStyle[j].Name));
+	      XmStringCreatePCB (PCB->RouteStyle[j].Name));
       if (style_dialog)
 	XtSetValues (style_pb[j], args, n);
       for (i = 0; i < num_style_buttons; i++)
@@ -461,7 +461,7 @@ lesstif_insert_style_buttons (Widget menu)
       n = 0;
       stdarg (XmNindicatorType, XmONE_OF_MANY);
       stdarg (XmNlabelString,
-	      XmStringCreateLocalized (PCB->RouteStyle[i].Name));
+	      XmStringCreatePCB (PCB->RouteStyle[i].Name));
       btn = XmCreateToggleButton (menu, "style", args, n);
       XtManageChild (btn);
       XtAddCallback (btn, XmNvalueChangedCallback,




_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs