[paragui-cvs] CVS: paragui/src/widgets pglayout.cpp,1.2.6.6,1.2.6.7 pgwidgetlist.cpp,1.3.6.6,1.3.6.7

[Alexander Pipelka <address@hidden>]

Update of /cvsroot/paragui/paragui/src/widgets
In directory subversions:/tmp/cvs-serv19547/src/widgets

Modified Files:
      Tag: devel-1-0
        pglayout.cpp pgwidgetlist.cpp 
Log Message:
layout-loader fixes



Index: pglayout.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pglayout.cpp,v
retrieving revision 1.2.6.6
retrieving revision 1.2.6.7
diff -C2 -r1.2.6.6 -r1.2.6.7
*** pglayout.cpp        20 Jun 2002 12:20:36 -0000      1.2.6.6
--- pglayout.cpp        6 Apr 2003 12:13:07 -0000       1.2.6.7
***************
*** 858,862 ****
  
                int h = PG_Layout::GetParamInt(atts, "height");
!               if(h == -1) {
                        h = 25;
                }
--- 858,862 ----
  
                int h = PG_Layout::GetParamInt(atts, "height");
!               if(h < 0) {
                        h = 25;
                }
***************
*** 1032,1035 ****
--- 1032,1036 ----
  
                XMLParser->InhTagFlags |= SetPopupMenuAtts(Widget, atts, 
XMLParser);
+               XMLParser->InhTagFlags |= INHTAGFLAG_HIDE; // Popups shouldn't 
be displayed immediately
                return;
        }
***************
*** 1111,1115 ****
                if (((XMLParser->InhTagFlags & INHTAGFLAG_ADDWIDGET) != 0) && 
((XMLParser->EndTagFlags & ENDTAGFLAG_WIDGETLIST) == 0)) {
                        WidgetToAdd = XMLParser->ParentObject;
!                       goto object_end;
                }
  
--- 1112,1116 ----
                if (((XMLParser->InhTagFlags & INHTAGFLAG_ADDWIDGET) != 0) && 
((XMLParser->EndTagFlags & ENDTAGFLAG_WIDGETLIST) == 0)) {
                        WidgetToAdd = XMLParser->ParentObject;
! //                    goto object_end;
                }
  
***************
*** 1121,1126 ****
                        XMLParser->ParentObject->Hide();
  
! object_end:
!               XMLParser->ParentObject->AddText("", true);
        }
  
--- 1122,1127 ----
                        XMLParser->ParentObject->Hide();
  
! //object_end:
! //            XMLParser->ParentObject->AddText("", true);
        }
  

Index: pgwidgetlist.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pgwidgetlist.cpp,v
retrieving revision 1.3.6.6
retrieving revision 1.3.6.7
diff -C2 -r1.3.6.6 -r1.3.6.7
*** pgwidgetlist.cpp    5 Apr 2003 14:48:33 -0000       1.3.6.6
--- pgwidgetlist.cpp    6 Apr 2003 12:13:07 -0000       1.3.6.7
***************
*** 219,225 ****
        UpdateScrollBarsPos();
  
!       if(/*!w->IsHidden() && */!IsHidden() || IsVisible()) {
!               CheckScrollBars();
                w->SetVisible(true);
                Update();
        }
--- 219,225 ----
        UpdateScrollBarsPos();
  
!       if(!IsHidden() || IsVisible()) {
                w->SetVisible(true);
+               CheckScrollBars();
                Update();
        }