Changeset 41 in Sophya

Timestamp:

Mar 13, 1997, 4:55:54 PM (29 years ago)

Author:

aubourg

Message:

Makefiles, compilos, ...

Location:

trunk/SophyaPI/PI

Files:

• pifilechox.cc (modified) (1 diff)
• pilistx.cc (modified) (1 diff)
• pimenux.cc (modified) (3 diffs)
• pistdwdgx.cc (modified) (7 diffs)
• piwdgx.cc (modified) (1 diff)
• piwindowx.cc (modified) (1 diff)
• pixtbase.cc (modified) (1 diff)
• psfile.cc (modified) (1 diff)

trunk/SophyaPI/PI/pifilechox.cc

@@ -62 +62 @@
 CreateXtWdg(nom, xmFileSelectionBoxWidgetClass, mWin->XtWdg(), PIFC_SzX, PIFC_SzY, 0, 0);
 XtAddCallback(XtWdg(), XmNokCallback, 
-              filesel_okact, (XtPointer)this);
+              (XtCallbackProc)filesel_okact, (XtPointer)this);
 XtAddCallback(XtWdg(), XmNcancelCallback, 
-              filesel_cancelact, (XtPointer)this);
+              (XtCallbackProc)filesel_cancelact, (XtPointer)this);
 // Pour avoir une version simplifiee 
 /* wdg = XmFileSelectionBoxGetChild(XtWdg(),XmDIALOG_DIR_LIST);

trunk/SophyaPI/PI/pilistx.cc

@@ -59 +59 @@
 //              list_action, (XtPointer)this);
 XtAddCallback(mlist, XmNmultipleSelectionCallback,
-              list_action, (XtPointer)this);
+              (XtCallbackProc)list_action, (XtPointer)this);
 XtAddCallback(mlist, XmNsingleSelectionCallback,
-              list_action, (XtPointer)this);
+              (XtCallbackProc)list_action, (XtPointer)this);
 
 SetMultipleSelect(false);

trunk/SophyaPI/PI/pimenux.cc

@@ -100 +100 @@
   else cbckn = XmNactivateCallback;
   XtRemoveCallback(mBut[i+1].itb, cbckn, 
-                   menub_action, (XtPointer)(mBut+i+1));
+                   (XtCallbackProc)menub_action, (XtPointer)(mBut+i+1));
   mBut[i] = mBut[i+1];
   XtAddCallback(mBut[i].itb, cbckn, 
-                menub_action, (XtPointer)(mBut+i));
+                (XtCallbackProc)menub_action, (XtPointer)(mBut+i));
   }
 mNItem--;
@@ -237 +237 @@
     else cbckn = XmNactivateCallback;
     XtRemoveCallback(buto[i].itb, cbckn, 
-                     menub_action, (XtPointer)(buto+i));
+                     (XtCallbackProc)menub_action, (XtPointer)(buto+i));
     mBut[i] = buto[i];
     XtAddCallback(mBut[i].itb, cbckn, 
-                  menub_action, (XtPointer)(mBut+i));
+                 (XtCallbackProc) menub_action, (XtPointer)(mBut+i));
     }
 
@@ -259 +259 @@
 mBut[mNItem].itb = XtCreateManagedWidget(nom, wdgcl, this->XtWdg(), NULL, 0) ; 
 XtAddCallback(mBut[mNItem].itb, cbckn, 
-              menub_action, (XtPointer)(mBut+mNItem));
+              (XtCallbackProc)menub_action, (XtPointer)(mBut+mNItem));
 if (sc)  // Raccourci clavier 
   {

trunk/SophyaPI/PI/pistdwdgx.cc

@@ -95 +95 @@
 XtSetValues(XtWdg(), warg, n);
 XtAddCallback(XtWdg(), XmNactivateCallback, 
-              button_action, (XtPointer)this);
+              (XtCallbackProc)button_action, (XtPointer)this);
 
 mAcP = false;
@@ -113 +113 @@
 if (mAcP)
   XtRemoveCallback(XtWdg(), XmNarmCallback, 
-                   button_press, (XtPointer)this);
+                   (XtCallbackProc)button_press, (XtPointer)this);
 else 
   XtAddCallback(XtWdg(), XmNarmCallback, 
-                button_press, (XtPointer)this);
+                (XtCallbackProc)button_press, (XtPointer)this);
 mAcP = acp;
 return;
@@ -212 +212 @@
 if (Msg() && !msg)
   XtRemoveCallback(XtWdg(), XmNactivateCallback, 
-                   text_action, (XtPointer)this);
+                   (XtCallbackProc)text_action, (XtPointer)this);
 if (!Msg() && msg)
   XtAddCallback(XtWdg(), XmNactivateCallback, 
-                text_action, (XtPointer)this);
+                (XtCallbackProc)text_action, (XtPointer)this);
 
 PIWdg::SetMsg(msg);
@@ -245 +245 @@
 CreateXtWdg(nom, xmToggleButtonWidgetClass, NULL, sx, sy, px, py);
 XtAddCallback(XtWdg(), XmNvalueChangedCallback,
-              toggb_action, (XtPointer)this);
+             (XtCallbackProc) toggb_action, (XtPointer)this);
 Arg warg[2];
 XtSetArg(warg[0],XmNhighlightThickness, 0);
@@ -321 +321 @@
 SetValue(1);
 XtAddCallback(XtWdg(), XmNvalueChangedCallback, 
-              scale_action, (XtPointer)this);
+             (XtCallbackProc) scale_action, (XtPointer)this);
 Manage();
 }
@@ -439 +439 @@
 SetValue(0);
 XtAddCallback(XtWdg(), XmNvalueChangedCallback, 
-              scrollbar_action, (XtPointer)this);
+             (XtCallbackProc) scrollbar_action, (XtPointer)this);
 Manage();
 }
@@ -455 +455 @@
 if (mAcD)
   XtRemoveCallback(XtWdg(), XmNdragCallback, 
-                   scrollbar_drag, (XtPointer)this);
+                   (XtCallbackProc)scrollbar_drag, (XtPointer)this);
 else 
   XtAddCallback(XtWdg(), XmNdragCallback, 
-                scrollbar_drag, (XtPointer)this);
+                (XtCallbackProc)scrollbar_drag, (XtPointer)this);
 mAcD = acd;
 return;

trunk/SophyaPI/PI/piwdgx.cc

@@ -112 +112 @@
     pwdg = top;
     }
-  else pwdg = ((PIContainerX *)parent)->sdw;
+  // else pwdg = ((PIContainerX *)parent)->sdw;
+  else pwdg = ((PIWdgX *)parent)->sdw;
   }
 

trunk/SophyaPI/PI/piwindowx.cc

@@ -74 +74 @@
 
   XtAddCallback(pwm->XtWdg(), XtNpopdownCallback,
-                popdwn_cb, (XtPointer)this);
+                (XtCallbackProc)popdwn_cb, (XtPointer)this);
 
   if (!fgactl) 

trunk/SophyaPI/PI/pixtbase.cc

@@ -338 +338 @@
   nc = XLookupString(&(evt->xkey), buf, 10, &key, &cs);
   if (nc <= 0)  return;
-  if  (evt->xkey.state & ShiftMask)   kmod |= PIKM_Shift;
-  if  (evt->xkey.state & ControlMask) kmod |= PIKM_Cntl;
-  if  (evt->xkey.state & Mod2Mask)    kmod |= PIKM_Alt;
+  if  (evt->xkey.state & ShiftMask)   
+    kmod = (PIKeyModifier) (kmod | PIKM_Shift);
+  if  (evt->xkey.state & ControlMask) 
+    kmod = (PIKeyModifier) (kmod | PIKM_Cntl);
+  if  (evt->xkey.state & Mod2Mask)    
+    kmod = (PIKeyModifier) (kmod | PIKM_Alt);
   for(i=0; i<nc; i++)  
     (((PIXtBaseWidget)wdgp)->pixtbase.objet)->Keyboard((int)(buf[i]), kmod);

trunk/SophyaPI/PI/psfile.cc

@@ -714 +714 @@
 
     /* Logique de controle */
-    static int FileEmpty = 1;
-    static int PageEmpty;
-    static int BlocEmpty;
-    static int BlocActive;
-    static int PageActive;
+    /* static */ int FileEmpty = 1;
+    /* static */ int PageEmpty;
+    /* static */ int BlocEmpty;
+    /* static */ int BlocActive;
+    /* static */ int PageActive;