Changeset 367 in Sophya for trunk

Timestamp:

Aug 9, 1999, 1:55:37 PM (26 years ago)

Author:

ercodmgr

Message:

Modifs ds FinisCreate et logique SetBinding Reza 9/8/99

Location:

trunk/SophyaPI/PI

Files:

• pibwdgx.cc (modified) (2 diffs)
• pibwdgx.h (modified) (1 diff)
• picontainergen.cc (modified) (1 diff)
• pioptmenux.cc (modified) (1 diff)
• piwdgx.cc (modified) (6 diffs)
• piwdgx.h (modified) (2 diffs)
• piwindowx.cc (modified) (1 diff)
• piwindowx.h (modified) (2 diffs)

trunk/SophyaPI/PI/pibwdgx.cc

@@ -71 +71 @@
 void PIBaseWdgX::FinishCreate()
 {
+// appele par la fenetre mere, apres XtRealize()
 if (finishDone) { 
   fprintf(stderr, "BUG/PIBaseWdgX::FinishCreate() multiple call \n"); 
   return; 
   }
-// appele par la fenetre mere, apres XtRealize()
+PIWdgX::FinishCreate();
+
 // J'active le backing store pour la fenetre X
 XSetWindowAttributes xswa;
@@ -96 +98 @@
 if (!mWGrC) mWGrC = new PIGraphicX(this);   
 mWGrC->TerminateInit();
-finishDone = true;     // FinishCreate() fait
 } 
 

trunk/SophyaPI/PI/pibwdgx.h

@@ -56 +56 @@
   PIPointer mPtrS;
   PIColors mBCol;
-  bool finishDone;       // Si FinsihCreate appele
 };
 

trunk/SophyaPI/PI/picontainergen.cc

@@ -196 +196 @@
 {
 if (stfcr)  return;
+PIWdg::FinishCreate();    
 int k;
 for(k=0; k<NbChilds(); k++)  GetChild(k)->FinishCreate();

trunk/SophyaPI/PI/pioptmenux.cc

@@ -74 +74 @@
 void PIOptMenuX::FinishCreate()
 {
+PIWdgX::FinishCreate();
 // printf("PIOptMenuX::FinishCreate()/DBG  %s \n", Nom().c_str());
 if (mSmsg == 0)  SetValue(mMen->ItemMsg(0)); 

trunk/SophyaPI/PI/piwdgx.cc

@@ -104 +104 @@
 wmis =  k_wmi_appshell;
 stmng = false;
+finishDone = false;
 mBKleft =  mBKright =  mBKtop =  mBKbottom = PIBK_free;
 #ifdef DEBUG_PIWdgX
@@ -119 +120 @@
 sdw = NULL;
 wmis = k_wmi_unknown;
+finishDone = false;
 mBKleft =  mBKright =  mBKtop =  mBKbottom = PIBK_free;
 }
@@ -210 +212 @@
 void PIWdgX::FinishCreate()
 {
-#ifdef DEBUG_PIWdgX
-printf("Debug_PIWdgX::FinishCreate() ne fait rien ! \n");
-#endif
+// appele par la fenetre mere, apres XtRealize()
+if (finishDone) { 
+  fprintf(stderr, "BUG/PIWdgX::FinishCreate() multiple call \n"); 
+  return; 
+  }
+finishDone = true;
 return;
 }
@@ -321 +326 @@
                         PIBindingKind right, PIBindingKind bottom)
 {
+if (bindingLock) return;
+mBKleft = left;  mBKright = right;
+mBKtop = top;  mBKbottom = bottom;
+BindWdgtoParent();
+}
+
+
+/* --Methode-- */
+void PIWdgX::BindWdgtoParent()
+{
 Arg  wargs[9];
 int n=0;
@@ -334 +349 @@
 XtSetArg(wargs[n],XmNfractionBase, fbase);  n++;
 XtSetValues(parent->XtWdg(), wargs, n);
+
+PIBindingKind left, top, right, bottom;
+left = mBKleft;  right = mBKright;
+top = mBKtop;  bottom = mBKbottom;
 
 // printf(" DEBUG_SetBinding: C-Sz= %d %d - Sz=%d %d , Pos= %d %d \n",  parent->XSize(),
@@ -423 +442 @@
 
 XtSetValues(this->sdw, wargs, n);
-mBKleft = left;  mBKright = right;
-mBKtop = top;  mBKbottom = bottom;
 // printf(" Out_SetBinding: C-Sz= %d %d - Sz=%d %d , Pos= %d %d \n",  parent->XSize(),
 // parent->YSize(), XSize(), YSize(), XPos(), YPos());

trunk/SophyaPI/PI/piwdgx.h

@@ -88 +88 @@
 
 protected:
+// Attache effectivement le widget au container
+// Parent - Doit etre appele ds FinishCreate  
+  virtual void          BindWdgtoParent();  
+
 // Definit le type de Widget, en particulier pour la gestion des feneteres de haut niveau
 // k_wmi_cascade : Widget cree en cascade d'un autre (Exemple pour PIWIndowX)
@@ -100 +104 @@
   WmIntState wmis;
   bool stmng;
+  bool finishDone;  // FinishCreate appele
   PIBindingKind mBKleft, mBKright, mBKtop, mBKbottom;
 };

trunk/SophyaPI/PI/piwindowx.cc

@@ -103 +103 @@
 
 /* --Methode-- */
-void PIWindowX::SetBinding(PIBindingKind /*left*/, PIBindingKind /*top*/, 
-                           PIBindingKind /*right*/, PIBindingKind /*bottom*/)
+void PIWindowX::BindWdgtoParent()
 {
 // On ne doit rien faire pour les fenetres 

trunk/SophyaPI/PI/piwindowx.h

@@ -12 +12 @@
   virtual                ~PIWindowX();
   
-  virtual void           SetBinding(PIBindingKind left, PIBindingKind top, 
-                                    PIBindingKind right, PIBindingKind bottom);
   virtual void           SetSize(int sx, int sy);
   virtual void           SetPos(int px, int py);  
@@ -21 +19 @@
 
 protected:
+  virtual void           BindWdgtoParent();  
   PIWdgX   *pwm;