htoolkit-cvs

[<kr_...@us...>]

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

Modified Files:
	Handlers.hs 
Log Message:
Rename WindowReLayout to ContainerReLayout


Index: Handlers.hs
===================================================================
RCS file: /cvsroot/htoolkit/port/src/Port/Handlers.hs,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** Handlers.hs	17 Jul 2003 19:30:03 -0000	1.26
--- Handlers.hs	24 Aug 2003 21:07:48 -0000	1.27
***************
*** 42,46 ****
                  
                  -- ** Events
!                 ,setWindowReLayoutHandler,   setWindowReLayoutDefHandler,   getWindowReLayoutHandler
                  ,setWindowDismissHandler,    setWindowDismissDefHandler,    getWindowDismissHandler
                  ,setWindowDestroyHandler,    setWindowDestroyDefHandler,    getWindowDestroyHandler
--- 42,46 ----
                  
                  -- ** Events
!                 ,setContainerReLayoutHandler,setContainerReLayoutDefHandler,getContainerReLayoutHandler
                  ,setWindowDismissHandler,    setWindowDismissDefHandler,    getWindowDismissHandler
                  ,setWindowDestroyHandler,    setWindowDestroyDefHandler,    getWindowDestroyHandler
***************
*** 55,59 ****
  
                  -- ** Fire events
!                 , fireWindowReLayout
                  
                  -- * Process events
--- 55,59 ----
  
                  -- ** Fire events
!                 , fireContainerReLayout
                  
                  -- * Process events
***************
*** 130,134 ****
  unregisterAllWindowHandlers :: WindowHandle -> IO ()
  unregisterAllWindowHandlers hwnd
!   =  do setWindowReLayoutDefHandler hwnd
          setWindowDismissDefHandler hwnd
          setWindowDestroyDefHandler hwnd
--- 130,134 ----
  unregisterAllWindowHandlers :: WindowHandle -> IO ()
  unregisterAllWindowHandlers hwnd
!   =  do setContainerReLayoutDefHandler hwnd
          setWindowDismissDefHandler hwnd
          setWindowDestroyDefHandler hwnd
***************
*** 204,234 ****
  
  -----------------------------------------------------------------------------------------
! -- WindowReLayout
  -----------------------------------------------------------------------------------------
  
! {-# NOINLINE handlersWindowReLayout #-}
! handlersWindowReLayout :: MVar (PtrMap WindowHandle (IO ()))
! handlersWindowReLayout
    = unsafePerformIO (newMVar empty)
  
! setWindowReLayoutHandler :: WindowHandle -> IO () -> IO ()
! setWindowReLayoutHandler hwnd handler
!   = setHandler hwnd handler handlersWindowReLayout
  
! setWindowReLayoutDefHandler :: WindowHandle -> IO ()
! setWindowReLayoutDefHandler hwnd 
!   = setDefHandler hwnd handlersWindowReLayout
  
! getWindowReLayoutHandler :: WindowHandle -> IO (IO ())
! getWindowReLayoutHandler hwnd 
!   = getHandler hwnd (return ()) handlersWindowReLayout
    
! handleWindowReLayout :: WindowHandle -> IO ()
! handleWindowReLayout hwnd
!   = fireWindowReLayout hwnd
  
! fireWindowReLayout :: WindowHandle -> IO ()
! fireWindowReLayout hwnd
!   = invokeHandler hwnd handlersWindowReLayout id
  
  -----------------------------------------------------------------------------------------
--- 204,234 ----
  
  -----------------------------------------------------------------------------------------
! -- ContainerReLayout
  -----------------------------------------------------------------------------------------
  
! {-# NOINLINE handlersContainerReLayout #-}
! handlersContainerReLayout :: MVar (PtrMap WindowHandle (IO ()))
! handlersContainerReLayout
    = unsafePerformIO (newMVar empty)
  
! setContainerReLayoutHandler :: WindowHandle -> IO () -> IO ()
! setContainerReLayoutHandler hwnd handler
!   = setHandler hwnd handler handlersContainerReLayout
  
! setContainerReLayoutDefHandler :: WindowHandle -> IO ()
! setContainerReLayoutDefHandler hwnd 
!   = setDefHandler hwnd handlersContainerReLayout
  
! getContainerReLayoutHandler :: WindowHandle -> IO (IO ())
! getContainerReLayoutHandler hwnd 
!   = getHandler hwnd (return ()) handlersContainerReLayout
    
! handleContainerReLayout :: WindowHandle -> IO ()
! handleContainerReLayout hwnd
!   = fireContainerReLayout hwnd
  
! fireContainerReLayout :: WindowHandle -> IO ()
! fireContainerReLayout hwnd
!   = invokeHandler hwnd handlersContainerReLayout id
  
  -----------------------------------------------------------------------------------------
***************
*** 774,778 ****
  -----------------------------------------------------------------------------------------}
  foreign export ccall handleWindowDismiss :: WindowHandle -> IO ()
- foreign export ccall handleWindowReLayout :: WindowHandle -> IO ()
  foreign export ccall handleWindowDestroy :: WindowHandle -> IO ()
  foreign export ccall handleWindowPaint :: WindowHandle -> CanvasHandle -> CInt -> CInt -> CInt -> CInt -> IO ()
--- 774,777 ----
***************
*** 783,786 ****
--- 782,786 ----
  foreign export ccall handleWindowDeactivate :: WindowHandle -> IO ()
  foreign export ccall handleWindowActivate :: WindowHandle -> IO ()
+ foreign export ccall handleContainerReLayout :: WindowHandle -> IO ()
  foreign export ccall handleDialogDeactivate :: WindowHandle -> IO ()
  foreign export ccall handleDialogActivate :: WindowHandle -> IO ()