gnue/forms src/uidrivers/wx/UIdriver.py samples...

[Jan Ischebeck]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jan Ischebeck <address@hidden>  02/09/23 05:55:15

Modified files:
        forms/src/uidrivers/wx: UIdriver.py 
        forms/samples/configfile: connection.gfd 

Log message:
        move connection.gfd back to old (boxes!=container) format
        fix UIdriver

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/wx/UIdriver.py.diff?tr1=1.188&tr2=1.189&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/samples/configfile/connection.gfd.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: gnue/forms/samples/configfile/connection.gfd
diff -c gnue/forms/samples/configfile/connection.gfd:1.2 
gnue/forms/samples/configfile/connection.gfd:1.3
*** gnue/forms/samples/configfile/connection.gfd:1.2    Thu Sep 19 05:58:20 2002
--- gnue/forms/samples/configfile/connection.gfd        Mon Sep 23 05:55:15 2002
***************
*** 10,36 ****
    <page name="Connection.conf">
      <block datasource="connection_dtsrc" name="Block_1">
        <entry field="_section_name" name="SecE" width="17" x="19" y="3"/>
!       <box height="11" label="Settings" name="setbox" width="37" x="1" y="4">
!         <entry field="provider" name="provE" width="17" x="18" y="1"/>
!         <entry field="comment" name="descrE" width="17" x="18" y="2"/>
!         <entry field="host" name="hostE" width="17" x="18" y="3"/>
!         <entry field="port" name="portE" width="17" x="18" y="4"/>
!         <entry field="dbname" name="dbE" width="17" x="18" y="5"/>
!         <entry field="encoding" name="encE" width="17" x="18" y="6"/>
!         <entry field="rpctype" name="rpctE" width="17" x="18" y="7"/>
!         <entry field="transport" name="tranE" width="17" x="18" y="8"/>
!         <label name="provL" text="Provider (req.):" width="16" x="1" y="1"/>
!         <label name="descrL" text="Comment:" width="12" x="1" y="2"/>
!         <label name="hostL" text="Host:" width="5" x="1" y="3"/>
!         <label name="portL" text="Port:" width="9" x="1" y="4"/>
!         <label name="dbL" text="Database:" width="9" x="1" y="5"/>
!         <label name="encL" text="Encoding:" width="9" x="1" y="6"/>
!         <label name="rpctL" text="RPC type (appsrv.):" width="9" x="1" y="7"/>
!         <label name="transL" text="Transport (appsrv.):" width="10" x="1" 
y="8"/>
!       </box>
      </block>
      <label name="SecL" text="Connection name:" width="16" x="2" y="3"/>
!   
      <label name="titel" text="Editor for Connection Settings" width="30"
             x="5" y="1"/>
    </page>
--- 10,35 ----
    <page name="Connection.conf">
      <block datasource="connection_dtsrc" name="Block_1">
        <entry field="_section_name" name="SecE" width="17" x="19" y="3"/>
!       <entry field="provider" name="provE" width="17" x="19" y="6"/>
!       <entry field="comment" name="descrE" width="17" x="19" y="7"/>
!       <entry field="host" name="hostE" width="17" x="19" y="8"/>
!       <entry field="port" name="portE" width="17" x="19" y="9"/>
!       <entry field="dbname" name="dbE" width="17" x="19" y="10"/>
!       <entry field="encoding" name="encE" width="17" x="19" y="11"/>
!       <entry field="rpctype" name="rpctE" width="17" x="19" y="12"/>
!       <entry field="transport" name="tranE" width="17" x="19" y="13"/>
      </block>
      <label name="SecL" text="Connection name:" width="16" x="2" y="3"/>
!     <label name="provL" text="Provider (req.):" width="16" x="2" y="6"/>
!     <label name="descrL" text="Comment:" width="12" x="2" y="7"/>
!     <label name="hostL" text="Host:" width="5" x="2" y="8"/>
!     <label name="portL" text="Port:" width="9" x="2" y="9"/>
!     <label name="dbL" text="Database:" width="9" x="2" y="10"/>
!     <label name="encL" text="Encoding:" width="9" x="2" y="11"/>
!     <label name="rpctL" text="RPC type (appsrv.):" width="9" x="2" y="12"/>
!     <label name="transL" text="Transport (appsrv.):" width="10" x="2" y="13"/>
! 
!     <box height="11" label="Settings" name="setbox" width="37" x="1" y="4"/>
      <label name="titel" text="Editor for Connection Settings" width="30"
             x="5" y="1"/>
    </page>
Index: gnue/forms/src/uidrivers/wx/UIdriver.py
diff -c gnue/forms/src/uidrivers/wx/UIdriver.py:1.188 
gnue/forms/src/uidrivers/wx/UIdriver.py:1.189
*** gnue/forms/src/uidrivers/wx/UIdriver.py:1.188       Sat Sep 21 08:47:39 2002
--- gnue/forms/src/uidrivers/wx/UIdriver.py     Mon Sep 23 05:55:15 2002
***************
*** 693,699 ****
                                 
(object.y+spacer+(spacer*object._gap))*event.widgetHeight+(event.widgetHeight/2)),
                         wxSize((object.width-1)*event.widgetWidth,
                                 (object.height-1)*event.widgetHeight))
!     return newPanel
  
  #
  # UIScrollBar
--- 693,701 ----
                                 
(object.y+spacer+(spacer*object._gap))*event.widgetHeight+(event.widgetHeight/2)),
                         wxSize((object.width-1)*event.widgetWidth,
                                 (object.height-1)*event.widgetHeight))
! #   part 2, of the GFBox as container patch
! #    return newPanel
!     return newWidget 
  
  #
  # UIScrollBar