Changeset 61 in Sophya

Timestamp:

Nov 26, 1997, 7:30:27 PM (28 years ago)

Author:

ansari

Message:

J'ai remis les fonctions d'Activation d'evts (ActivateButton(), ...) ds

PIBaseWdgGen - et correction petit pb ds pixtbase.cc (Leave etait appele
au moment de Close !) Reza 26/11/97

Location:

trunk/SophyaPI/PI

Files:

• ex_dessin.cc (modified) (1 diff)
• pibwdggen.h (modified) (1 diff)
• pibwdgmac.cc (modified) (1 diff)
• pibwdgmac.h (modified) (1 diff)
• pibwdgx.cc (modified) (2 diffs)
• pibwdgx.h (modified) (2 diffs)
• piimage.cc (modified) (1 diff)
• pipixmapgen.cc (modified) (1 diff)
• piscdrawwdg.cc (modified) (1 diff)
• pixtbase.cc (modified) (7 diffs)

trunk/SophyaPI/PI/ex_dessin.cc

@@ -17 +17 @@
 str[20] = '\0';
 
+ActivateKeyboard();
+ActivateButton(1);
+ActivateButton(2);
+ActivateButton(3);
 }
 

trunk/SophyaPI/PI/pibwdggen.h

@@ -62 +62 @@
 
   virtual long       kind() {return ClassId; }
+
+//  Activation des evenements
+  virtual void       ActivatePtrCross()        = 0;
+  virtual void       ActivateButton(int bid)   = 0;
+  virtual void       ActivateMove(int bid)     = 0;
+  virtual void       ActivateKeyboard()        = 0;
 
 //  Trace graphiques

trunk/SophyaPI/PI/pibwdgmac.cc

@@ -24 +24 @@
 }
 
+/* --Methode-- */
+void PIBaseWdgMac::ActivatePtrCross()
+{
+// toujours actif pour le moment
+}
+
+/* --Methode-- */
+void PIBaseWdgMac::ActivateButton(int /*bid*/)
+{
+}
+
+/* --Methode-- */
+void PIBaseWdgMac::ActivateMove(int /*bid*/)
+{
+}
+
+/* --Methode-- */
+void PIBaseWdgMac::ActivateKeyboard()
+{
+}
 
 /* --Methode-- */

trunk/SophyaPI/PI/pibwdgmac.h

@@ -17 +17 @@
                                    int sx=10, int sy=10, int px=0, int py=0);
   virtual           ~PIBaseWdgMac();
+
+//  Activation des evenements
+  virtual void       ActivatePtrCross();
+  virtual void       ActivateButton(int bid);
+  virtual void       ActivateMove(int bid);
+  virtual void       ActivateKeyboard();
 
 //  Trace graphiques

trunk/SophyaPI/PI/pibwdgx.cc

@@ -65 +65 @@
 SelMarker(1, PI_DotMarker);
 
-// On active tous les evenements ...
-ActivatePtrCross();
-ActivateKeyboard();
-int i;
-for(i=1; i<=3; i++) {
-  ActivateButton(i);
-  ActivateMove(i); 
-} 
 Manage();
 }
@@ -80 +72 @@
 PIBaseWdgX::~PIBaseWdgX()
 {
-
+#ifdef DEBUG_PIBWDGX 
+printf("PIBaseWdgX::~PIBaseWdgX()_Debug: Object= %lx (%lx) Wdg= %lx \n",
+(long)this, (long)(((PIXtBaseWidget)XtWdg())->pixtbase.objet), (long)XtWdg() );  
+#endif
+Arg  wargs[2];
+XtSetArg(wargs[0],PIXNobject,NULL); 
+XtSetValues(XtWdg(), wargs, 1);
 }
 

trunk/SophyaPI/PI/pibwdgx.h

@@ -17 +17 @@
 
   virtual void    FinishCreate(); // appele par la fenetre mere, apres XtRealize()
+
+//  Activation des evenements   
+  virtual void   ActivatePtrCross();
+  virtual void   ActivateButton(int bid);
+  virtual void   ActivateMove(int bid);
+  virtual void   ActivateKeyboard();
 
 //  Trace graphiques
@@ -92 +98 @@
   void           Init();
   void           SelectFont(int isz, int jat);
-//  Activation des evenements   
-  void   ActivatePtrCross();
-  void   ActivateButton(int bid);
-  void   ActivateMove(int bid);
-  void   ActivateKeyboard();
 
   GC mDefGC;

trunk/SophyaPI/PI/piimage.cc

@@ -52 +52 @@
 SelForeground(PI_White);
 SelBackground(PI_Black);
+
+ActivateButton(1);
+ActivateMove(1);
+ActivateButton(2);
+ActivateMove(2);
+ActivateButton(3);
+ActivateMove(3);
 
 }

trunk/SophyaPI/PI/pipixmapgen.cc

@@ -22 +22 @@
 cmap = new PIColorMap(CMAP_GREY32);
 mEn = 0;
+ActivateButton(1);
 }
 

trunk/SophyaPI/PI/piscdrawwdg.cc

@@ -18 +18 @@
   mTrW = NULL;
   SetTextWin(NULL);
+  ActivateButton(1);    // Pour pouvoir activer la fenetre et coordonnees
+  ActivateMove(1);      //    "         "         "        "
+  ActivateButton(2);
+  ActivateMove(2);
 
 }

trunk/SophyaPI/PI/pixtbase.cc

@@ -12 +12 @@
 #include "pixtbase.h"
 
+// #define DEBUG_PIXTB
 
 /*  Construction du widget Xt PIXtBase   */
@@ -138 +139 @@
 // get_GCs (wdgp);
 #ifdef DEBUG_PIXTB
-printf("Debug_init_pixtbase: Object= %ld  narg=%d \n", 
-(long)(wdgp->pixtbase.objet), (int)(*narg));
+printf("Debug_init_pixtbase: Wdg=%lx Object= %lx  narg=%d \n", 
+(long)wdgp, (long)(wdgp->pixtbase.objet), (int)(*narg));
 #endif
 return;
@@ -148 +149 @@
 {
 #ifdef DEBUG_PIXTB
-puts("Debug_destroy_pixtbase");
+printf("Debug_destroy_pixtbase: Wdg= %lx Object= %lx \n", (long)wdgp, 
+(long)(((PIXtBaseWidget)wdgp)->pixtbase.objet) );
 #endif
 // free_GCs((PIXtBaseWidget)wdgp);
+//    $CHECK$ Reza  21/11/97
+// J'ai l'impression que cette fonction n'est pas appellee au moment 
+// de destruction du Widget - Par contre la fonction leave est appelee
+// si l'action correspondante a ete enregistree ?!
 }
 
@@ -157 +163 @@
 static void resize_pixtbase (Widget wdgp)
 {
+#ifdef DEBUG_PIXTB
+printf("Debug_resize_pixtbase: Wdg=%lx Object= %lx \n", (long)wdgp, 
+(long)(((PIXtBaseWidget)wdgp)->pixtbase.objet) );
+#endif
 if (((PIXtBaseWidget)wdgp)->pixtbase.objet) 
   (((PIXtBaseWidget)wdgp)->pixtbase.objet)->Resize();
@@ -166 +176 @@
 {
 #ifdef DEBUG_PIXTB
-printf ("debug:expose %ld\n",(long)((PIXtBaseWidget)wdgp)->pixtbase.objet);
+printf("Debug_expose_pixtbase: Wdg=%lx Object= %lx \n", (long)wdgp, 
+(long)(((PIXtBaseWidget)wdgp)->pixtbase.objet) );
 #endif
 
@@ -185 +196 @@
                             String* /*args*/, Cardinal* /*narg*/)
 {
+#ifdef DEBUG_PIXTB
+printf("Debug_enter_pixtbase: Wdg=%lx Object= %lx \n", (long)wdgp, 
+(long)(((PIXtBaseWidget)wdgp)->pixtbase.objet) );
+#endif
 last_time_xevt = evt->xcrossing.time;
 last_serial_xevt = evt->xcrossing.serial;
@@ -196 +211 @@
                             String* /*args*/, Cardinal* /*narg*/)
 {
+#ifdef DEBUG_PIXTB
+printf("Debug_leave_pixtbase: Wdg=%lx Object= %lx \n", (long)wdgp, 
+(long)(((PIXtBaseWidget)wdgp)->pixtbase.objet) );
+#endif
 last_time_xevt = evt->xcrossing.time;
 last_serial_xevt = evt->xcrossing.serial;