Changeset 329 in Sophya for trunk/SophyaPI/PI/piwdgx.cc

Timestamp:

Jun 24, 1999, 4:24:58 PM (26 years ago)

Author:

ercodmgr

Message:

Ajout de const dans les declarations de char * dans tout PI
(char * --> const char *)
Passage a 5 types de fontes differentes (Def, Courier, Helvetica, Times, Symbol)

Reza 24/6/99

File:

• trunk/SophyaPI/PI/piwdgx.cc (modified) (5 diffs)

trunk/SophyaPI/PI/piwdgx.cc

@@ -113 +113 @@
 
 /* --Methode-- */
-PIWdgX::PIWdgX(PIContainerGen *par, char *nom, 
+PIWdgX::PIWdgX(PIContainerGen *par, const char *nom, 
                int sx, int sy, int px, int py)
 :PIWdgGen(par, nom, sx, sy, px, py) 
@@ -123 +123 @@
 
 /* --Methode-- */
-int PIWdgX::CreateXtWdg(char *nom, SysDWdgClass wdgcl, SysDWdg pwdg,
+int PIWdgX::CreateXtWdg(const char *nom, SysDWdgClass wdgcl, SysDWdg pwdg,
                         int sx, int sy, int px, int py, Arg* oarg, int na)
 {
@@ -453 +453 @@
 }
 
-/* --Methode-- */
-void PIWdgX::SetLabel(string const& lab)
-{
-XmString xmstr;
-xmstr = XmStringLtoRCreate((char *)lab.c_str(), XmSTRING_DEFAULT_CHARSET);
-int n=0;
-Arg warg[2];
-
-XtSetArg(warg[n], XmNlabelString, xmstr); n++;
-XtSetValues(XtWdg(), warg, n);
-XmStringFree(xmstr);
-return;
-}
-
-
 
 /* --Methode-- */
@@ -555 +540 @@
 
 // Ressources X si non definis 
-static const String fallback_res[24] = {
+static const String fallback_res[26] = {
 "PeidaInt*default*background:                 LightGrey" ,
 "PeidaInt*background:                         LightGrey" ,
@@ -577 +562 @@
 "PeidaInt*fontList:           -*-courier-bold-r-normal-*-12-*-*-*-*-*-ISO8859-1",
 "PeidaInt*default*fontList:   -*-courier-bold-r-normal-*-12-*-*-*-*-*-ISO8859-1",
-"PeidaInt*fontFamilyName:                     *-courier",   // Pas de blanc apres le nom de font
-"PeidaInt*courierfontFamilyName:              *-courier",   //           "        " 
-"PeidaInt*symbolfontFamilyName:               *-symbol",    //           "        " 
+"PeidaInt*fontFamilyName:                     *-courier",    // Pas de blanc apres le nom de font
+"PeidaInt*courierfontFamilyName:              *-courier",    //           "        " 
+"PeidaInt*helveticafontFamilyName:            *-helvetica",  //           "        " 
+"PeidaInt*timesfontFamilyName:                *-times",      //           "        " 
+"PeidaInt*symbolfontFamilyName:               *-symbol",     //           "        " 
 "PeidaInt*XmToggleButton*selectColor:         Red",
 NULL