htoolkit-cvs

[<dl...@us...>]

Update of /cvsroot/htoolkit/port/src/Port
In directory sc8-pr-cvs1:/tmp/cvs-serv23303/src/Port

Modified Files:
	Handlers.hs 
Log Message:
changed name of xxxWindowClose to xxxWindowDismiss as that
is what is meant. Actually, xxxWindowDestroy should probably
be called xxxWindowClose but let's leave that for now.


Index: Handlers.hs
===================================================================
RCS file: /cvsroot/htoolkit/port/src/Port/Handlers.hs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Handlers.hs	30 Jan 2003 23:09:46 -0000	1.6
--- Handlers.hs	31 Jan 2003 21:06:13 -0000	1.7
***************
*** 44,48 ****
                  -- ** Register events
                  ,registerWindowReLayout  
!                 ,registerWindowClose     
                  ,registerWindowDestroy   
                  ,registerWindowPaint     
--- 44,48 ----
                  -- ** Register events
                  ,registerWindowReLayout  
!                 ,registerWindowDismiss     
                  ,registerWindowDestroy   
                  ,registerWindowPaint     
***************
*** 59,63 ****
                  -- ** Unregister events
                  ,unregisterWindowReLayout     
!                 ,unregisterWindowClose        
                  ,unregisterWindowDestroy      
                  ,unregisterWindowPaint        
--- 59,63 ----
                  -- ** Unregister events
                  ,unregisterWindowReLayout     
!                 ,unregisterWindowDismiss
                  ,unregisterWindowDestroy      
                  ,unregisterWindowPaint        
***************
*** 160,164 ****
    =  do clear handlersWindowDestroy
          clear handlersWindowReLayout
!         clear handlersWindowClose        
          clear handlersWindowPaint    
          clear handlersWindowResize   
--- 160,164 ----
    =  do clear handlersWindowDestroy
          clear handlersWindowReLayout
!         clear handlersWindowDismiss
          clear handlersWindowPaint    
          clear handlersWindowResize   
***************
*** 186,190 ****
  unregisterAllWindowHandlers hwnd
    =  do unregisterWindowReLayout hwnd
!         unregisterWindowClose hwnd
          unregisterWindowDestroy hwnd
          unregisterWindowPaint hwnd    
--- 186,190 ----
  unregisterAllWindowHandlers hwnd
    =  do unregisterWindowReLayout hwnd
!         unregisterWindowDismiss hwnd
          unregisterWindowDestroy hwnd
          unregisterWindowPaint hwnd    
***************
*** 321,340 ****
    = invokeHandler hwnd handlersWindowReLayout id
  
! {-# NOINLINE handlersWindowClose #-}
! handlersWindowClose :: MVar (PtrMap WindowHandle (IO ()))
! handlersWindowClose
    = unsafePerformIO (newMVar empty)
  
! registerWindowClose :: WindowHandle -> IO () -> IO ()
! registerWindowClose hwnd handler
!   = register hwnd handler handlersWindowClose
  
! unregisterWindowClose :: WindowHandle -> IO ()
! unregisterWindowClose hwnd 
!   = unregister hwnd handlersWindowClose
  
  handleWindowClose :: WindowHandle -> IO ()
  handleWindowClose hwnd
!   = invokeHandler hwnd handlersWindowClose id
  
  {-# NOINLINE handlersPopUpClick #-}
--- 321,340 ----
    = invokeHandler hwnd handlersWindowReLayout id
  
! {-# NOINLINE handlersWindowDismiss #-}
! handlersWindowDismiss :: MVar (PtrMap WindowHandle (IO ()))
! handlersWindowDismiss
    = unsafePerformIO (newMVar empty)
  
! registerWindowDismiss :: WindowHandle -> IO () -> IO ()
! registerWindowDismiss hwnd handler
!   = register hwnd handler handlersWindowDismiss
  
! unregisterWindowDismiss :: WindowHandle -> IO ()
! unregisterWindowDismiss hwnd 
!   = unregister hwnd handlersWindowDismiss
  
  handleWindowClose :: WindowHandle -> IO ()
  handleWindowClose hwnd
!   = invokeHandler hwnd handlersWindowDismiss id
  
  {-# NOINLINE handlersPopUpClick #-}