gnue/forms src/GFParser.py src/uidrivers/wx/UId...

[Jason Cater]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    02/11/25 00:23:32

Modified files:
        forms/src      : GFParser.py 
        forms/src/uidrivers/wx: UIdriver.py 
        forms/utils    : gfd04to05.py 

Log message:
        * Moved initializing code into an 'if initialize:' block (for Designer 
supprt)
        * Misc cleanup

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/forms/src/GFParser.py.diff?cvsroot=OldCVS&tr1=1.89&tr2=1.90&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/forms/src/uidrivers/wx/UIdriver.py.diff?cvsroot=OldCVS&tr1=1.214&tr2=1.215&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/forms/utils/gfd04to05.py.diff?cvsroot=OldCVS&tr1=1.6&tr2=1.7&r1=text&r2=text

Patches:
Index: gnue/forms/src/GFParser.py
diff -c gnue/forms/src/GFParser.py:1.89 gnue/forms/src/GFParser.py:1.90
*** gnue/forms/src/GFParser.py:1.89     Fri Nov 22 00:36:10 2002
--- gnue/forms/src/GFParser.py  Mon Nov 25 00:23:32 2002
***************
*** 144,152 ****
                                'mutlipage forms easier. If false, focus stays '
                                'within a page until user explicitly moves to '
                                'another page' },
              'caption': {
                 'Typecast': GTypecast.text,
!                'Description': 'TODO' } },
           'ParentTags': ('layout',),
           'Description': 'TODO' },
  
--- 144,161 ----
                                'mutlipage forms easier. If false, focus stays '
                                'within a page until user explicitly moves to '
                                'another page' },
+             'style': {
+                'Typecast': GTypecast.name,
+                'ValueSet': {
+                    'normal': {},
+ ## TODO ##         'popup': {},
+                    },
+                'Default': 'normal',
+                'Description': 'The type of page '
+                               'when importing pages from a library.' },
              'caption': {
                 'Typecast': GTypecast.text,
!                'Description': 'For tabbed or popup pages, this contains the 
caption to use for the page.' } },
           'ParentTags': ('layout',),
           'Description': 'TODO' },
  
Index: gnue/forms/src/uidrivers/wx/UIdriver.py
diff -c gnue/forms/src/uidrivers/wx/UIdriver.py:1.214 
gnue/forms/src/uidrivers/wx/UIdriver.py:1.215
*** gnue/forms/src/uidrivers/wx/UIdriver.py:1.214       Fri Nov 22 00:39:17 2002
--- gnue/forms/src/uidrivers/wx/UIdriver.py     Mon Nov 25 00:23:32 2002
***************
*** 902,911 ****
        newWidget = wxComboBox(event.container, -1, "",defaultPoint,
                                wxSize(self.itemWidth,self.itemHeight),
                               choices, wxCB_DROPDOWN,) # |wxWANTS_CHARS,)
!       newWidget._origAllowedValues = object._field._allowedValues
! 
!       newWidget.SetValue("")
!       EVT_COMBOBOX(newWidget, newWidget.GetId(), self.comboHandler)
  
  
      elif style == 'label':
--- 902,911 ----
        newWidget = wxComboBox(event.container, -1, "",defaultPoint,
                                wxSize(self.itemWidth,self.itemHeight),
                               choices, wxCB_DROPDOWN,) # |wxWANTS_CHARS,)
!       if event.initialize:
!         newWidget._origAllowedValues = object._field._allowedValues
!         newWidget.SetValue("")
!         EVT_COMBOBOX(newWidget, newWidget.GetId(), self.comboHandler)
  
  
      elif style == 'label':
Index: gnue/forms/utils/gfd04to05.py
diff -c gnue/forms/utils/gfd04to05.py:1.6 gnue/forms/utils/gfd04to05.py:1.7
*** gnue/forms/utils/gfd04to05.py:1.6   Fri Nov 22 00:56:05 2002
--- gnue/forms/utils/gfd04to05.py       Mon Nov 25 00:23:32 2002
***************
*** 47,53 ****
  
          att = {}
          for attr in attrs.keys(): 
!           att[attr] = attrs[attr]
  
          m = modeler(name, att, self.stack[0])
          self.stack.insert(0,m)
--- 47,53 ----
  
          att = {}
          for attr in attrs.keys(): 
!           att[attr] = attrs[attro]
  
          m = modeler(name, att, self.stack[0])
          self.stack.insert(0,m)