[htoolkit-cvs] port/src/Port Handlers.hs,1.12,1.13

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

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

Modified Files:
	Handlers.hs 
Log Message:
Merge PopUpClick, CheckBoxClick, RadioBoxClick, ListBoxClick and ButtonClick to single event named ControlCommand


Index: Handlers.hs
===================================================================
RCS file: /cvsroot/htoolkit/port/src/Port/Handlers.hs,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Handlers.hs	24 Mar 2003 16:58:33 -0000	1.12
--- Handlers.hs	24 Mar 2003 17:07:08 -0000	1.13
***************
*** 57,66 ****
  
                  -- * Control commands
!                 ,setPopUpClickHandler,   setPopUpClickDefHandler,   getPopUpClickHandler
!                 ,setListBoxClickHandler, setListBoxClickDefHandler, getListBoxClickHandler
!                 ,setRadioBoxClickHandler,setRadioBoxClickDefHandler,getRadioBoxClickHandler
!                 ,setCheckBoxClickHandler,setCheckBoxClickDefHandler,getCheckBoxClickHandler
!                 ,setButtonClickHandler,  setButtonClickDefHandler,  getButtonClickHandler
! 
                  -- * Menus
                  ,registerWindowMenu
--- 57,62 ----
  
                  -- * Control commands
!                 ,setControlCommandHandler, setControlCommandDefHandler, getControlCommandHandler
!                 
                  -- * Menus
                  ,registerWindowMenu
***************
*** 134,142 ****
          setWindowDeactivateDefHandler hwnd
          setWindowActivateDefHandler hwnd 
!         setPopUpClickDefHandler  hwnd    
!         setListBoxClickDefHandler hwnd   
!         setRadioBoxClickDefHandler hwnd  
!         setCheckBoxClickDefHandler hwnd  
!         setButtonClickDefHandler hwnd    
          unregisterWindowMenus hwnd  -- unregister all menu command handlers
          return ()
--- 130,134 ----
          setWindowDeactivateDefHandler hwnd
          setWindowActivateDefHandler hwnd 
!         setControlCommandDefHandler  hwnd
          unregisterWindowMenus hwnd  -- unregister all menu command handlers
          return ()
***************
*** 280,406 ****
  
  -----------------------------------------------------------------------------------------
! -- PopUpClick
! -----------------------------------------------------------------------------------------
! 
! {-# NOINLINE handlersPopUpClick #-}
! handlersPopUpClick :: MVar (PtrMap WindowHandle (IO ()))
! handlersPopUpClick
!   = unsafePerformIO (newMVar empty)
! 
! setPopUpClickHandler :: WindowHandle -> IO () -> IO ()
! setPopUpClickHandler hwnd handler
!   = setHandler hwnd handler handlersPopUpClick
! 
! setPopUpClickDefHandler :: WindowHandle -> IO ()
! setPopUpClickDefHandler hwnd 
!   = setDefHandler hwnd handlersPopUpClick
!   
! getPopUpClickHandler :: WindowHandle -> IO (IO ())
! getPopUpClickHandler hwnd
!   = getHandler hwnd (return ()) handlersPopUpClick
! 
! handlePopUpClick :: WindowHandle -> IO ()
! handlePopUpClick hwnd
!   = invokeHandler hwnd handlersPopUpClick id
! 
! -----------------------------------------------------------------------------------------
! -- ListBoxClick
! -----------------------------------------------------------------------------------------
! 
! {-# NOINLINE handlersListBoxClick #-}
! handlersListBoxClick :: MVar (PtrMap WindowHandle (IO ()))
! handlersListBoxClick 
!   = unsafePerformIO (newMVar empty)
! 
! setListBoxClickHandler :: WindowHandle -> IO () -> IO ()
! setListBoxClickHandler hwnd handler
!   = setHandler hwnd handler handlersListBoxClick
! 
! setListBoxClickDefHandler :: WindowHandle -> IO ()
! setListBoxClickDefHandler hwnd 
!   = setDefHandler hwnd handlersListBoxClick
!   
! getListBoxClickHandler :: WindowHandle -> IO (IO ())
! getListBoxClickHandler hwnd
!   = getHandler hwnd (return ()) handlersListBoxClick
! 
! handleListBoxClick :: WindowHandle -> IO ()
! handleListBoxClick hwnd
!   = invokeHandler hwnd handlersListBoxClick id
! 
! -----------------------------------------------------------------------------------------
! -- RadioBoxClick
! -----------------------------------------------------------------------------------------
! 
! {-# NOINLINE handlersRadioBoxClick #-}
! handlersRadioBoxClick :: MVar (PtrMap WindowHandle (IO ()))
! handlersRadioBoxClick 
!   = unsafePerformIO (newMVar empty)
! 
! setRadioBoxClickHandler :: WindowHandle -> IO () -> IO ()
! setRadioBoxClickHandler hwnd handler
!   = setHandler hwnd handler handlersRadioBoxClick
! 
! setRadioBoxClickDefHandler :: WindowHandle -> IO ()
! setRadioBoxClickDefHandler hwnd 
!   = setDefHandler hwnd handlersRadioBoxClick
!   
! getRadioBoxClickHandler :: WindowHandle -> IO (IO ())
! getRadioBoxClickHandler hwnd
!   = getHandler hwnd (return ()) handlersRadioBoxClick
! 
! handleRadioBoxClick :: WindowHandle -> IO ()
! handleRadioBoxClick hwnd
!   = invokeHandler hwnd handlersRadioBoxClick id
! 
! -----------------------------------------------------------------------------------------
! -- CheckBoxClick
  -----------------------------------------------------------------------------------------
  
! {-# NOINLINE handlersCheckBoxClick #-}
! handlersCheckBoxClick :: MVar (PtrMap WindowHandle (IO ()))
! handlersCheckBoxClick
    = unsafePerformIO (newMVar empty)
  
! setCheckBoxClickHandler :: WindowHandle -> IO () -> IO ()
! setCheckBoxClickHandler hwnd handler
!   = setHandler hwnd handler handlersCheckBoxClick
  
! setCheckBoxClickDefHandler :: WindowHandle -> IO ()
! setCheckBoxClickDefHandler hwnd 
!   = setDefHandler hwnd handlersCheckBoxClick
    
! getCheckBoxClickHandler :: WindowHandle -> IO (IO ())
! getCheckBoxClickHandler hwnd
!   = getHandler hwnd (return ()) handlersCheckBoxClick
! 
! handleCheckBoxClick :: WindowHandle -> IO ()
! handleCheckBoxClick hwnd
!   = invokeHandler hwnd handlersCheckBoxClick id
! 
! -----------------------------------------------------------------------------------------
! -- ButtonClick
! -----------------------------------------------------------------------------------------
! 
! {-# NOINLINE handlersButtonClick #-}
! handlersButtonClick :: MVar (PtrMap WindowHandle (IO ()))
! handlersButtonClick
!   = unsafePerformIO (newMVar empty)
! 
! setButtonClickHandler :: WindowHandle -> IO () -> IO ()
! setButtonClickHandler hwnd handler
!   = setHandler hwnd handler handlersButtonClick
! 
! setButtonClickDefHandler :: WindowHandle -> IO ()
! setButtonClickDefHandler hwnd 
!   = setDefHandler hwnd handlersButtonClick
! 
! getButtonClickHandler :: WindowHandle -> IO (IO ())
! getButtonClickHandler hwnd
!   = getHandler hwnd (return ()) handlersButtonClick
  
! handleButtonClick :: WindowHandle -> IO ()
! handleButtonClick hwnd
!   = invokeHandler hwnd handlersButtonClick id
  
  -----------------------------------------------------------------------------------------
--- 272,298 ----
  
  -----------------------------------------------------------------------------------------
! -- ControlCommand
  -----------------------------------------------------------------------------------------
  
! {-# NOINLINE handlersControlCommand #-}
! handlersControlCommand :: MVar (PtrMap WindowHandle (IO ()))
! handlersControlCommand
    = unsafePerformIO (newMVar empty)
  
! setControlCommandHandler :: WindowHandle -> IO () -> IO ()
! setControlCommandHandler hwnd handler
!   = setHandler hwnd handler handlersControlCommand
  
! setControlCommandDefHandler :: WindowHandle -> IO ()
! setControlCommandDefHandler hwnd 
!   = setDefHandler hwnd handlersControlCommand
    
! getControlCommandHandler :: WindowHandle -> IO (IO ())
! getControlCommandHandler hwnd
!   = getHandler hwnd (return ()) handlersControlCommand
  
! handleControlCommand :: WindowHandle -> IO ()
! handleControlCommand hwnd
!   = invokeHandler hwnd handlersControlCommand id
  
  -----------------------------------------------------------------------------------------
***************
*** 721,729 ****
  foreign export ccall handleWindowDeactivate :: WindowHandle -> IO () 
  foreign export ccall handleWindowActivate :: WindowHandle -> IO () 
! foreign export ccall handlePopUpClick :: WindowHandle -> IO () 
! foreign export ccall handleListBoxClick :: WindowHandle -> IO () 
! foreign export ccall handleRadioBoxClick :: WindowHandle -> IO () 
! foreign export ccall handleCheckBoxClick :: WindowHandle -> IO () 
! foreign export ccall handleButtonClick :: WindowHandle -> IO () 
  foreign export ccall handleMenuCommand :: MenuHandle -> IO ()
  foreign export ccall handleMenusUpdate :: IO ()
--- 613,617 ----
  foreign export ccall handleWindowDeactivate :: WindowHandle -> IO () 
  foreign export ccall handleWindowActivate :: WindowHandle -> IO () 
! foreign export ccall handleControlCommand :: WindowHandle -> IO () 
  foreign export ccall handleMenuCommand :: MenuHandle -> IO ()
  foreign export ccall handleMenusUpdate :: IO ()