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

[Bajusz Tamás]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Bajusz Tamás <address@hidden>   03/02/03 07:12:45

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

Log message:
        fixing tabbed pages

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/wx/UIdriver.py.diff?tr1=1.227&tr2=1.228&r1=text&r2=text

Patches:
Index: gnue/forms/src/uidrivers/wx/UIdriver.py
diff -c gnue/forms/src/uidrivers/wx/UIdriver.py:1.227 
gnue/forms/src/uidrivers/wx/UIdriver.py:1.228
*** gnue/forms/src/uidrivers/wx/UIdriver.py:1.227       Sat Jan 25 16:41:41 2003
--- gnue/forms/src/uidrivers/wx/UIdriver.py     Mon Feb  3 07:12:43 2003
***************
*** 29,34 ****
--- 29,35 ----
  import sys
  import string
  
+ from wxPython import __version__ as WXVERSION
  from wxPython.wx import *
  
  from gnue.common import events
***************
*** 762,768 ****
      if event.interface._notebook:
        newWidget = wxPanel(event.interface._notebook, 
-1,wxDefaultPosition,event.interface._notebook.GetClientSize())
        event.interface._notebook.AddPage(newWidget,hasattr(object,'caption') 
and object.caption or object.name)
!       newWidget.Show(1)
      else:
        newWidget = wxPanel(event.container, 
-1,wxDefaultPosition,event.container.GetSize())
        newWidget.Show(0)
--- 763,772 ----
      if event.interface._notebook:
        newWidget = wxPanel(event.interface._notebook, 
-1,wxDefaultPosition,event.interface._notebook.GetClientSize())
        event.interface._notebook.AddPage(newWidget,hasattr(object,'caption') 
and object.caption or object.name)
!       if sys.platform == 'win32':
!         newWidget.Show(0)
!       else:
!         newWidget.Show(1)
      else:
        newWidget = wxPanel(event.container, 
-1,wxDefaultPosition,event.container.GetSize())
        newWidget.Show(0)
***************
*** 879,885 ****
                               
size=event.interface.mainWindow.panel.GetClientSize(),
                               style=tabstyle)
        newWidget.Show(TRUE)
!       EVT_NOTEBOOK_PAGE_CHANGING(newWidget, newWidget.GetId(), 
self.notebookTabHandler)
  
        event.interface._notebook  = newWidget
      else:
--- 883,891 ----
                               
size=event.interface.mainWindow.panel.GetClientSize(),
                               style=tabstyle)
        newWidget.Show(TRUE)
! 
!       # Note: EVT_NOTEBOOK_PAGE_CHANGING does't return the selected page on 
win32
!       EVT_NOTEBOOK_PAGE_CHANGED(newWidget, newWidget.GetId(), 
self.notebookTabHandler)
  
        event.interface._notebook  = newWidget
      else:
***************
*** 893,913 ****
      return newWidget
  
    def notebookTabHandler(self,event):
!     if event.GetEventType() == wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING:
        object = _IdToGFObj[_eventObjTowxWindow(event).GetId()]
-          
        
        action = None
  
!       if self.__ui.__notebookLoopTrap == 0:
!         action = events.Event('requestPAGE',event.GetSelection(), 
_form=object)
!         self.__ui.__notebookLoopTrap = 1
        else:
!         self.__ui.__notebookLoopTrap = 0
  
      if action:
        self._eventHandler(action)
! 
  #####################################################################
  ##
  ## Required Dialog box support
--- 899,926 ----
      return newWidget
  
    def notebookTabHandler(self,event):
!     if event.GetEventType() == wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED:
        object = _IdToGFObj[_eventObjTowxWindow(event).GetId()]
        
        action = None
  
!       if sys.platform == 'win32':
!         if self.__ui.__notebookLoopTrap == 1:
!           action = events.Event('requestPAGE',event.GetSelection(), 
_form=object)
!           self.__ui.__notebookLoopTrap = 0
!         else:
!           self.__ui.__notebookLoopTrap = 1
        else:
!         if self.__ui.__notebookLoopTrap == 0:
!           action = events.Event('requestPAGE',event.GetSelection(), 
_form=object)
!         if WXVERSION < '2.3':
!             self.__ui.__notebookLoopTrap = 1
!         else:
!           self.__ui.__notebookLoopTrap = 0
  
      if action:
        self._eventHandler(action)
!     event.Skip()
  #####################################################################
  ##
  ## Required Dialog box support