Changeset 54 in Sophya for trunk/SophyaPI/PI/pilistx.cc

Timestamp:

Aug 13, 1997, 6:13:59 PM (28 years ago)

Author:

ansari

Message:

Petites corrections/ ameliorations Reza 13/08/97

File:

• trunk/SophyaPI/PI/pilistx.cc (modified) (11 diffs)

trunk/SophyaPI/PI/pilistx.cc

@@ -22 +22 @@
 
 pil = (PIListX *)usd ;
-pil->ToggleSel(isel->item_position, true);
-//printf("list_action/Debug: reason=%d itemPos= %d \n", 
-//isel->reason, isel->item_position);
+//  printf("list_action/Debug: reason=%d itemPos= %d \n", 
+//          isel->reason, isel->item_position);
+pil->ToggleSel(isel->item_position-1, true);
 return;
 }
@@ -82 +82 @@
 
 /* --Methode-- */
-void PIListX::AppendItem(char* item, PIMessage msg)
+void PIListX::AppendItem(const char * item, PIMessage msg)
 {
 
@@ -114 +114 @@
 
 /* --Methode-- */
-void PIListX::DeleteItem(char *item)
+void PIListX::DeleteItem(const char * item)
 {
 int n;
@@ -155 +155 @@
 PIMessage PIListX::GetSelection(int num)
 {
+if ( (num < 0) || (num >= mNbSel) ) return(0); 
 return(ItemMsg(mSelNum[num]));
 }
@@ -161 +162 @@
 string PIListX::GetSelectionStr(int num)
 {
+if ( (num < 0) || (num >= mNbSel) ) return(""); 
 string s(ItemStr(mSelNum[num]));
 return(s);
@@ -166 +168 @@
 
 /* --Methode-- */
-void PIListX::SelectItem(char * item)
+void PIListX::SelectItem(const char * item)
 {
 int n;
 if ((n=GetNumItem(item)) < 0)  return;
-if ((!mMultSel) && (mNbSel > 0) && (mSelNum[0] != n))
-  ClrSItem(mSelNum[0], false, true);  
+if ((!mMultSel) && (mNbSel > 0))
+  if  (mSelNum[0] != n)  ClrSItem(mSelNum[0], false, true);  
 SelItem(n, false, true);
 return;
@@ -181 +183 @@
 int n;
 if ((n=GetNumItemMsg(msg)) < 0)  return;
-if ((!mMultSel) && (mNbSel > 0) && (mSelNum[0] != n))
-  ClrSItem(mSelNum[0], false, true);  
+if ((!mMultSel) && (mNbSel > 0))
+  if  (mSelNum[0] != n)  ClrSItem(mSelNum[0], false, true);  
 SelItem(n, false, true);
 return;
@@ -189 +191 @@
 
 /* --Methode-- */
-void PIListX::ClearSelItem(char * item)
+void PIListX::ClearSelItem(const char * item)
 {
 int n;
@@ -231 +233 @@
 {
 Arg  warg[2];
-XmString *xmst;
+XmString *xmst=NULL;
 
 if ( (n < 0) || (n >= mNItem))  { mSItem[0] = '\0'; return(mSItem); }
-
+mSItem[0] = '\0';
 XtSetArg(warg[0], XmNitems, &xmst);  
 XtGetValues(mlist, warg, 1);
@@ -242 +244 @@
 
 /* --Methode-- */
-int PIListX::GetNumItem(char *it)
+int PIListX::GetNumItem(const char *it)
 {
 for(int i=0; i<mNItem; i++)
@@ -343 +345 @@
   XmListDeselectPos(mlist, n+1);
 
-delete[] mSelNum;
+if (mSelNum) delete[] mSelNum;
 if (mNbSel <= 0)
   { mNSelMax = mNbSel = 0;  mSelNum = NULL; }