[paragui-cvs] CVS: paragui/src/layout layoutparsers.cpp,1.4,1.5 pgxmllayoutloader.cpp,1.5,1.6

[Alexander Pipelka <address@hidden>]

Update of /cvsroot/paragui/paragui/src/layout
In directory subversions:/tmp/cvs-serv12482/src/layout

Modified Files:
        layoutparsers.cpp pgxmllayoutloader.cpp 
Log Message:
synced with the devel-1-0-x tree.



Index: layoutparsers.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/layout/layoutparsers.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** layoutparsers.cpp   28 Jun 2002 10:33:50 -0000      1.4
--- layoutparsers.cpp   18 Aug 2002 08:12:52 -0000      1.5
***************
*** 4,7 ****
--- 4,9 ----
  #include "pgbutton.h"
  #include "pglabel.h"
+ #include "pglistboxitem.h"
+ 
  #include "pglog.h"
  
***************
*** 9,19 ****
--- 11,46 ----
        PG_LogMSG("PG_XMLLayoutObject<PG_Widget>::ParseXMLAttributes()");
        
+       int w, h;
+       
        SetText(xmltag.GetString("text").c_str());
        
        PG_Rect pos = xmltag.GetRect("pos", GetParent());
+       
+       w = xmltag.GetInt("width");
+       h = xmltag.GetInt("height");
+       
+       if(w > 0) {
+               pos.w = w;
+       }
+       
+       if(h > 0) {
+               pos.h = h;
+       }
+       
        MoveWidget(pos);
+       
+       int x = xmltag.GetInt("id");
+       if(x > 0) {
+               SetID(x);
+       }
+       
+       x = xmltag.GetInt("fsize");
+       if(x > 0) {
+               SetFontSize(x);
+       }
  }
  
  void PG_Label::ParseXMLAttributes(PG_XMLTag& xmltag) {
+       PG_LogMSG("PG_XMLLayoutObject<PG_Label>::ParseXMLAttributes()");
        PG_Widget::ParseXMLAttributes(xmltag);
  
***************
*** 22,26 ****
  
  void PG_Button::ParseXMLAttributes(PG_XMLTag& xmltag) {
-       PG_Widget::ParseXMLAttributes(xmltag);
        PG_LogMSG("PG_XMLLayoutObject<PG_Button>::ParseXMLAttributes()");
  }
--- 49,58 ----
  
  void PG_Button::ParseXMLAttributes(PG_XMLTag& xmltag) {
        PG_LogMSG("PG_XMLLayoutObject<PG_Button>::ParseXMLAttributes()");
+       PG_Widget::ParseXMLAttributes(xmltag);
+ }
+ 
+ void PG_ListBoxItem::ParseXMLAttributes(PG_XMLTag& xmltag) {
+       PG_LogMSG("PG_XMLLayoutObject<PG_ListBoxItem>::ParseXMLAttributes()");
+       PG_ListBoxBaseItem::ParseXMLAttributes(xmltag);
  }

Index: pgxmllayoutloader.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/layout/pgxmllayoutloader.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** pgxmllayoutloader.cpp       28 Jun 2002 10:33:50 -0000      1.5
--- pgxmllayoutloader.cpp       18 Aug 2002 08:12:52 -0000      1.6
***************
*** 283,286 ****
--- 283,287 ----
        // fac-to-ry
        if(xmltag.section == BODY || xmltag.section == WIDGET) {
+               PG_LogDBG("createobject (parent = 0x%08x)", parser->parent);
                parser->currentwidget = PG_Factory::CreateObject(xmltag.name, 
parser->parent);