htoolkit-cvs — HToolkit CVS commit messages

[htoolkit-cvs] port/src/include ToolBar.h,1.3,1.4

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

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

Modified Files:
	ToolBar.h 
Log Message:
Added complete implementation for floating toolbars for Windows


Index: ToolBar.h
===================================================================
RCS file: /cvsroot/htoolkit/port/src/include/ToolBar.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ToolBar.h	16 Jul 2003 22:03:14 -0000	1.3
--- ToolBar.h	10 Aug 2003 18:36:04 -0000	1.4
***************
*** 4,8 ****
  #include "Types.h"
  
! WindowHandle osCreateToolBar(char *name, int place, int band_num, int band_position, int offset);
  void osDestroyToolBar(WindowHandle toolbar);
  
--- 4,10 ----
  #include "Types.h"
  
! typedef enum {DockLeft=0, DockTop=1, DockRight=2, DockBottom=3} DockPlace;
! 
! WindowHandle osCreateToolBar(char *name, DockPlace place, int band_num, int band_position, int offset);
  void osDestroyToolBar(WindowHandle toolbar);
  

[htoolkit-cvs] port/src/cbits/GTK ToolBar.c,1.2,1.3

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

Update of /cvsroot/htoolkit/port/src/cbits/GTK
In directory sc8-pr-cvs1:/tmp/cvs-serv18716/src/cbits/GTK

Modified Files:
	ToolBar.c 
Log Message:
Added complete implementation for floating toolbars for Windows


Index: ToolBar.c
===================================================================
RCS file: /cvsroot/htoolkit/port/src/cbits/GTK/ToolBar.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ToolBar.c	23 Jul 2003 16:25:20 -0000	1.2
--- ToolBar.c	10 Aug 2003 18:36:04 -0000	1.3
***************
*** 3,7 ****
  #include "Handlers_stub.h"
  
! WindowHandle osCreateToolBar(char *name, int place, int band_num, int band_position, int offset)
  {
  	GtkWidget *toolbar;
--- 3,7 ----
  #include "Handlers_stub.h"
  
! WindowHandle osCreateToolBar(char *name, DockPlace place, int band_num, int band_position, int offset)
  {
  	GtkWidget *toolbar;
***************
*** 15,25 ****
  	switch (place)
  	{
! 	case 0: placement = BONOBO_DOCK_LEFT;   break;
! 	case 1: placement = BONOBO_DOCK_TOP;    break;
! 	case 2: placement = BONOBO_DOCK_RIGHT;  break;
! 	case 3: placement = BONOBO_DOCK_BOTTOM; break;
! 	default:
! 		placement = BONOBO_DOCK_TOP;
! 		break;
  	}
  
--- 15,23 ----
  	switch (place)
  	{
! 	case DockLeft:   placement = BONOBO_DOCK_LEFT;   break;
! 	case DockTop:    placement = BONOBO_DOCK_TOP;    break;
! 	case DockRight:  placement = BONOBO_DOCK_RIGHT;  break;
! 	case DockBottom: placement = BONOBO_DOCK_BOTTOM; break;
! 	default: return NULL;
  	}
  

[htoolkit-cvs] port/src/Port Document.hs,1.3,1.4

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

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

Modified Files:
	Document.hs 
Log Message:
Add revertDoc function


Index: Document.hs
===================================================================
RCS file: /cvsroot/htoolkit/port/src/Port/Document.hs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Document.hs	26 Jul 2003 20:19:03 -0000	1.3
--- Document.hs	26 Jul 2003 20:39:27 -0000	1.4
***************
*** 21,25 ****
  		, readDoc, writeDoc
  		, getDocModified, getDocFilePath
! 		, newDoc, openDoc, saveDoc
  		, openDocWindow, printDoc
  
--- 21,25 ----
  		, readDoc, writeDoc
  		, getDocModified, getDocFilePath
! 		, newDoc, openDoc, revertDoc, saveDoc
  		, openDocWindow, printDoc
  
***************
*** 108,113 ****
  writeDoc (Document ref _ refWindows _) x = do
  	(modified, _) <- readIORef ref
- 	when (not modified) (readIORef refWindows >>= mapM_ (updateWindowModifiedState True))
  	writeIORef ref (True,x)
  
  -- | Retrieve the value of the modification flag in the document
--- 108,113 ----
  writeDoc (Document ref _ refWindows _) x = do
  	(modified, _) <- readIORef ref
  	writeIORef ref (True,x)
+ 	when (not modified) (readIORef refWindows >>= mapM_ (updateWindowModifiedState True))
  
  -- | Retrieve the value of the modification flag in the document
***************
*** 142,145 ****
--- 142,157 ----
  	return (Document ref refPath refWindows templ)
  
+ -- | Revert the document
+ revertDoc :: Document a -> IO ()
+ revertDoc (Document ref refPath refWindows templ) = do
+ 	path <- readIORef refPath
+ 	(modified, x) <- readIORef ref
+ 	case path of
+ 		Left path | modified -> do
+ 			x <- dtOpenDocument templ path
+ 			writeIORef ref (False, x)
+ 			readIORef refWindows >>= mapM_ (updateWindowModifiedState False)
+ 		_ -> return ()
+ 
  -- | Save the document to the file specified with its path. The function automatically turns off the modification flag.
  saveDoc :: FilePath -> Document a -> IO ()
***************
*** 148,154 ****
  	when modified $ do
  		dtSaveDocument templ path x
- 		readIORef refWindows >>= mapM_ (updateWindowModifiedState False)
  		writeIORef ref (False, x)
  		writeIORef refPath (Left path)
  
  -- | Open new window to display the document.
--- 160,166 ----
  	when modified $ do
  		dtSaveDocument templ path x
  		writeIORef ref (False, x)
  		writeIORef refPath (Left path)
+ 		readIORef refWindows >>= mapM_ (updateWindowModifiedState False)
  
  -- | Open new window to display the document.

[htoolkit-cvs] port/src/Port Document.hs,1.2,1.3

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

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

Modified Files:
	Document.hs 
Log Message:
Comments


Index: Document.hs
===================================================================
RCS file: /cvsroot/htoolkit/port/src/Port/Document.hs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Document.hs	26 Jul 2003 20:01:50 -0000	1.2
--- Document.hs	26 Jul 2003 20:19:03 -0000	1.3
***************
*** 16,26 ****
  		(
  		-- * Document templates
! 		  DocumentTemplate(..), registerDocTemplate, clearDocTemplates
  		-- * Documents
! 		, registerDocument, unregisterDocument
  		, readDoc, writeDoc
  		, getDocModified, getDocFilePath
  		, newDoc, openDoc, saveDoc
  		, openDocWindow, printDoc
  		)where
  
--- 16,29 ----
  		(
  		-- * Document templates
! 		  DocumentTemplate(..), registerDocTemplate
  		-- * Documents
! 		, Document
  		, readDoc, writeDoc
  		, getDocModified, getDocFilePath
  		, newDoc, openDoc, saveDoc
  		, openDocWindow, printDoc
+ 
+ 		-- * Internals
+ 		, clearDocTemplates, unregisterDocument
  		)where
  
***************
*** 62,65 ****
--- 65,69 ----
  documentTemplates = unsafePerformIO (newMVar [])
  
+ -- | Register new document template
  registerDocTemplate :: DocumentTemplate a -> IO ()
  registerDocTemplate template = do
***************
*** 94,97 ****
--- 98,102 ----
  -----------------------------------------------------------------------------------------
  
+ -- | Read the value of a Document
  readDoc :: Document a -> IO a
  readDoc (Document ref _ _ _) = do
***************
*** 99,102 ****
--- 104,108 ----
  	return x
  
+ -- | Write a new value into a Document. The function automatically turns on the modification flag in the document.
  writeDoc :: Document a -> a -> IO ()
  writeDoc (Document ref _ refWindows _) x = do
***************
*** 105,108 ****
--- 111,115 ----
  	writeIORef ref (True,x)
  
+ -- | Retrieve the value of the modification flag in the document
  getDocModified :: Document a -> IO Bool
  getDocModified (Document ref _ _ _) = do
***************
*** 110,113 ****
--- 117,121 ----
  	return modified
  
+ -- | Returns the path to the file associated with the document. If there is no such file the returned value is Nothing.
  getDocFilePath :: Document a -> IO (Maybe FilePath)
  getDocFilePath (Document _ refPath _ _) = do
***************
*** 115,118 ****
--- 123,127 ----
  	return (case path of {Left path -> Just path; Right _ -> Nothing})
  
+ -- | Create a new document from the specified template
  newDoc :: DocumentTemplate a -> IO (Document a)
  newDoc templ = do
***************
*** 124,127 ****
--- 133,137 ----
  	return (Document ref refPath refWindows templ)
  
+ -- | Open the specified file and create a document associated with it.
  openDoc :: FilePath -> DocumentTemplate a -> IO (Document a)
  openDoc path templ = do
***************
*** 132,135 ****
--- 142,146 ----
  	return (Document ref refPath refWindows templ)
  
+ -- | Save the document to the file specified with its path. The function automatically turns off the modification flag.
  saveDoc :: FilePath -> Document a -> IO ()
  saveDoc path (Document ref refPath refWindows templ) = do
***************
*** 141,147 ****
  		writeIORef refPath (Left path)
  
  openDocWindow :: Document a -> IO WindowHandle
! openDocWindow d@(Document _ _ _ templ) = dtOpenWindow templ d
  
  printDoc :: Document a -> IO ()
  printDoc (Document ref _ _ templ) = do
--- 152,163 ----
  		writeIORef refPath (Left path)
  
+ -- | Open new window to display the document.
  openDocWindow :: Document a -> IO WindowHandle
! openDocWindow d@(Document _ _ _ templ) = do
! 	window <- dtOpenWindow templ d
! 	registerDocument window d
! 	return window
  
+ -- | Print the document
  printDoc :: Document a -> IO ()
  printDoc (Document ref _ _ templ) = do

[htoolkit-cvs] port/src/Port Document.hs,1.1,1.2

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

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

Modified Files:
	Document.hs 
Log Message:
New document template


Index: Document.hs
===================================================================
RCS file: /cvsroot/htoolkit/port/src/Port/Document.hs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Document.hs	14 Mar 2003 15:26:10 -0000	1.1
--- Document.hs	26 Jul 2003 20:01:50 -0000	1.2
***************
*** 1,78 ****
! {-# OPTIONS -fglasgow-exts #-}
! -----------------------------------------------------------------------------------------
! {-| Module      :  Document
!     Copyright   :  (c) Krasimir Angelov 2003
!     License     :  BSD-style
! 
!     Maintainer  :  ka2...@ya...
!     Stability   :  provisional
!     Portability :  portable
! 
!     Documents
! -}
! -----------------------------------------------------------------------------------------
! 
! module Graphics.UI.Port.Document
! 		(
! 		-- * Document templates
! 		  DocumentTemplate(..), registerDocTemplate
! 		-- * Documents
! 		, registerDocument, unregisterDocument, setDocumentModified
! 		)where
! 
! import Graphics.UI.Port.Types
! import Graphics.UI.Port.PtrMap
! import Control.Concurrent.MVar
! import System.IO.Unsafe( unsafePerformIO )
! 
! data Document = forall a . Document a (DocumentTemplate a) Bool
! 
! data DocumentTemplate a = DocumentTemplate
! 	{ dtExtensions  :: [String]
! 	, dtDescription :: String
! 	, dtNewDocument :: IO a
! 	, dtOpenDocument :: String -> IO a
! 	, dtSaveDocument :: a -> IO ()
! 	, dtSaveDocumentAs :: String -> a -> IO ()
! 	, dtCloseDocument :: a -> IO ()
! 	}
! 	
! data DTHolder = forall a . DTHolder (DocumentTemplate a)
! 
! {-----------------------------------------------------------------------------------------
!   Document templeates
! -----------------------------------------------------------------------------------------}
! 
! {-# NOINLINE documentTemplates #-}
! documentTemplates :: MVar [DTHolder]
! documentTemplates = unsafePerformIO (newMVar [])
! 
! registerDocTemplate :: DocumentTemplate a -> IO ()
! registerDocTemplate template = do
! 	templates <- takeMVar documentTemplates
! 	putMVar documentTemplates ((DTHolder template):templates)
! 
! {-----------------------------------------------------------------------------------------
!   Documents
! -----------------------------------------------------------------------------------------}
! 
! {-# NOINLINE documents #-}
! documents :: MVar (PtrMap WindowHandle Document)
! documents = unsafePerformIO (newMVar empty)
! 
! registerDocument :: WindowHandle -> a -> DocumentTemplate a -> IO ()
! registerDocument handle doc template = do
! 	docs <- takeMVar documents
! 	putMVar documents (insertWith const handle (Document doc template False) docs)
! 
! unregisterDocument :: WindowHandle -> a -> DocumentTemplate a -> IO ()
! unregisterDocument handle doc template = do
! 	docs <- takeMVar documents
! 	putMVar documents (delete handle docs)
! 
! setDocumentModified :: WindowHandle -> Bool -> IO ()
! setDocumentModified handle flag = do
! 	docs <- takeMVar documents
! 	putMVar documents (adjust upd handle docs)
! 	where
! 		upd (Document doc template _) = Document doc template flag
--- 1,162 ----
! {-# OPTIONS -fglasgow-exts #-}
! -----------------------------------------------------------------------------------------
! {-| Module      :  Document
!     Copyright   :  (c) Krasimir Angelov 2003
!     License     :  BSD-style
! 
!     Maintainer  :  ka2...@ya...
!     Stability   :  provisional
!     Portability :  portable
! 
!     Documents
! -}
! -----------------------------------------------------------------------------------------
! 
! module Graphics.UI.Port.Document
! 		(
! 		-- * Document templates
! 		  DocumentTemplate(..), registerDocTemplate, clearDocTemplates
! 		-- * Documents
! 		, registerDocument, unregisterDocument
! 		, readDoc, writeDoc
! 		, getDocModified, getDocFilePath
! 		, newDoc, openDoc, saveDoc
! 		, openDocWindow, printDoc
! 		)where
! 
! import Data.IORef
! import Graphics.UI.Port.Types
! import Graphics.UI.Port.PtrMap
! import Control.Concurrent.MVar
! import Control.Monad
! import System.IO.Unsafe( unsafePerformIO )
! 
! data Document a = Document
! 	{ docReference   :: !(IORef (Bool,a))        -- reference to pair of the document value and the flag for modification
! 	, docFilePath    :: !(IORef (Either FilePath Int))        -- reference to the current file path for the document
! 	, docWindowsList :: !(IORef [WindowHandle])  -- reference to the list of windows that uses this document
! 	, docTemplate    :: DocumentTemplate a       -- the template
! 	}
! 
! data DocumentTemplate a = DocumentTemplate
! 	{ dtMimeType            :: String
! 	, dtOrder               :: Int
! 	, dtDescription         :: String
! 	, dtExtensions          :: [String]
! 	, dtNewDocument         :: IO a
! 	, dtOpenDocument        :: FilePath -> IO a
! 	, dtSaveDocument        :: FilePath -> a -> IO ()
! 	, dtPrintDocument       :: a -> IO ()
! 	, dtOpenWindow          :: Document a -> IO WindowHandle
! 	, dtCompatibleTemplates :: [String]
! 	}
! 
! data Holder w = forall a . Holder (w a)
! 
! -----------------------------------------------------------------------------------------
! --  Document templeates
! -----------------------------------------------------------------------------------------
! 
! {-# NOINLINE documentTemplates #-}
! documentTemplates :: MVar [Holder DocumentTemplate]
! documentTemplates = unsafePerformIO (newMVar [])
! 
! registerDocTemplate :: DocumentTemplate a -> IO ()
! registerDocTemplate template = do
! 	templates <- takeMVar documentTemplates
! 	putMVar documentTemplates ((Holder template):templates)
! 
! clearDocTemplates :: IO ()
! clearDocTemplates = do
! 	templates <- takeMVar documentTemplates
! 	putMVar documentTemplates []
! 
! -----------------------------------------------------------------------------------------
! --  Documents
! -----------------------------------------------------------------------------------------
! 
! {-# NOINLINE documents #-}
! documents :: MVar (PtrMap WindowHandle (Holder Document))
! documents = unsafePerformIO (newMVar empty)
! 
! registerDocument :: WindowHandle -> Document a -> IO ()
! registerDocument handle doc = do
! 	docs <- takeMVar documents
! 	putMVar documents (insert handle (Holder doc) docs)
! 
! unregisterDocument :: WindowHandle -> IO ()
! unregisterDocument handle = do
! 	docs <- takeMVar documents
! 	putMVar documents (delete handle docs)
! 
! -----------------------------------------------------------------------------------------
! --  Operations on documents
! -----------------------------------------------------------------------------------------
! 
! readDoc :: Document a -> IO a
! readDoc (Document ref _ _ _) = do
! 	(modified, x) <- readIORef ref
! 	return x
! 
! writeDoc :: Document a -> a -> IO ()
! writeDoc (Document ref _ refWindows _) x = do
! 	(modified, _) <- readIORef ref
! 	when (not modified) (readIORef refWindows >>= mapM_ (updateWindowModifiedState True))
! 	writeIORef ref (True,x)
! 
! getDocModified :: Document a -> IO Bool
! getDocModified (Document ref _ _ _) = do
! 	(modified, x) <- readIORef ref
! 	return modified
! 
! getDocFilePath :: Document a -> IO (Maybe FilePath)
! getDocFilePath (Document _ refPath _ _) = do
! 	path <- readIORef refPath
! 	return (case path of {Left path -> Just path; Right _ -> Nothing})
! 
! newDoc :: DocumentTemplate a -> IO (Document a)
! newDoc templ = do
! 	x <- dtNewDocument templ
! 	index <- withMVar documents (getNextDocumentIndex templ . elems)
! 	ref <- newIORef (False, x)
! 	refPath <- newIORef (Right index)
! 	refWindows <- newIORef []
! 	return (Document ref refPath refWindows templ)
! 
! openDoc :: FilePath -> DocumentTemplate a -> IO (Document a)
! openDoc path templ = do
! 	x <- dtOpenDocument templ path
! 	ref <- newIORef (False, x)
! 	refPath <- newIORef (Left path)
! 	refWindows <- newIORef []
! 	return (Document ref refPath refWindows templ)
! 
! saveDoc :: FilePath -> Document a -> IO ()
! saveDoc path (Document ref refPath refWindows templ) = do
! 	(modified, x) <- readIORef ref
! 	when modified $ do
! 		dtSaveDocument templ path x
! 		readIORef refWindows >>= mapM_ (updateWindowModifiedState False)
! 		writeIORef ref (False, x)
! 		writeIORef refPath (Left path)
! 
! openDocWindow :: Document a -> IO WindowHandle
! openDocWindow d@(Document _ _ _ templ) = dtOpenWindow templ d
! 
! printDoc :: Document a -> IO ()
! printDoc (Document ref _ _ templ) = do
! 	(modified, x) <- readIORef ref
! 	dtPrintDocument templ x
! 
! updateWindowModifiedState :: Bool -> WindowHandle -> IO ()
! updateWindowModifiedState flag hwnd = return ()  -- TODO
! 
! getNextDocumentIndex :: DocumentTemplate a -> [Holder Document] -> IO Int
! getNextDocumentIndex dt [] = return 0
! getNextDocumentIndex dt (Holder doc : docs) = do
! 	path <- readIORef (docFilePath doc)
! 	case path of
! 		Right index | dtMimeType (docTemplate doc) == dtMimeType dt -> do
! 			index' <- getNextDocumentIndex dt docs
! 			return (max (index+1) index')
! 		_ -> getNextDocumentIndex dt docs

[htoolkit-cvs] port makefile,1.25,1.26

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

Update of /cvsroot/htoolkit/port
In directory sc8-pr-cvs1:/tmp/cvs-serv26940/port

Modified Files:
	makefile 
Log Message:
Better makefile scripts


Index: makefile
===================================================================
RCS file: /cvsroot/htoolkit/port/makefile,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** makefile	17 Jul 2003 17:34:25 -0000	1.25
--- makefile	23 Jul 2003 16:26:28 -0000	1.26
***************
*** 119,123 ****
  HOBJS	    = $(patsubst %.hs,$(HOUTDIR)/%.o, $(HSRCS))
  HDEPS       = $(patsubst %.hs,$(HOUTDIR)/%.d, $(HSRCS))  
! HHIS	    = $(patsubst %.hs,$(HOUTDIR)/Graphics/UI/%.hi, $(HSRCS))  
  
  COBJS	    = $(patsubst %.c,$(COUTDIR)/%.c.o, $(CSRCS))    	      
--- 119,123 ----
  HOBJS	    = $(patsubst %.hs,$(HOUTDIR)/%.o, $(HSRCS))
  HDEPS       = $(patsubst %.hs,$(HOUTDIR)/%.d, $(HSRCS))  
! HHIS	    = $(patsubst %.hs,$(HOUTDIR)/%.hi, $(HSRCS))  
  
  COBJS	    = $(patsubst %.c,$(COUTDIR)/%.c.o, $(CSRCS))    	      
***************
*** 145,157 ****
  	install -d $(LIBDIR)/doc/html/port
  	install -m 644 src/include/HsPort.h $(LIBDIR)/include/port
! 	install -m 644 $(HOUTDIR)/*.hi $(LIBDIR)/imports/Graphics/UI
! 	install -m 644 $(HOUTDIR)/Port/*.hi $(LIBDIR)/imports/Graphics/UI/Port
  	install -m 644 $(MAINLIB) $(LIBDIR)
  	install -m 644 src/include/HsPort.h $(LIBDIR)/include
  	install -m 644 src/include/*.h $(LIBDIR)/include/port
- 	install -m 644 doc/*.html doc/*.css doc/*.gif doc/*.haddock $(LIBDIR)/doc/html/port
  	$(RM) $(LIBDIR)/include/port/HsPort.h
  	$(RM) $(LIBDIR)/$(MAINOBJ)
  	$(HCPKG) -u -g -i $(PKG)
  
  $(MAINLIB): $(HOBJS) $(COBJS) $(STUBSTUBOBJS)
--- 145,156 ----
  	install -d $(LIBDIR)/doc/html/port
  	install -m 644 src/include/HsPort.h $(LIBDIR)/include/port
! 	install -m 644 $(HHIS) $(LIBDIR)/imports/Graphics/UI
  	install -m 644 $(MAINLIB) $(LIBDIR)
  	install -m 644 src/include/HsPort.h $(LIBDIR)/include
  	install -m 644 src/include/*.h $(LIBDIR)/include/port
  	$(RM) $(LIBDIR)/include/port/HsPort.h
  	$(RM) $(LIBDIR)/$(MAINOBJ)
  	$(HCPKG) -u -g -i $(PKG)
+ 	install -m 644 doc/*.html doc/*.css doc/*.gif doc/*.haddock $(LIBDIR)/doc/html/port
  
  $(MAINLIB): $(HOBJS) $(COBJS) $(STUBSTUBOBJS)
***************
*** 220,224 ****
  # EXTRA RULES: clean doc
  #--------------------------------------------------------------------------
! .PHONY: clean cleanLIB cleanHS cleanC cleanDOC
  
  # extra commands: clean up all directories and show linecounts.
--- 219,223 ----
  # EXTRA RULES: clean doc
  #--------------------------------------------------------------------------
! .PHONY: clean
  
  # extra commands: clean up all directories and show linecounts.

[htoolkit-cvs] gio makefile,1.12,1.13

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

Update of /cvsroot/htoolkit/gio
In directory sc8-pr-cvs1:/tmp/cvs-serv26940/gio

Modified Files:
	makefile 
Log Message:
Better makefile scripts


Index: makefile
===================================================================
RCS file: /cvsroot/htoolkit/gio/makefile,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** makefile	17 Jul 2003 17:34:25 -0000	1.12
--- makefile	23 Jul 2003 16:26:27 -0000	1.13
***************
*** 124,131 ****
  	install -m 644 $(HOUTDIR)/*.hi $(LIBDIR)/imports/Graphics/UI
  	install -m 644 $(HOUTDIR)/GIO/*.hi $(LIBDIR)/imports/Graphics/UI/GIO
! 	install -m 644 $(MAINLIB) $(LIBDIR)
! 	install -m 644 doc/*.html doc/*.css doc/*.gif doc/*.haddock $(LIBDIR)/doc/html/gio
  	$(RM) $(LIBDIR)/$(MAINOBJ)
  	$(HCPKG) -u -g -i $(PKG)
  
  $(MAINLIB): $(HOBJS) $(COBJS) $(STUBSTUBOBJS)
--- 124,131 ----
  	install -m 644 $(HOUTDIR)/*.hi $(LIBDIR)/imports/Graphics/UI
  	install -m 644 $(HOUTDIR)/GIO/*.hi $(LIBDIR)/imports/Graphics/UI/GIO
! 	install -m 644 $(MAINLIB) $(LIBDIR)	
  	$(RM) $(LIBDIR)/$(MAINOBJ)
  	$(HCPKG) -u -g -i $(PKG)
+ 	install -m 644 doc/*.html doc/*.css doc/*.gif doc/*.haddock $(LIBDIR)/doc/html/gio
  
  $(MAINLIB): $(HOBJS) $(COBJS) $(STUBSTUBOBJS)

[htoolkit-cvs] port/src/cbits/GTK ToolBar.c,1.1,1.2

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

Update of /cvsroot/htoolkit/port/src/cbits/GTK
In directory sc8-pr-cvs1:/tmp/cvs-serv26695/port/src/cbits/GTK

Modified Files:
	ToolBar.c 
Log Message:
Add extra new line to the end of file.


Index: ToolBar.c
===================================================================
RCS file: /cvsroot/htoolkit/port/src/cbits/GTK/ToolBar.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ToolBar.c	8 Jul 2003 20:31:29 -0000	1.1
--- ToolBar.c	23 Jul 2003 16:25:20 -0000	1.2
***************
*** 15,21 ****
  	switch (place)
  	{
! 	case 0: placement = BONOBO_DOCK_LEFT;       break;
! 	case 1: placement = BONOBO_DOCK_TOP;        break;
! 	case 2: placement = BONOBO_DOCK_RIGHT;     break;
  	case 3: placement = BONOBO_DOCK_BOTTOM; break;
  	default:
--- 15,21 ----
  	switch (place)
  	{
! 	case 0: placement = BONOBO_DOCK_LEFT;   break;
! 	case 1: placement = BONOBO_DOCK_TOP;    break;
! 	case 2: placement = BONOBO_DOCK_RIGHT;  break;
  	case 3: placement = BONOBO_DOCK_BOTTOM; break;
  	default:
***************
*** 48,51 ****
--- 48,52 ----
  ToolHandle osInsertToolButton(WindowHandle toolbar, int pos)
  {
+ /*
  	GtkToolItem *item = gtk_tool_button_new("", gtk_image_new());
  	gtk_signal_connect (GTK_OBJECT(GTK_TOOL_BUTTON(item)->button), "clicked",
***************
*** 59,66 ****
--- 60,71 ----
  	gtk_widget_show_all(GTK_WIDGET(item));
  	return GTK_WIDGET(item);
+ */
+ 	printf("osInsertToolButton -> not implemented");
+ 	return NULL;
  }
  
  ToolHandle osInsertToolCheckButton(WindowHandle toolbar, int pos)
  {
+ /*
  	GtkToolItem *item = gtk_toggle_tool_button_new();
  	gtk_signal_connect (GTK_OBJECT(GTK_TOOL_BUTTON(item)->button), "clicked",
***************
*** 76,83 ****
--- 81,92 ----
  	gtk_widget_show_all(GTK_WIDGET(item));
  	return GTK_WIDGET(item);
+ */
+ 	printf("osInsertToolCheckButton -> not implemented");
+ 	return NULL;
  }
  
  ToolHandle osInsertToolLine(WindowHandle toolbar, int pos)
  {
+ /*
  	GtkToolItem *item = gtk_separator_tool_item_new();
  	gtk_signal_connect (GTK_OBJECT(item), "destroy",
***************
*** 87,95 ****
  	gtk_widget_show_all(GTK_WIDGET(item));
  	return GTK_WIDGET(item);
  }
  
  void osSetToolButtonBitmap(ToolHandle toolButton, BitmapHandle bitmap)
  {
! 	gtk_image_set_from_pixbuf(gtk_tool_button_get_icon_widget (GTK_TOOL_BUTTON(toolButton)), bitmap->pixbuf);
  }
  
--- 96,107 ----
  	gtk_widget_show_all(GTK_WIDGET(item));
  	return GTK_WIDGET(item);
+ */
+ 	printf("osInsertToolLine -> not implemented");
+ 	return NULL;
  }
  
  void osSetToolButtonBitmap(ToolHandle toolButton, BitmapHandle bitmap)
  {
! 	//gtk_image_set_from_pixbuf(gtk_tool_button_get_icon_widget (GTK_TOOL_BUTTON(toolButton)), bitmap->pixbuf);
  }
  
***************
*** 106,140 ****
  void osSetToolButtonTip(ToolHandle toolButton, char *text)
  {
! 	GtkWidget *toolbar = gtk_widget_get_parent(toolButton);
! 	gtk_tool_item_set_tooltip(GTK_TOOL_ITEM(toolButton), GTK_TOOLBAR(toolbar)->tooltips, text, NULL);
  }
  
  char *osGetToolButtonTip(ToolHandle toolButton)
  {
! 	GtkTooltipsData *tips_data = gtk_tooltips_data_get(GTK_BIN (toolButton)->child);
! 	return strdup(tips_data->tip_text);
  }
  
  void osSetToolButtonText(ToolHandle toolButton, char *text)
  {
!   	GtkWidget *label = gtk_tool_button_get_label_widget (GTK_TOOL_BUTTON(toolButton));
! 	gtk_label_set_text(GTK_LABEL(label), text);
  }
  
  char *osGetToolButtonText(ToolHandle toolButton)
  {
! 	GtkWidget *label = gtk_tool_button_get_label_widget (GTK_TOOL_BUTTON(toolButton));
  	char *text = gtk_label_get_text(GTK_LABEL(label));
! 	return strdup(text);
  }
  
  void osSetToolButtonChecked(ToolHandle toolButton, BOOL bState)
  {
! 	gtk_toggle_tool_button_set_active  (GTK_TOGGLE_TOOL_BUTTON(toolButton), bState);
  };
  
  BOOL osGetToolButtonChecked(ToolHandle toolButton)
  {
! 	return gtk_toggle_tool_button_get_active(GTK_TOGGLE_TOOL_BUTTON(toolButton));
  };
  
--- 118,155 ----
  void osSetToolButtonTip(ToolHandle toolButton, char *text)
  {
! 	//GtkWidget *toolbar = gtk_widget_get_parent(toolButton);
! 	//gtk_tool_item_set_tooltip(GTK_TOOL_ITEM(toolButton), GTK_TOOLBAR(toolbar)->tooltips, text, NULL);
  }
  
  char *osGetToolButtonTip(ToolHandle toolButton)
  {
! 	//GtkTooltipsData *tips_data = gtk_tooltips_data_get(GTK_BIN (toolButton)->child);
! 	//return strdup(tips_data->tip_text);
! 	return strdup("");
  }
  
  void osSetToolButtonText(ToolHandle toolButton, char *text)
  {
!   	//GtkWidget *label = gtk_tool_button_get_label_widget (GTK_TOOL_BUTTON(toolButton));
! 	//gtk_label_set_text(GTK_LABEL(label), text);
  }
  
  char *osGetToolButtonText(ToolHandle toolButton)
  {
! 	/*GtkWidget *label = gtk_tool_button_get_label_widget (GTK_TOOL_BUTTON(toolButton));
  	char *text = gtk_label_get_text(GTK_LABEL(label));
! 	return strdup(text);*/
! 	return strdup("");
  }
  
  void osSetToolButtonChecked(ToolHandle toolButton, BOOL bState)
  {
! 	//gtk_toggle_tool_button_set_active  (GTK_TOGGLE_TOOL_BUTTON(toolButton), bState);
  };
  
  BOOL osGetToolButtonChecked(ToolHandle toolButton)
  {
! 	//return gtk_toggle_tool_button_get_active(GTK_TOGGLE_TOOL_BUTTON(toolButton));
! 	return FALSE;
  };
  
***************
*** 146,150 ****
  int osGetToolItemPos(ToolHandle toolItem)
  {
! 	GtkWidget *toolbar = gtk_widget_get_parent(toolItem);
! 	return gtk_toolbar_get_item_index(GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(toolItem));
  }
--- 161,166 ----
  int osGetToolItemPos(ToolHandle toolItem)
  {
! 	//GtkWidget *toolbar = gtk_widget_get_parent(toolItem);
! 	//return gtk_toolbar_get_item_index(GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(toolItem));
! 	return 0;
  }

[htoolkit-cvs] port/src/cbits/Win32 AboutDialog.c,1.1,1.2 ConfigKey.c,1.1,1.2 EditBox.c,1.6,1.7 FontDialog.c,1.4,1.5 Label.c,1.4,1.5 Menu.c,1.10,1.11 MenuHandlesMap.h,1.1,1.2 Message.c,1.3,1.4

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

Update of /cvsroot/htoolkit/port/src/cbits/Win32
In directory sc8-pr-cvs1:/tmp/cvs-serv26695/port/src/cbits/Win32

Modified Files:
	AboutDialog.c ConfigKey.c EditBox.c FontDialog.c Label.c 
	Menu.c MenuHandlesMap.h Message.c 
Log Message:
Add extra new line to the end of file.


Index: AboutDialog.c
===================================================================
RCS file: /cvsroot/htoolkit/port/src/cbits/Win32/AboutDialog.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AboutDialog.c	1 Jul 2003 19:13:03 -0000	1.1
--- AboutDialog.c	23 Jul 2003 16:25:21 -0000	1.2
***************
*** 547,549 ****
  	
  	FreeDlgInfo(&fi);
! }
\ No newline at end of file
--- 547,549 ----
  	
  	FreeDlgInfo(&fi);
! }

Index: ConfigKey.c
===================================================================
RCS file: /cvsroot/htoolkit/port/src/cbits/Win32/ConfigKey.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ConfigKey.c	4 Jul 2003 17:39:04 -0000	1.1
--- ConfigKey.c	23 Jul 2003 16:25:21 -0000	1.2
***************
*** 7,11 ****
  	FrameData *pFrameData;
  	HKEY hSoftwareKey, hAppKey, hKey;
- 	LONG lResult;
  	
  	pFrameData = (FrameData *) GetWindowLong(ghWndFrame,GWL_USERDATA);
--- 7,10 ----
***************
*** 220,222 ****
  
  	RegCloseKey(hKey);
! }
\ No newline at end of file
--- 219,221 ----
  
  	RegCloseKey(hKey);
! }

Index: EditBox.c
===================================================================
RCS file: /cvsroot/htoolkit/port/src/cbits/Win32/EditBox.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** EditBox.c	26 Mar 2003 22:09:59 -0000	1.6
--- EditBox.c	23 Jul 2003 16:25:21 -0000	1.7
***************
*** 90,92 ****
  	SendMessage(editbox, WM_SETFONT, (WPARAM) font, MAKELPARAM (TRUE,0));
  	handleWindowReLayout(GetParent(editbox));
! };
\ No newline at end of file
--- 90,92 ----
  	SendMessage(editbox, WM_SETFONT, (WPARAM) font, MAKELPARAM (TRUE,0));
  	handleWindowReLayout(GetParent(editbox));
! };

Index: FontDialog.c
===================================================================
RCS file: /cvsroot/htoolkit/port/src/cbits/Win32/FontDialog.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FontDialog.c	1 May 2003 20:27:39 -0000	1.4
--- FontDialog.c	23 Jul 2003 16:25:21 -0000	1.5
***************
*** 34,36 ****
  
  	return TRUE;
! }
\ No newline at end of file
--- 34,36 ----
  
  	return TRUE;
! }

Index: Label.c
===================================================================
RCS file: /cvsroot/htoolkit/port/src/cbits/Win32/Label.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Label.c	26 Mar 2003 22:10:01 -0000	1.4
--- Label.c	23 Jul 2003 16:25:21 -0000	1.5
***************
*** 58,60 ****
  	SendMessage(label, WM_SETFONT, (WPARAM) font, MAKELPARAM (TRUE,0));
  	handleWindowReLayout(GetParent(label));
! };
\ No newline at end of file
--- 58,60 ----
  	SendMessage(label, WM_SETFONT, (WPARAM) font, MAKELPARAM (TRUE,0));
  	handleWindowReLayout(GetParent(label));
! };

Index: Menu.c
===================================================================
RCS file: /cvsroot/htoolkit/port/src/cbits/Win32/Menu.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Menu.c	12 Jul 2003 13:49:41 -0000	1.10
--- Menu.c	23 Jul 2003 16:25:21 -0000	1.11
***************
*** 514,516 ****
  	FrameData *pFrameData = (FrameData *) GetWindowLong(ghWndFrame,GWL_USERDATA);
  	return getMenuIndex(pFrameData->pMenuHandlesMap, handle);
! }
\ No newline at end of file
--- 514,516 ----
  	FrameData *pFrameData = (FrameData *) GetWindowLong(ghWndFrame,GWL_USERDATA);
  	return getMenuIndex(pFrameData->pMenuHandlesMap, handle);
! }

Index: MenuHandlesMap.h
===================================================================
RCS file: /cvsroot/htoolkit/port/src/cbits/Win32/MenuHandlesMap.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MenuHandlesMap.h	23 Apr 2003 21:48:54 -0000	1.1
--- MenuHandlesMap.h	23 Jul 2003 16:25:21 -0000	1.2
***************
*** 64,66 ****
  void notifyAllHandlesForDestroy(MenuHandlesMap *pMap);
  
! #endif
\ No newline at end of file
--- 64,66 ----
  void notifyAllHandlesForDestroy(MenuHandlesMap *pMap);
  
! #endif

Index: Message.c
===================================================================
RCS file: /cvsroot/htoolkit/port/src/cbits/Win32/Message.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Message.c	29 Mar 2003 08:12:19 -0000	1.3
--- Message.c	23 Jul 2003 16:25:21 -0000	1.4
***************
*** 52,54 ****
  		default:    return -1;
  	}
! };
\ No newline at end of file
--- 52,54 ----
  		default:    return -1;
  	}
! };

[htoolkit-cvs] port/src Port.hs,1.17,1.18

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

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

Modified Files:
	Port.hs 
Log Message:
Change copyright notice


Index: Port.hs
===================================================================
RCS file: /cvsroot/htoolkit/port/src/Port.hs,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Port.hs	8 Jul 2003 20:31:29 -0000	1.17
--- Port.hs	17 Jul 2003 19:33:32 -0000	1.18
***************
*** 1,8 ****
  -----------------------------------------------------------------------------------------
  {-| Module      :  Port
!     Copyright   :  (c) Krasimir Angelov & Daan Leijen 2003
      License     :  BSD-style
  
!     Maintainer  :  ka2...@ya... da...@cs...
      Stability   :  provisional
      Portability :  portable
--- 1,8 ----
  -----------------------------------------------------------------------------------------
  {-| Module      :  Port
!     Copyright   :  (c) Krasimir Angelov 2003
      License     :  BSD-style
  
!     Maintainer  :  ka2...@ya...
      Stability   :  provisional
      Portability :  portable

[htoolkit-cvs] port configure,1.16,1.17

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

Update of /cvsroot/htoolkit/port
In directory sc8-pr-cvs1:/tmp/cvs-serv7457/port

Modified Files:
	configure 
Log Message:
Add -username option to set the name of sourceforge user


Index: configure
===================================================================
RCS file: /cvsroot/htoolkit/port/configure,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** configure	17 Jul 2003 17:34:25 -0000	1.16
--- configure	17 Jul 2003 19:34:37 -0000	1.17
***************
*** 22,25 ****
--- 22,26 ----
  target=""
  ccoption=""
+ username=$USERNAME
  
  # Parse command-line arguments
***************
*** 37,40 ****
--- 38,42 ----
  	echo " -package       <local package configuration file>"
  	echo " -incdir        <ffi include directory, contains 'HsFFI.h'>"
+ 	echo " -username      <username on sourceforge (= $username)>"
  	echo " -haddock       <haddock documentation tool>"
  	echo " -haddock-libs  <haddock library directory>"
***************
*** 54,57 ****
--- 56,61 ----
      -package*)
  	hcpkglocal="$2"; shift;;
+     -username*)
+     	username="$2"; shift;;
      -haddock-libs*)
          hdoclibs="$2"; shift;;
***************
*** 390,393 ****
--- 394,398 ----
  echo "EXE=$exe"		>> config/config.mk
  echo "DLL=$dll"		>> config/config.mk
+ echo "USERNAME=$username" >> config/config.mk
  
  echo "creating header file configuration"

[htoolkit-cvs] gio configure,1.5,1.6

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

Update of /cvsroot/htoolkit/gio
In directory sc8-pr-cvs1:/tmp/cvs-serv7457/gio

Modified Files:
	configure 
Log Message:
Add -username option to set the name of sourceforge user


Index: configure
===================================================================
RCS file: /cvsroot/htoolkit/gio/configure,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** configure	17 Jul 2003 17:34:25 -0000	1.5
--- configure	17 Jul 2003 19:34:37 -0000	1.6
***************
*** 21,24 ****
--- 21,25 ----
  portdir=""
  libdir=""
+ username=$USERNAME
  
  # Parse command-line arguments
***************
*** 32,36 ****
  	echo " -hcpkg         <package compiler (= ghc-pkg)>"
  	echo " -package       <local package configuration file>"
! 	echo " -port	      <sources directory of the 'port' library>"
  	echo " -haddock       <haddock documentation tool>"
  	echo " -haddock-libs  <haddock library directory>"
--- 33,38 ----
  	echo " -hcpkg         <package compiler (= ghc-pkg)>"
  	echo " -package       <local package configuration file>"
! 	echo " -port          <sources directory of the 'port' library>"
! 	echo " -username      <username on sourceforge (= $username)>"
  	echo " -haddock       <haddock documentation tool>"
  	echo " -haddock-libs  <haddock library directory>"
***************
*** 46,49 ****
--- 48,53 ----
      -package*)
  	hcpkglocal="$2"; shift;;
+     -username*)
+     	username="$2"; shift;;
      -haddock-libs*)
          hdoclibs="$2"; shift;;
***************
*** 241,244 ****
--- 245,249 ----
  echo "MKDIR=mkdir -p"	>> config/config.mk
  echo "RMDIR=rmdir"	>> config/config.mk
+ echo "USERNAME=$username" >> config/config.mk
  
  echo "creating package description"

[htoolkit-cvs] port/src/Port Bitmap.hs,1.7,1.8 Canvas.hs,1.15,1.16 Controls.hs,1.15,1.16 Font.hs,1.5,1.6 Handlers.hs,1.25,1.26 Menu.hs,1.8,1.9

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

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

Modified Files:
	Bitmap.hs Canvas.hs Controls.hs Font.hs Handlers.hs Menu.hs 
Log Message:
Change copyright notices


Index: Bitmap.hs
===================================================================
RCS file: /cvsroot/htoolkit/port/src/Port/Bitmap.hs,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Bitmap.hs	8 Jun 2003 19:42:14 -0000	1.7
--- Bitmap.hs	17 Jul 2003 19:30:03 -0000	1.8
***************
*** 2,9 ****
  -----------------------------------------------------------------------------------------
  {-| Module      :  Bitmap
!     Copyright   :  (c) Krasimir Angelov & Daan Leijen 2003
      License     :  BSD-style
  
!     Maintainer  :  ka2...@ya... da...@cs...
      Stability   :  provisional
      Portability :  portable
--- 2,9 ----
  -----------------------------------------------------------------------------------------
  {-| Module      :  Bitmap
!     Copyright   :  (c) Krasimir Angelov 2003
      License     :  BSD-style
  
!     Maintainer  :  ka2...@ya...
      Stability   :  provisional
      Portability :  portable

Index: Canvas.hs
===================================================================
RCS file: /cvsroot/htoolkit/port/src/Port/Canvas.hs,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Canvas.hs	8 Jun 2003 19:42:14 -0000	1.15
--- Canvas.hs	17 Jul 2003 19:30:03 -0000	1.16
***************
*** 2,9 ****
  -----------------------------------------------------------------------------------------
  {-| Module      :  Canvas
!     Copyright   :  (c) Krasimir Angelov & Daan Leijen 2003
      License     :  BSD-style
  
!     Maintainer  :  ka2...@ya... da...@cs...
      Stability   :  provisional
      Portability :  portable
--- 2,9 ----
  -----------------------------------------------------------------------------------------
  {-| Module      :  Canvas
!     Copyright   :  (c) Krasimir Angelov 2003
      License     :  BSD-style
  
!     Maintainer  :  ka2...@ya...
      Stability   :  provisional
      Portability :  portable

Index: Controls.hs
===================================================================
RCS file: /cvsroot/htoolkit/port/src/Port/Controls.hs,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Controls.hs	16 Jul 2003 22:01:04 -0000	1.15
--- Controls.hs	17 Jul 2003 19:30:03 -0000	1.16
***************
*** 2,9 ****
  -----------------------------------------------------------------------------------------
  {-| Module      :  Controls
!     Copyright   :  (c) Krasimir Angelov & Daan Leijen 2003
      License     :  BSD-style
  
!     Maintainer  :  ka2...@ya... da...@cs...
      Stability   :  provisional
      Portability :  portable
--- 2,9 ----
  -----------------------------------------------------------------------------------------
  {-| Module      :  Controls
!     Copyright   :  (c) Krasimir Angelov 2003
      License     :  BSD-style
  
!     Maintainer  :  ka2...@ya...
      Stability   :  provisional
      Portability :  portable

Index: Font.hs
===================================================================
RCS file: /cvsroot/htoolkit/port/src/Port/Font.hs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Font.hs	8 Jun 2003 19:42:14 -0000	1.5
--- Font.hs	17 Jul 2003 19:30:03 -0000	1.6
***************
*** 2,9 ****
  -----------------------------------------------------------------------------------------
  {-| Module      :  Font
!     Copyright   :  (c) Krasimir Angelov & Daan Leijen 2003
      License     :  BSD-style
  
!     Maintainer  :  ka2...@ya... da...@cs...
      Stability   :  provisional
      Portability :  portable
--- 2,9 ----
  -----------------------------------------------------------------------------------------
  {-| Module      :  Font
!     Copyright   :  (c) Krasimir Angelov 2003
      License     :  BSD-style
  
!     Maintainer  :  ka2...@ya...
      Stability   :  provisional
      Portability :  portable

Index: Handlers.hs
===================================================================
RCS file: /cvsroot/htoolkit/port/src/Port/Handlers.hs,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** Handlers.hs	8 Jul 2003 21:44:49 -0000	1.25
--- Handlers.hs	17 Jul 2003 19:30:03 -0000	1.26
***************
*** 3,10 ****
  -----------------------------------------------------------------------------------------
  {-| Module      :  Handlers
!     Copyright   :  (c) Krasimir Angelov & Daan Leijen 2003
      License     :  BSD-style
  
!     Maintainer  :  ka2...@ya... da...@cs...
      Stability   :  provisional
      Portability :  portable
--- 3,10 ----
  -----------------------------------------------------------------------------------------
  {-| Module      :  Handlers
!     Copyright   :  (c) Krasimir Angelov 2003
      License     :  BSD-style
  
!     Maintainer  :  ka2...@ya...
      Stability   :  provisional
      Portability :  portable

Index: Menu.hs
===================================================================
RCS file: /cvsroot/htoolkit/port/src/Port/Menu.hs,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Menu.hs	8 Jul 2003 21:44:49 -0000	1.8
--- Menu.hs	17 Jul 2003 19:30:03 -0000	1.9
***************
*** 2,9 ****
  -----------------------------------------------------------------------------------------
  {-| Module      :  Menu
!     Copyright   :  (c) Daan Leijen 2003
      License     :  BSD-style
  
!     Maintainer  :  da...@cs...
      Stability   :  provisional
      Portability :  portable
--- 2,9 ----
  -----------------------------------------------------------------------------------------
  {-| Module      :  Menu
!     Copyright   :  (c) Krasimir Angelov 2003
      License     :  BSD-style
  
!     Maintainer  :  ka2...@ya...
      Stability   :  provisional
      Portability :  portable

[htoolkit-cvs] gio/src/Graphics/UI/GIO Attributes.hs,1.15,1.16 Bitmap.hs,1.3,1.4 Controls.hs,1.17,1.18 Events.hs,1.13,1.14 Menu.hs,1.8,1.9 Timer.hs,1.8,1.9

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

Update of /cvsroot/htoolkit/gio/src/Graphics/UI/GIO
In directory sc8-pr-cvs1:/tmp/cvs-serv6367/gio/src/Graphics/UI/GIO

Modified Files:
	Attributes.hs Bitmap.hs Controls.hs Events.hs Menu.hs Timer.hs 
Log Message:
Change copyright notices


Index: Attributes.hs
===================================================================
RCS file: /cvsroot/htoolkit/gio/src/Graphics/UI/GIO/Attributes.hs,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Attributes.hs	12 Jul 2003 08:15:29 -0000	1.15
--- Attributes.hs	17 Jul 2003 19:30:04 -0000	1.16
***************
*** 1,8 ****
  -----------------------------------------------------------------------------------------
  {-| Module      :  Attributes
!     Copyright   :  (c) Daan Leijen 2003
      License     :  BSD-style
  
!     Maintainer  :  da...@cs...
      Stability   :  provisional
      Portability :  portable
--- 1,8 ----
  -----------------------------------------------------------------------------------------
  {-| Module      :  Attributes
!     Copyright   :  (c) Krasimir Angelov 2003
      License     :  BSD-style
  
!     Maintainer  :  ka2...@ya...
      Stability   :  provisional
      Portability :  portable

Index: Bitmap.hs
===================================================================
RCS file: /cvsroot/htoolkit/gio/src/Graphics/UI/GIO/Bitmap.hs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Bitmap.hs	30 May 2003 21:55:06 -0000	1.3
--- Bitmap.hs	17 Jul 2003 19:30:04 -0000	1.4
***************
*** 1,8 ****
  -----------------------------------------------------------------------------------------
  {-| Module      :  Bitmap
!     Copyright   :  (c) Daan Leijen 2003
      License     :  BSD-style
  
!     Maintainer  :  da...@cs...
      Stability   :  provisional
      Portability :  portable
--- 1,8 ----
  -----------------------------------------------------------------------------------------
  {-| Module      :  Bitmap
!     Copyright   :  (c) Krasimir Angelov 2003
      License     :  BSD-style
  
!     Maintainer  :  ka2...@ya...
      Stability   :  provisional
      Portability :  portable

Index: Controls.hs
===================================================================
RCS file: /cvsroot/htoolkit/gio/src/Graphics/UI/GIO/Controls.hs,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Controls.hs	12 Jul 2003 08:15:29 -0000	1.17
--- Controls.hs	17 Jul 2003 19:30:04 -0000	1.18
***************
*** 1,8 ****
  -----------------------------------------------------------------------------------------
  {-| Module      :  Controls
!     Copyright   :  (c) Krasimir Angelov & Daan Leijen 2003
      License     :  BSD-style
  
!     Maintainer  :  ka2...@ya... da...@cs...
      Stability   :  provisional
      Portability :  portable
--- 1,8 ----
  -----------------------------------------------------------------------------------------
  {-| Module      :  Controls
!     Copyright   :  (c) Krasimir Angelov 2003
      License     :  BSD-style
  
!     Maintainer  :  ka2...@ya...
      Stability   :  provisional
      Portability :  portable

Index: Events.hs
===================================================================
RCS file: /cvsroot/htoolkit/gio/src/Graphics/UI/GIO/Events.hs,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Events.hs	16 Jul 2003 22:25:43 -0000	1.13
--- Events.hs	17 Jul 2003 19:30:05 -0000	1.14
***************
*** 1,8 ****
  -----------------------------------------------------------------------------------------
  {-| Module      :  Events
!     Copyright   :  (c) Daan Leijen 2003
      License     :  BSD-style
  
!     Maintainer  :  da...@cs...
      Stability   :  provisional
      Portability :  portable
--- 1,8 ----
  -----------------------------------------------------------------------------------------
  {-| Module      :  Events
!     Copyright   :  (c) Krasimir Angelov 2003
      License     :  BSD-style
  
!     Maintainer  :  ka2...@ya...
      Stability   :  provisional
      Portability :  portable

Index: Menu.hs
===================================================================
RCS file: /cvsroot/htoolkit/gio/src/Graphics/UI/GIO/Menu.hs,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Menu.hs	8 Jul 2003 20:36:26 -0000	1.8
--- Menu.hs	17 Jul 2003 19:30:05 -0000	1.9
***************
*** 1,8 ****
  -----------------------------------------------------------------------------------------
  {-| Module      :  Menu
!     Copyright   :  (c) Krasimir Angelov & Daan Leijen 2003
      License     :  BSD-style
  
!     Maintainer  :  ka2...@ya... da...@cs...
      Stability   :  provisional
      Portability :  portable
--- 1,8 ----
  -----------------------------------------------------------------------------------------
  {-| Module      :  Menu
!     Copyright   :  (c) Krasimir Angelov 2003
      License     :  BSD-style
  
!     Maintainer  :  ka2...@ya...
      Stability   :  provisional
      Portability :  portable

Index: Timer.hs
===================================================================
RCS file: /cvsroot/htoolkit/gio/src/Graphics/UI/GIO/Timer.hs,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Timer.hs	14 Apr 2003 18:01:34 -0000	1.8
--- Timer.hs	17 Jul 2003 19:30:05 -0000	1.9
***************
*** 1,8 ****
  -----------------------------------------------------------------------------------------
  {-| Module      :  Timer
!     Copyright   :  (c) Daan Leijen 2003
      License     :  BSD-style
  
!     Maintainer  :  da...@cs...
      Stability   :  provisional
      Portability :  portable
--- 1,8 ----
  -----------------------------------------------------------------------------------------
  {-| Module      :  Timer
!     Copyright   :  (c) Krasimir Angelov 2003
      License     :  BSD-style
  
!     Maintainer  :  ka2...@ya...
      Stability   :  provisional
      Portability :  portable

[htoolkit-cvs] gio/src/Graphics/UI GIO.hs,1.10,1.11

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

Update of /cvsroot/htoolkit/gio/src/Graphics/UI
In directory sc8-pr-cvs1:/tmp/cvs-serv6367/gio/src/Graphics/UI

Modified Files:
	GIO.hs 
Log Message:
Change copyright notices


Index: GIO.hs
===================================================================
RCS file: /cvsroot/htoolkit/gio/src/Graphics/UI/GIO.hs,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** GIO.hs	8 Jul 2003 20:36:26 -0000	1.10
--- GIO.hs	17 Jul 2003 19:30:04 -0000	1.11
***************
*** 1,8 ****
  -----------------------------------------------------------------------------------------
  {-| Module      :  GIO
!     Copyright   :  (c) Krasimir Angelov & Daan Leijen 2003
      License     :  BSD-style
  
!     Maintainer  :  ka2...@ya... da...@cs...
      Stability   :  provisional
      Portability :  portable
--- 1,8 ----
  -----------------------------------------------------------------------------------------
  {-| Module      :  GIO
!     Copyright   :  (c) Krasimir Angelov 2003
      License     :  BSD-style
  
!     Maintainer  :  ka2...@ya...
      Stability   :  provisional
      Portability :  portable

[htoolkit-cvs] port/src/Port Process.hs,1.2,1.3

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

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

Modified Files:
	Process.hs 
Log Message:
fix


Index: Process.hs
===================================================================
RCS file: /cvsroot/htoolkit/port/src/Port/Process.hs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Process.hs	1 May 2003 19:35:35 -0000	1.2
--- Process.hs	17 Jul 2003 17:55:48 -0000	1.3
***************
*** 1,3 ****
! {-# OPTIONS -fglasgow-exts #-}
  -----------------------------------------------------------------------------------------
  {-| Module      :  Process
--- 1,3 ----
! {-# OPTIONS -fglasgow-exts -#include Types.h #-}
  -----------------------------------------------------------------------------------------
  {-| Module      :  Process

[htoolkit-cvs] port configure,1.15,1.16 makefile,1.24,1.25

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

Update of /cvsroot/htoolkit/port
In directory sc8-pr-cvs1:/tmp/cvs-serv13801/port

Modified Files:
	configure makefile 
Log Message:
better configure/makefile scripts for Windows


Index: configure
===================================================================
RCS file: /cvsroot/htoolkit/port/configure,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** configure	16 Jul 2003 22:11:06 -0000	1.15
--- configure	17 Jul 2003 17:34:25 -0000	1.16
***************
*** 36,41 ****
  	echo " -hcpkg         <package compiler (= ghc-pkg)>"
  	echo " -package       <local package configuration file>"
! 	echo " -ffdir         <ffi include directory, contains 'HsFFI.h'>"
! 	echo " -htoolkit      <HToolkit sources directory>"
  	echo " -haddock       <haddock documentation tool>"
  	echo " -haddock-libs  <haddock library directory>"
--- 36,40 ----
  	echo " -hcpkg         <package compiler (= ghc-pkg)>"
  	echo " -package       <local package configuration file>"
! 	echo " -incdir        <ffi include directory, contains 'HsFFI.h'>"
  	echo " -haddock       <haddock documentation tool>"
  	echo " -haddock-libs  <haddock library directory>"
***************
*** 127,133 ****
  version="`$hc --numeric-version`"
  case $version in
!   0* | 1* |  2* |  3* |  4* |  5.00* |  5.01* |  5.02* |  5.03* |  5.04 |  5.04.0 |  5.04.1) echo "WARNING:"
  	  echo " you seem to have an older ghc installed, namely $version"
!           echo " ghc versions prior to 5.04.2 have gc bugs that make port applications *crash*."
  	  echo "";;
    5.04.*) ;;
--- 126,132 ----
  version="`$hc --numeric-version`"
  case $version in
!   0* | 1* |  2* |  3* |  4* |  5*) echo "WARNING:"
  	  echo " you seem to have an older ghc installed, namely $version"
!           echo " ghc versions prior to 6.0 are not supported"
  	  echo "";;
    5.04.*) ;;
***************
*** 136,140 ****
    *)	 echo "warning:"
  	 echo " unable to recognise the ghc version ($version ?)"
-          echo " ghc versions prior to 5.04.2 have gc bugs that make port applications crash."
  	 echo "";;
  esac
--- 135,138 ----
***************
*** 196,208 ****
      hdocdir="`which $hdoc | sed -e 's|/bin/haddock||' -e 's|.exe||'`"
    fi
! 
!   # just for windows: haddock doesn't like /home
!   case "$hdocdir" in
!     /home*)  if test ! -z "$HOMEDRIVE"; then
! 	       hdocdir="`echo $hdocdir | sed -e 's|/home||'`"
! 	       hdocdir="$HOMEDRIVE$hdocdir"
! 	     fi;;
!   esac
! 
  
    if test -z "$hdoclibs"; then
--- 194,199 ----
      hdocdir="`which $hdoc | sed -e 's|/bin/haddock||' -e 's|.exe||'`"
    fi
!   
!   hdocdir="`echo $hdocdir | sed -e 's%^/cygdrive/\(.\)/%\1:/%'`"
  
    if test -z "$hdoclibs"; then
***************
*** 334,342 ****
  
  # Determine top-level directory
! curdir="`pwd`"
  
  # create list of extra include directories needed, comma seperated and quoted.
  # expects $cincflags to be in the form: -Idir1 -Idir2 ...
! incdirs=\"$curdir/src/include\"
  incopts=""
  for flag in $cincflags; do
--- 325,334 ----
  
  # Determine top-level directory
! curdir="`echo $(pwd) | sed -e 's%^/cygdrive/\(.\)/%\1:/%'`"
! 
  
  # create list of extra include directories needed, comma seperated and quoted.
  # expects $cincflags to be in the form: -Idir1 -Idir2 ...
! incdirs=""
  incopts=""
  for flag in $cincflags; do
***************
*** 347,368 ****
  done
  
- # just for windows: ghc-pkg doesn't like /home
- case "$curdir" in
-   /home*)  if test ! -z "$HOMEDRIVE"; then
- 	     curdir="`echo $curdir | sed -e 's|/home||'`"
- 	     curdir="$HOMEDRIVE$curdir"
- 	   fi;;
- esac
- 
  # Create directories
  echo "creating output directories:"
  echo " - config"
  mkdir -p config
- echo " - build/Port"
- mkdir -p build build/Port 
  echo " - build/cbits/$target"
  mkdir -p build/cbits build/cbits/$target
! echo " - imports/Graphics/UI/Port"
! mkdir -p imports imports/Graphics imports/Graphics/UI imports/Graphics/UI/Port 
  
  # Finish generated files
--- 339,350 ----
  done
  
  # Create directories
  echo "creating output directories:"
  echo " - config"
  mkdir -p config
  echo " - build/cbits/$target"
  mkdir -p build/cbits build/cbits/$target
! echo " - build/Graphics/UI/Port"
! mkdir -p build build/Graphics build/Graphics/UI build/Graphics/UI/Port 
  
  # Finish generated files

Index: makefile
===================================================================
RCS file: /cvsroot/htoolkit/port/makefile,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** makefile	16 Jul 2003 22:11:06 -0000	1.24
--- makefile	17 Jul 2003 17:34:25 -0000	1.25
***************
*** 67,71 ****
  # library and doc output
  BUILDDIR  = build
- IMPORTDIR = imports
  DOCDIR	  = doc
  
--- 67,70 ----
***************
*** 75,79 ****
  
  # object files output
! HOUTDIR	    = $(BUILDDIR)
  COUTDIR	    = $(BUILDDIR)/cbits/$(GUILIB)
  
--- 74,78 ----
  
  # object files output
! HOUTDIR	    = $(BUILDDIR)/Graphics/UI
  COUTDIR	    = $(BUILDDIR)/cbits/$(GUILIB)
  
***************
*** 115,119 ****
  
  # main, object files, dependencies and hi files
! MAINLIB	    = libHS$(MAIN).a
  MAINOBJ	    = HS$(MAIN).o
  
--- 114,118 ----
  
  # main, object files, dependencies and hi files
! MAINLIB	    = $(BUILDDIR)/libHS$(MAIN).a
  MAINOBJ	    = HS$(MAIN).o
  
***************
*** 144,153 ****
  	install -d $(LIBDIR)/imports/Graphics/UI/Port
  	install -d $(LIBDIR)/include/port
  	install -m 644 src/include/HsPort.h $(LIBDIR)/include/port
! 	install -m 644 imports/Graphics/UI/*.hi $(LIBDIR)/imports/Graphics/UI
! 	install -m 644 imports/Graphics/UI/Port/*.hi $(LIBDIR)/imports/Graphics/UI/Port
! 	install -m 644 $(MAINLIB) $(LIBDIR)/$(MAINLIB)
  	install -m 644 src/include/HsPort.h $(LIBDIR)/include
  	install -m 644 src/include/*.h $(LIBDIR)/include/port
  	$(RM) $(LIBDIR)/include/port/HsPort.h
  	$(RM) $(LIBDIR)/$(MAINOBJ)
--- 143,154 ----
  	install -d $(LIBDIR)/imports/Graphics/UI/Port
  	install -d $(LIBDIR)/include/port
+ 	install -d $(LIBDIR)/doc/html/port
  	install -m 644 src/include/HsPort.h $(LIBDIR)/include/port
! 	install -m 644 $(HOUTDIR)/*.hi $(LIBDIR)/imports/Graphics/UI
! 	install -m 644 $(HOUTDIR)/Port/*.hi $(LIBDIR)/imports/Graphics/UI/Port
! 	install -m 644 $(MAINLIB) $(LIBDIR)
  	install -m 644 src/include/HsPort.h $(LIBDIR)/include
  	install -m 644 src/include/*.h $(LIBDIR)/include/port
+ 	install -m 644 doc/*.html doc/*.css doc/*.gif doc/*.haddock $(LIBDIR)/doc/html/port
  	$(RM) $(LIBDIR)/include/port/HsPort.h
  	$(RM) $(LIBDIR)/$(MAINOBJ)
***************
*** 168,172 ****
  
  $(HOBJS): $(HOUTDIR)/%.o: %.hs
! 	$(HC) -o $@ -package-name port -ohi $(IMPORTDIR)/Graphics/UI/$(*D)/$(*F).hi -odir $(HOUTDIR)/$(*D) -c $<  $(HC-OPTIONS) $($(*F)_OPTIONS) -i$(IMPORTDIR) $(INCDIRS)
  	@# move stub files
  	@-if test -f $(<D)/$(*F)_stub.h; then $(MV) $(<D)/$(*F)_stub.[ch] $(HOUTDIR)/$(*D); fi   
--- 169,173 ----
  
  $(HOBJS): $(HOUTDIR)/%.o: %.hs
! 	$(HC) -o $@ -package-name port -ohi $(BUILDDIR)/Graphics/UI/$(*D)/$(*F).hi -odir $(HOUTDIR)/$(*D) -c $<  $(HC-OPTIONS) $($(*F)_OPTIONS) -i$(BUILDDIR) $(INCDIRS)
  	@# move stub files
  	@-if test -f $(<D)/$(*F)_stub.h; then $(MV) $(<D)/$(*F)_stub.[ch] $(HOUTDIR)/$(*D); fi   
***************
*** 222,242 ****
  
  # extra commands: clean up all directories and show linecounts.
! clean:	cleanLIB cleanDOC cleanHS cleanC 
! 
! cleanLIB:
  	$(RM) $(MAINLIB)
! 	$(RM) $(MAINOBJ)
! 
! cleanHS:
! 	@# clean up HOUTDIR
  	$(RM) $(HOUTDIR)/*.*
  	$(RM) $(HOUTDIR)/Port/*.*
- 
- cleanC:
  	$(RM) $(COUTDIR)/*.*
! 
! cleanDOC:
! 	$(RM) $(DOCDIR)/*.html $(DOCDIR)/*.gif $(DOCDIR)/*.css
! 	$(RM) $(DOCFILE)
  		
  # documentation
--- 223,235 ----
  
  # extra commands: clean up all directories and show linecounts.
! clean:
  	$(RM) $(MAINLIB)
! 	$(RM) $(DOCDIR)/*.html $(DOCDIR)/*.gif $(DOCDIR)/*.css $(DOCDIR)/*.haddock
  	$(RM) $(HOUTDIR)/*.*
  	$(RM) $(HOUTDIR)/Port/*.*
  	$(RM) $(COUTDIR)/*.*
! 	$(RMDIR) $(HOUTDIR)
! 	$(RMDIR) $(HOUTDIR)/Port
! 	$(RMDIR) $(COUTDIR)
  		
  # documentation

[htoolkit-cvs] gio configure,1.4,1.5 makefile,1.11,1.12

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

Update of /cvsroot/htoolkit/gio
In directory sc8-pr-cvs1:/tmp/cvs-serv13801/gio

Modified Files:
	configure makefile 
Log Message:
better configure/makefile scripts for Windows


Index: configure
===================================================================
RCS file: /cvsroot/htoolkit/gio/configure,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** configure	16 Jul 2003 22:27:09 -0000	1.4
--- configure	17 Jul 2003 17:34:25 -0000	1.5
***************
*** 62,75 ****
  
  # get current directory
! curdir="`pwd`"
! 
! # just for windows: ghc-pkg doesn't like /home
! case "$curdir" in
!   /home*)  if test ! -z "$HOMEDRIVE"; then
! 	     curdir="`echo $curdir | sed -e 's|/home||'`"
! 	     curdir="$HOMEDRIVE$curdir"
! 	   fi;;
! esac
! 
  
  # Do we have ghc?
--- 62,66 ----
  
  # get current directory
! curdir="`echo $(pwd) | sed -e 's%^/cygdrive/\(.\)/%\1:/%'`"
  
  # Do we have ghc?
***************
*** 92,100 ****
  
  # check ghc version
! version="`$hc --version | sed -e 's|[A-Za-z \t,]*||'`"
  case $version in
!   0* | 1* |  2* |  3* |  4* |  5.00* |  5.01* |  5.02* |  5.03* |  5.04 |  5.04.0 |  5.04.1) echo "WARNING:"
  	  echo " you seem to have an older ghc installed, namely $version"
!           echo " ghc versions prior to 5.04.2 have gc bugs that make GIO applications *crash*."
  	  echo "";;
    5.04.*) ;;
--- 83,91 ----
  
  # check ghc version
! version="`$hc --numeric-version`"
  case $version in
!   0* | 1* |  2* |  3* |  4* |  5*) echo "WARNING:"
  	  echo " you seem to have an older ghc installed, namely $version"
!           echo " ghc versions prior to 6.0 are not supported"
  	  echo "";;
    5.04.*) ;;
***************
*** 103,107 ****
    *)	 echo "warning:"
  	 echo " unable to recognise the ghc version ($version ?)"
-          echo " be careful: ghc versions prior to 5.04.2 have gc bugs that make GIO applications crash."
  	 echo "";;  
  esac
--- 94,97 ----
***************
*** 152,163 ****
      hdocdir="`which $hdoc | sed -e 's|/bin/haddock||' -e 's|.exe||'`"
    fi
! 
!   # just for windows: haddock doesn't like /home
!   case "$hdocdir" in
!     /home*)  if test ! -z "$HOMEDRIVE"; then
! 	       hdocdir="`echo $hdocdir | sed -e 's|/home||'`"
! 	       hdocdir="$HOMEDRIVE$hdocdir"
! 	     fi;;
!   esac
  
    if test -z "$hdoclibs"; then
--- 142,147 ----
      hdocdir="`which $hdoc | sed -e 's|/bin/haddock||' -e 's|.exe||'`"
    fi
!   
!   hdocdir="`echo $hdocdir | sed -e 's%^/cygdrive/\(.\)/%\1:/%'`"
  
    if test -z "$hdoclibs"; then
***************
*** 242,252 ****
  fi
  if test ! -z "$portdir"; then
!  echo "PORTDIR=$portdir"  >> config/config.mk
  fi
  if test ! -z "$libdir"; then
   echo "LIBDIR=$libdir"  >> config/config.mk
  fi
! echo ""			 >> config/config.mk
! echo "TOPDIR=$curdir"    >> config/config.mk
  echo ""			>> config/config.mk
  echo "AR=ar"            >> config/config.mk
--- 226,236 ----
  fi
  if test ! -z "$portdir"; then
!  echo "PORTDIR=$portdir" >> config/config.mk
  fi
  if test ! -z "$libdir"; then
   echo "LIBDIR=$libdir"  >> config/config.mk
  fi
! echo ""			>> config/config.mk
! echo "TOPDIR=$curdir"   >> config/config.mk
  echo ""			>> config/config.mk
  echo "AR=ar"            >> config/config.mk

Index: makefile
===================================================================
RCS file: /cvsroot/htoolkit/gio/makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** makefile	16 Jul 2003 22:27:09 -0000	1.11
--- makefile	17 Jul 2003 17:34:25 -0000	1.12
***************
*** 79,83 ****
  
  ifdef PORTDIR
! HDOC-PORT	= -ihttp://htoolkit.sourceforge.net/doc/port,$(PORTDIR)/doc/port.haddock
  HDOC-PORT-TYPES = $(PORTDIR)/src/Port/Types.hs $(PORTDIR)/src/Port/Font.hs
  endif
--- 79,83 ----
  
  ifdef PORTDIR
! HDOC-PORT	= -ihttp://htoolkit.sourceforge.net/doc/port,$(LIBDIR)/doc/html/port/port.haddock
  HDOC-PORT-TYPES = $(PORTDIR)/src/Port/Types.hs $(PORTDIR)/src/Port/Font.hs
  endif
***************
*** 121,127 ****
  install: $(MAINLIB) $(PKG)
  	install -d $(LIBDIR)/imports/Graphics/UI/GIO
! 	install -m 644 build/Graphics/UI/*.hi $(LIBDIR)/imports/Graphics/UI
! 	install -m 644 build/Graphics/UI/GIO/*.hi $(LIBDIR)/imports/Graphics/UI/GIO
  	install -m 644 $(MAINLIB) $(LIBDIR)
  	$(RM) $(LIBDIR)/$(MAINOBJ)
  	$(HCPKG) -u -g -i $(PKG)
--- 121,129 ----
  install: $(MAINLIB) $(PKG)
  	install -d $(LIBDIR)/imports/Graphics/UI/GIO
! 	install -d $(LIBDIR)/doc/html/gio
! 	install -m 644 $(HOUTDIR)/*.hi $(LIBDIR)/imports/Graphics/UI
! 	install -m 644 $(HOUTDIR)/GIO/*.hi $(LIBDIR)/imports/Graphics/UI/GIO
  	install -m 644 $(MAINLIB) $(LIBDIR)
+ 	install -m 644 doc/*.html doc/*.css doc/*.gif doc/*.haddock $(LIBDIR)/doc/html/gio
  	$(RM) $(LIBDIR)/$(MAINOBJ)
  	$(HCPKG) -u -g -i $(PKG)
***************
*** 158,176 ****
  # EXTRA RULES: clean doc
  #--------------------------------------------------------------------------
! clean:	cleanDOC cleanLIB cleanHS 
! 
! cleanHS:
! 	@# clean up HOUTDIR
! 	$(RM) $(BUILDDIR)/*
! 	$(RM) $(BUILDDIR)/Graphics/UI/*
! 	$(RM) $(BUILDDIR)/Graphics/UI/GIO/*
! 
! cleanLIB:
  	$(RM) $(MAINLIB)
! 	$(RM) $(MAINOBJ)
! 
! cleanDOC:
! 	$(RM) $(DOCDIR)/*.html $(DOCDIR)/*.gif $(DOCDIR)/*.css
! 	$(RM) $(DOCFILE)
  		
  # documentation
--- 160,168 ----
  # EXTRA RULES: clean doc
  #--------------------------------------------------------------------------
! clean:
  	$(RM) $(MAINLIB)
! 	$(RM) $(DOCDIR)/*.html $(DOCDIR)/*.gif $(DOCDIR)/*.css $(DOCDIR)/*.haddock
! 	$(RM) $(HOUTDIR)/*.*
! 	$(RM) $(HOUTDIR)/GIO/*.*
  		
  # documentation

[htoolkit-cvs] port install.txt,1.2,1.3

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

Update of /cvsroot/htoolkit/port
In directory sc8-pr-cvs1:/tmp/cvs-serv13685/port

Modified Files:
	install.txt 
Log Message:
fix comments


Index: install.txt
===================================================================
RCS file: /cvsroot/htoolkit/port/install.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** install.txt	26 Jan 2003 16:09:03 -0000	1.2
--- install.txt	17 Jul 2003 17:33:22 -0000	1.3
***************
*** 2,6 ****
   Port: the portable haskell GUI abstraction.
   
!  Krasimir Angelov & Daan Leijen
  -------------------------------------------------------------------------
  
--- 2,6 ----
   Port: the portable haskell GUI abstraction.
   
!  Krasimir Angelov
  -------------------------------------------------------------------------
  
***************
*** 10,17 ****
  > make
  
! After this, the port package can be loaded with the -package option.
! 
! > ghci MyApp.hs  -package port
  
  
  Notes:
--- 10,16 ----
  > make
  
! Install
  
+ > make install
  
  Notes:
***************
*** 19,21 ****
  *) You should build the package on windows from the bash shell.
  
! *) Use ghc version 5.04.2 or higher. (previous version have bugs).
--- 18,20 ----
  *) You should build the package on windows from the bash shell.
  
! *) Use ghc version 6.0 or higher.

[htoolkit-cvs] port/src/include Types.h,1.14,1.15

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

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

Modified Files:
	Types.h 
Log Message:
The #include for config.h should use "" instead of <>.


Index: Types.h
===================================================================
RCS file: /cvsroot/htoolkit/port/src/include/Types.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Types.h	8 Jul 2003 21:18:07 -0000	1.14
--- Types.h	17 Jul 2003 17:32:23 -0000	1.15
***************
*** 2,6 ****
  #define TYPES_H
  
! #include <config.h>
  #include <stdio.h>
  #include <stdlib.h>
--- 2,6 ----
  #define TYPES_H
  
! #include "config.h"
  #include <stdio.h>
  #include <stdlib.h>

[htoolkit-cvs] port/src/Port ConfigKey.hs,1.1,1.2

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

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

Modified Files:
	ConfigKey.hs 
Log Message:
Add -#include pragma


Index: ConfigKey.hs
===================================================================
RCS file: /cvsroot/htoolkit/port/src/Port/ConfigKey.hs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ConfigKey.hs	4 Jul 2003 17:39:04 -0000	1.1
--- ConfigKey.hs	16 Jul 2003 22:49:14 -0000	1.2
***************
*** 1,3 ****
! {-# OPTIONS -fglasgow-exts #-}
  -----------------------------------------------------------------------------------------
  {-| Module      :  ConfigKey
--- 1,3 ----
! {-# OPTIONS -fglasgow-exts -#include ConfigKey.h #-}
  -----------------------------------------------------------------------------------------
  {-| Module      :  ConfigKey

[htoolkit-cvs] gio configure,1.3,1.4 makefile,1.10,1.11

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

Update of /cvsroot/htoolkit/gio
In directory sc8-pr-cvs1:/tmp/cvs-serv2028

Modified Files:
	configure makefile 
Log Message:
better configure/make stripts


Index: configure
===================================================================
RCS file: /cvsroot/htoolkit/gio/configure,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** configure	8 Jun 2003 19:42:12 -0000	1.3
--- configure	16 Jul 2003 22:27:09 -0000	1.4
***************
*** 6,10 ****
  #  Daan Leijen.
  #
! #  Copyright 2001, Daan Leijen. 
  #------------------------------------------------------------------------
  
--- 6,10 ----
  #  Daan Leijen.
  #
! #  Copyright 2001, Daan Leijen.
  #------------------------------------------------------------------------
  
***************
*** 20,23 ****
--- 20,24 ----
  hdochtml=""
  portdir=""
+ libdir=""
  
  # Parse command-line arguments
***************
*** 106,109 ****
--- 107,111 ----
  esac
  
+ libdir="`$hc --print-libdir`"
  
  # Do we have ghc-pkg?
***************
*** 214,219 ****
  echo " - config"
  mkdir -p config
! echo " - imports/Graphics/UI/GIO"
! mkdir -p imports imports/Graphics imports/Graphics/UI imports/Graphics/UI/GIO 
  
  # Finish generated files
--- 216,221 ----
  echo " - config"
  mkdir -p config
! echo " - build/Graphics/UI/GIO"
! mkdir -p build build/Graphics build/Graphics/UI build/Graphics/UI/GIO
  
  # Finish generated files
***************
*** 242,245 ****
--- 244,250 ----
   echo "PORTDIR=$portdir"  >> config/config.mk
  fi
+ if test ! -z "$libdir"; then
+  echo "LIBDIR=$libdir"  >> config/config.mk
+ fi
  echo ""			 >> config/config.mk
  echo "TOPDIR=$curdir"    >> config/config.mk
***************
*** 258,264 ****
  echo "  { name=\"gio\""				>> config/gio.pkg
  echo "  , auto=True"				>> config/gio.pkg
! echo "  , import_dirs=[\"$curdir/imports\"]"	>> config/gio.pkg
! echo "  , library_dirs=[\"$curdir/imports\"]"	>> config/gio.pkg
! echo "  , hs_libraries=[\"gio\"]"		>> config/gio.pkg
  echo "  , package_deps=[\"port\"]"		>> config/gio.pkg
  echo "  }"					>> config/gio.pkg
--- 263,269 ----
  echo "  { name=\"gio\""				>> config/gio.pkg
  echo "  , auto=True"				>> config/gio.pkg
! echo "  , import_dirs=[\"\$libdir/imports\"]"	>> config/gio.pkg
! echo "  , library_dirs=[\"$libdir\"]"	>> config/gio.pkg
! echo "  , hs_libraries=[\"HSgio\"]"		>> config/gio.pkg
  echo "  , package_deps=[\"port\"]"		>> config/gio.pkg
  echo "  }"					>> config/gio.pkg

Index: makefile
===================================================================
RCS file: /cvsroot/htoolkit/gio/makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** makefile	8 Jul 2003 20:36:26 -0000	1.10
--- makefile	16 Jul 2003 22:27:09 -0000	1.11
***************
*** 39,43 ****
  	   GIO/ToolBar.hs \
  	   GIO.hs \
! 	   
  
  HPATH	= Graphics/UI
--- 39,43 ----
  	   GIO/ToolBar.hs \
  	   GIO.hs \
! 
  
  HPATH	= Graphics/UI
***************
*** 48,56 ****
  PKG	    = config/$(MAIN).pkg
  
! IMPORTSDIR  = imports
  DOCDIR	    = doc
  SRCDIR	    = src
  
! HOUTDIR	    = $(IMPORTSDIR)/$(HPATH)
  HSRCDIR	    = $(SRCDIR)/$(HPATH)
  
--- 48,56 ----
  PKG	    = config/$(MAIN).pkg
  
! BUILDDIR     = build
  DOCDIR	    = doc
  SRCDIR	    = src
  
! HOUTDIR	    = $(BUILDDIR)/$(HPATH)
  HSRCDIR	    = $(SRCDIR)/$(HPATH)
  
***************
*** 65,69 ****
  
  # options
! HC-OPTIONS	= -package port # -O2
  
  # haddock
--- 65,69 ----
  
  # options
! HC-OPTIONS	= -package port -O2
  
  # haddock
***************
*** 94,107 ****
  
  # the source directories
! SRCDIRS	= $(HSRCDIRS) 
  VPATH   = $(SRCDIRS)
  
  # main, object files, dependencies and hi files
! MAINLIB	    = $(IMPORTSDIR)/lib$(MAIN).a
! MAINOBJ	    = $(IMPORTSDIR)/$(MAIN).o
  
! HOBJS	    = $(patsubst %.hs,$(HOUTDIR)/%.o, $(HSOURCES))  
! HDEPS       = $(patsubst %.hs,$(HOUTDIR)/%.d, $(HSOURCES))  
! HHIS	    = $(patsubst %.hs,$(HOUTDIR)/%.hi, $(HSOURCES))  
  
  
--- 94,107 ----
  
  # the source directories
! SRCDIRS	= $(HSRCDIRS)
  VPATH   = $(SRCDIRS)
  
  # main, object files, dependencies and hi files
! MAINLIB	    = $(BUILDDIR)/libHS$(MAIN).a
! MAINOBJ	    = $(BUILDDIR)/HS$(MAIN).o
  
! HOBJS	    = $(patsubst %.hs,$(HOUTDIR)/%.o, $(HSOURCES))
! HDEPS       = $(patsubst %.hs,$(HOUTDIR)/%.d, $(HSOURCES))
! HHIS	    = $(patsubst %.hs,$(HOUTDIR)/%.hi, $(HSOURCES))
  
  
***************
*** 111,125 ****
  
  # The main targets
! .PHONY: all release 
  
  all: release doc
  
  # release and debug versions
! release:  $(MAINOBJ)
  
  # build a library
! $(MAINOBJ): $(MAINLIB) $(PKG)
! 	  $(RM) $(MAINOBJ)
! 	  $(HCPKG) -u -g -i $(PKG)
  
  $(MAINLIB): $(HOBJS) $(COBJS) $(STUBSTUBOBJS)
--- 111,129 ----
  
  # The main targets
! .PHONY: all release
  
  all: release doc
  
  # release and debug versions
! release:  $(MAINLIB)
  
  # build a library
! install: $(MAINLIB) $(PKG)
! 	install -d $(LIBDIR)/imports/Graphics/UI/GIO
! 	install -m 644 build/Graphics/UI/*.hi $(LIBDIR)/imports/Graphics/UI
! 	install -m 644 build/Graphics/UI/GIO/*.hi $(LIBDIR)/imports/Graphics/UI/GIO
! 	install -m 644 $(MAINLIB) $(LIBDIR)
! 	$(RM) $(LIBDIR)/$(MAINOBJ)
! 	$(HCPKG) -u -g -i $(PKG)
  
  $(MAINLIB): $(HOBJS) $(COBJS) $(STUBSTUBOBJS)
***************
*** 136,142 ****
  
  $(HOBJS): $(HOUTDIR)/%.o: %.hs
! 	$(HC) -o $@ -package-name gio -ohi $(subst .o,.hi,$@) -odir $(HOUTDIR)/$(*D) -c $<  $(HC-OPTIONS) -i$(IMPORTSDIR) $(INCDIRS) 
  	@# create dependency file
! 	@$(HC) $< $(HC-OPTIONS) -M -optdep-f -optdep$(*F).d -i$(IMPORTSDIR)               
  	@sed -e 's|$(subst .hs,,$<)\.o|$(HOUTDIR)/$*\.o|' $(*F).d > $(HOUTDIR)/$*.d
  	@rm $(*F).d
--- 140,146 ----
  
  $(HOBJS): $(HOUTDIR)/%.o: %.hs
! 	$(HC) -o $@ -package-name gio -ohi $(subst .o,.hi,$@) -odir $(HOUTDIR)/$(*D) -c $<  $(HC-OPTIONS) -i$(BUILDDIR) $(INCDIRS)
  	@# create dependency file
! 	@$(HC) $< $(HC-OPTIONS) -M -optdep-f -optdep$(*F).d -i$(BUILDDIR)
  	@sed -e 's|$(subst .hs,,$<)\.o|$(HOUTDIR)/$*\.o|' $(*F).d > $(HOUTDIR)/$*.d
  	@rm $(*F).d
***************
*** 158,163 ****
  cleanHS:
  	@# clean up HOUTDIR
! 	$(RM) $(HOUTDIR)/*.*
! 	$(RM) $(HOUTDIR)/GIO/*.*
  
  cleanLIB:
--- 162,168 ----
  cleanHS:
  	@# clean up HOUTDIR
! 	$(RM) $(BUILDDIR)/*
! 	$(RM) $(BUILDDIR)/Graphics/UI/*
! 	$(RM) $(BUILDDIR)/Graphics/UI/GIO/*
  
  cleanLIB:

[htoolkit-cvs] gio/src/Graphics/UI/GIO Events.hs,1.12,1.13

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

Update of /cvsroot/htoolkit/gio/src/Graphics/UI/GIO
In directory sc8-pr-cvs1:/tmp/cvs-serv1844/src/Graphics/UI/GIO

Modified Files:
	Events.hs 
Log Message:
Remove enter i leave events


Index: Events.hs
===================================================================
RCS file: /cvsroot/htoolkit/gio/src/Graphics/UI/GIO/Events.hs,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Events.hs	23 Apr 2003 21:48:47 -0000	1.12
--- Events.hs	16 Jul 2003 22:25:43 -0000	1.13
***************
*** 90,112 ****
               -- * Event filters
               -- ** Mouse filters
!              , enter, leave, motion, drag
               , click, unclick, doubleClick
               , clickRight, unclickRight
  
!              -- * Keyboard event filters            
               , anyKey, key, charKey
               , enterKey,tabKey,escKey,helpKey
!              , delKey,homeKey,endKey 
               , pgupKey,pgdownKey
!              , downKey,upKey,leftKey,rightKey 
!              
               -- * Internal
               -- ** Standard events
!              -- *** Forms             
               , newActivateEvent
               , newDeactivateEvent
               , newScrollEvent
               , newResizeEvent
!              -- *** Reactive             
               , newMouseEvent
               , newKeyboardEvent
--- 90,112 ----
               -- * Event filters
               -- ** Mouse filters
!              , motion, drag
               , click, unclick, doubleClick
               , clickRight, unclickRight
  
!              -- * Keyboard event filters
               , anyKey, key, charKey
               , enterKey,tabKey,escKey,helpKey
!              , delKey,homeKey,endKey
               , pgupKey,pgdownKey
!              , downKey,upKey,leftKey,rightKey
! 
               -- * Internal
               -- ** Standard events
!              -- *** Forms
               , newActivateEvent
               , newDeactivateEvent
               , newScrollEvent
               , newResizeEvent
!              -- *** Reactive
               , newMouseEvent
               , newKeyboardEvent
***************
*** 257,274 ****
      filter (MouseRightUp point mod)  = noneDown mod  
      filter other                     = False
- 
- enter :: Reactive w => Event w (Point -> IO ())
- enter
-   = mouseFilter "enter" filter
-   where
-     filter (MouseEnter point mod)  = noneDown mod  
-     filter other                   = False
- 
- leave :: Reactive w => Event w (Point -> IO ())
- leave
-   = mouseFilter "leave" filter
-   where
-     filter (MouseLeave point mod)  = noneDown mod  
-     filter other                   = False
  
  mouseFilter :: Reactive w => String -> (MouseEvent -> Bool) -> Event w (Point -> IO ())
--- 257,260 ----

[htoolkit-cvs] gio/src/examples/worm Main.hs,1.6,1.7

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

Update of /cvsroot/htoolkit/gio/src/examples/worm
In directory sc8-pr-cvs1:/tmp/cvs-serv1279

Modified Files:
	Main.hs 
Log Message:
Set resizeable flag for the window


Index: Main.hs
===================================================================
RCS file: /cvsroot/htoolkit/gio/src/examples/worm/Main.hs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Main.hs	13 Jul 2003 08:15:41 -0000	1.6
--- Main.hs	16 Jul 2003 22:22:00 -0000	1.7
***************
*** 62,65 ****
--- 62,66 ----
                  , on paint   =: onPaint ref
                  , on dismiss =: halt
+ 		, resizeable =: False
                  ]
  
***************
*** 69,75 ****
  
      set mplay [on command =: onPlay ref mnew mopts mplay mexit tm w]
!     set mnew [on command =: onNew ref w >> set w [resizeable =: False]]
! 
!     --set w [resizeable =: False]
  
  onPaint ref can _ _ = do
--- 70,74 ----
  
      set mplay [on command =: onPlay ref mnew mopts mplay mexit tm w]
!     set mnew [on command =: onNew ref w]
  
  onPaint ref can _ _ = do

[htoolkit-cvs] port/src/include HsPort.h,1.5,1.6

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

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

Modified Files:
	HsPort.h 
Log Message:
better configure/make scripts


Index: HsPort.h
===================================================================
RCS file: /cvsroot/htoolkit/port/src/include/HsPort.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** HsPort.h	4 Jul 2003 17:39:05 -0000	1.5
--- HsPort.h	16 Jul 2003 22:11:06 -0000	1.6
***************
*** 1,19 ****
! # define Win32_TARGET
! 
! #include "Types.h"
! #include "Window.h"
! #include "Timer.h"
! #include "RadioBox.h"
! #include "CheckBox.h"
! #include "ListBox.h"
! #include "EditBox.h"
! #include "PopUp.h"
! #include "Button.h"
! #include "Label.h"
! #include "Menu.h"
! #include "Font.h"
! #include "Canvas.h"
! #include "Bitmap.h"
! #include "CommonDialogs.h"
! #include "Message.h"
! #include "ConfigKey.h"
--- 1,22 ----
! # define Win32_TARGET
! 
! #include "port/Types.h"
! #include "port/Window.h"
! #include "port/Timer.h"
! #include "port/RadioBox.h"
! #include "port/CheckBox.h"
! #include "port/ListBox.h"
! #include "port/EditBox.h"
! #include "port/PopUp.h"
! #include "port/Button.h"
! #include "port/Label.h"
! #include "port/ProgressBar.h"
! #include "port/Slider.h"
! #include "port/Menu.h"
! #include "port/ToolBar.h"
! #include "port/Font.h"
! #include "port/Canvas.h"
! #include "port/Bitmap.h"
! #include "port/CommonDialogs.h"
! #include "port/Message.h"
! #include "port/ConfigKey.h"