gnue/forms/src UIcurses.py UIwxpython.py

[James Thompson]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     James Thompson <address@hidden> 02/02/05 19:13:38

Modified files:
        forms/src      : UIcurses.py UIwxpython.py 

Log message:
        Box rowSpacer bug fixed
        typos in UIcurses prevented win32 package from building

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/UIcurses.py.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/UIwxpython.py.diff?tr1=1.134&tr2=1.135&r1=text&r2=text

Patches:
Index: gnue/forms/src/UIcurses.py
diff -c gnue/forms/src/UIcurses.py:1.13 gnue/forms/src/UIcurses.py:1.14
*** gnue/forms/src/UIcurses.py:1.13     Thu Jan 31 00:41:31 2002
--- gnue/forms/src/UIcurses.py  Tue Feb  5 19:13:38 2002
***************
*** 967,985 ****
  from GFKeyMapper import vk
  
  cursesKeyTranslations = {
!    vk.F1,        : curses.KEY_F1,        vk.F2       : curses.KEY_F2,
!    vk.F3,        : curses.KEY_F3,        vk.F4       : curses.KEY_F4,
!    vk.F5,        : curses.KEY_F5,        vk.F6       : curses.KEY_F6,
!    vk.F7,        : curses.KEY_F7,        vk.F8       : curses.KEY_F8,
!    vk.F9,        : curses.KEY_F9,        vk.F10      : curses.KEY_F10,
!    vk.F11,       : curses.KEY_F11,       vk.F12      : curses.KEY_F12,
!    vk.INSERT,    : curses.KEY_INSERT,    vk.DELETE   : curses.KEY_DC,
!    vk.HOME,      : curses.KEY_HOME,      vk.END      : curses.KEY_END,
!    vk.PAGEUP,    : curses.KEY_NPAGE,     vk.PAGEDOWN : curses.KEY_NPAGE,
!    vk.UP,        : curses.KEY_UP,        vk.DOWN     : curses.KEY_DOWN,
!    vk.LEFT,      : curses.KEY_LEFT,      vk.RIGHT    : curses.KEY_RIGHT,
!    vk.TAB,       : curses.KEY_TAB,       vk.ENTER    : curses.KEY_ENTER,
!    vk.BACKSPACE  : curses.KEY_BACKSPACE }
  
  GFKeyMapper.KeyMapper.setUIKeyMap(wxKeyTranslations)
  
--- 967,985 ----
  from GFKeyMapper import vk
  
  cursesKeyTranslations = {
!    vk.F1        : curses.KEY_F1,        vk.F2       : curses.KEY_F2,
!    vk.F3        : curses.KEY_F3,        vk.F4       : curses.KEY_F4,
!    vk.F5        : curses.KEY_F5,        vk.F6       : curses.KEY_F6,
!    vk.F7        : curses.KEY_F7,        vk.F8       : curses.KEY_F8,
!    vk.F9        : curses.KEY_F9,        vk.F10      : curses.KEY_F10,
!    vk.F11       : curses.KEY_F11,       vk.F12      : curses.KEY_F12,
!    vk.INSERT    : curses.KEY_INSERT,    vk.DELETE   : curses.KEY_DC,
!    vk.HOME      : curses.KEY_HOME,      vk.END      : curses.KEY_END,
!    vk.PAGEUP    : curses.KEY_NPAGE,     vk.PAGEDOWN : curses.KEY_NPAGE,
!    vk.UP        : curses.KEY_UP,        vk.DOWN     : curses.KEY_DOWN,
!    vk.LEFT      : curses.KEY_LEFT,      vk.RIGHT    : curses.KEY_RIGHT,
!    vk.TAB       : curses.KEY_TAB,       vk.ENTER    : curses.KEY_ENTER,
!    vk.BACKSPACE : curses.KEY_BACKSPACE }
  
  GFKeyMapper.KeyMapper.setUIKeyMap(wxKeyTranslations)
  
Index: gnue/forms/src/UIwxpython.py
diff -c gnue/forms/src/UIwxpython.py:1.134 gnue/forms/src/UIwxpython.py:1.135
*** gnue/forms/src/UIwxpython.py:1.134  Sun Feb  3 15:59:10 2002
--- gnue/forms/src/UIwxpython.py        Tue Feb  5 19:13:38 2002
***************
*** 777,783 ****
    def createWidget(self, object, container, textWidth, textHeight, 
widgetWidth, widgetHeight,interface,spacer,initialize=1):
      newWidget = wxStaticBox(container,-1,str(object.label),
                              
wxPoint(int(object.x)*int(widgetWidth)+(int(widgetWidth)/2),
!                                     
(int(object.y)+spacer)*int(widgetHeight)+(int(widgetHeight)/2)),
                              wxSize((int(object.width)-1)*int(widgetWidth),
                                     (int(object.height)-1)*int(widgetHeight)))
      initFont(newWidget)
--- 777,783 ----
    def createWidget(self, object, container, textWidth, textHeight, 
widgetWidth, widgetHeight,interface,spacer,initialize=1):
      newWidget = wxStaticBox(container,-1,str(object.label),
                              
wxPoint(int(object.x)*int(widgetWidth)+(int(widgetWidth)/2),
!                                     
(int(object.y)+spacer+(spacer*object._gap))*int(widgetHeight)+(int(widgetHeight)/2)),
                              wxSize((int(object.width)-1)*int(widgetWidth),
                                     (int(object.height)-1)*int(widgetHeight)))
      initFont(newWidget)