gnue/forms/src/uidrivers _base/UIWidget.py wx/U...

[Jason Cater]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    02/09/20 02:20:01

Modified files:
        forms/src/uidrivers/_base: UIWidget.py 
        forms/src/uidrivers/wx: UIdriver.py 

Log message:
        temporarily disabled the boxes-as-containers patch until after the 
0.4.0 release; it will require too many changes to make it backwards compatable 
enough

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/forms/src/uidrivers/_base/UIWidget.py.diff?cvsroot=OldCVS&tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/forms/src/uidrivers/wx/UIdriver.py.diff?cvsroot=OldCVS&tr1=1.186&tr2=1.187&r1=text&r2=text

Patches:
Index: gnue/forms/src/uidrivers/_base/UIWidget.py
diff -c gnue/forms/src/uidrivers/_base/UIWidget.py:1.4 
gnue/forms/src/uidrivers/_base/UIWidget.py:1.5
*** gnue/forms/src/uidrivers/_base/UIWidget.py:1.4      Thu Jun  6 14:06:11 2002
--- gnue/forms/src/uidrivers/_base/UIWidget.py  Fri Sep 20 02:20:00 2002
***************
*** 1,6 ****
  #
- # Copyright 2000-2002 Free Software Foundation
- #
  # This file is part of GNU Enterprise.
  #
  # GNU Enterprise is free software; you can redistribute it
--- 1,4 ----
***************
*** 17,22 ****
--- 15,22 ----
  # License along with program; see the file COPYING. If not,
  # write to the Free Software Foundation, Inc., 59 Temple Place
  # - Suite 330, Boston, MA 02111-1307, USA.
+ #
+ # Copyright 2000-2002 Free Software Foundation
  #
  # FILE:
  # UIWidget.py
Index: gnue/forms/src/uidrivers/wx/UIdriver.py
diff -c gnue/forms/src/uidrivers/wx/UIdriver.py:1.186 
gnue/forms/src/uidrivers/wx/UIdriver.py:1.187
*** gnue/forms/src/uidrivers/wx/UIdriver.py:1.186       Tue Sep 17 11:27:45 2002
--- gnue/forms/src/uidrivers/wx/UIdriver.py     Fri Sep 20 02:20:01 2002
***************
*** 22,28 ****
  # UIwxpython.py
  #
  # DESCRIPTION:
! # A wxPython based user interface driver for GNUE forms.
  #
  # NOTES:
  #  TODO: why does UIhelper not inherit from UIwidget?
--- 22,28 ----
  # UIwxpython.py
  #
  # DESCRIPTION:
! # A wxPython based user interface driver for GNUe forms.
  #
  # NOTES:
  #  TODO: why does UIhelper not inherit from UIwidget?
***************
*** 674,691 ****
  #
  class UIBox(UIHelper, UIWidget):
    def _createWidget(self, event, spacer):
      object = event.object
  
      # this panel makes the GFBox be a container
!     newPanel = wxPanel(event.container,-1,
                         
wxPoint(object.x*event.widgetWidth+(event.widgetWidth/2),
                                 
(object.y+spacer+(spacer*object._gap))*event.widgetHeight+(event.widgetHeight/2)),
                         wxSize((object.width-1)*event.widgetWidth,
!                               (object.height-1)*event.widgetHeight))
!     newWidget = wxStaticBox(newPanel,-1,str(object.label),
!                             wxPoint(0, 0),
!                              wxSize((object.width-1)*event.widgetWidth,
!                                     (object.height-1)*event.widgetHeight))
      return newPanel
  
  #
--- 674,697 ----
  #
  class UIBox(UIHelper, UIWidget):
    def _createWidget(self, event, spacer):
+ 
      object = event.object
  
      # this panel makes the GFBox be a container
! ##
! ## TODO: Commented out prior to 0.4.0 release
! ##    newPanel = wxPanel(event.container,-1,
! ##                       
wxPoint(object.x*event.widgetWidth+(event.widgetWidth/2),
! ##                               
(object.y+spacer+(spacer*object._gap))*event.widgetHeight+(event.widgetHeight/2)),
! ##                       wxSize((object.width-1)*event.widgetWidth,
! ##                              (object.height-1)*event.widgetHeight))
! ##    newWidget = wxStaticBox(newPanel,-1,str(object.label),
! ##                       wxPoint(0,0),
!     newWidget = wxStaticBox(event.container,-1,str(object.label),
                         
wxPoint(object.x*event.widgetWidth+(event.widgetWidth/2),
                                 
(object.y+spacer+(spacer*object._gap))*event.widgetHeight+(event.widgetHeight/2)),
                         wxSize((object.width-1)*event.widgetWidth,
!                                (object.height-1)*event.widgetHeight))
      return newPanel
  
  #