[htoolkit-cvs] gio/src/Graphics/UI/GIO Canvas.hs,1.13,1.14 Controls.hs,1.25,1.26 Font.hs,1.2,1.3 Types.hs,1.16,1.17 Window.hs,1.24,1.25

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

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

Modified Files:
	Canvas.hs Controls.hs Font.hs Types.hs Window.hs 
Log Message:
The new defaultFontDef function now returns the default font which is specified
in Windows. The defaultPen function is renamed to windowPen and now the window
and dialog pens have colors whichs are given from Windows settings.


Index: Canvas.hs
===================================================================
RCS file: /cvsroot/htoolkit/gio/src/Graphics/UI/GIO/Canvas.hs,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Canvas.hs	8 Jun 2003 19:42:13 -0000	1.13
--- Canvas.hs	24 Aug 2003 19:02:45 -0000	1.14
***************
*** 73,77 ****
  
  import qualified Graphics.UI.Port as Port
! import Graphics.UI.Port( Pen(..), defaultPen )
  import Graphics.UI.GIO.Types
  import Graphics.UI.GIO.Attributes
--- 73,77 ----
  
  import qualified Graphics.UI.Port as Port
! import Graphics.UI.Port( Pen(..) )
  import Graphics.UI.GIO.Types
  import Graphics.UI.GIO.Attributes
***************
*** 111,115 ****
  -- | The font metrics (read-only). 
  --
! -- > do metrics <- get canvas (fontMetrics dialogFont)
  --
  fontMetrics :: Font -> Attr Canvas FontMetrics
--- 111,115 ----
  -- | The font metrics (read-only). 
  --
! -- > do metrics <- get canvas (fontMetrics defaultFont)
  --
  fontMetrics :: Font -> Attr Canvas FontMetrics

Index: Controls.hs
===================================================================
RCS file: /cvsroot/htoolkit/gio/src/Graphics/UI/GIO/Controls.hs,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** Controls.hs	24 Aug 2003 16:48:48 -0000	1.25
--- Controls.hs	24 Aug 2003 19:02:45 -0000	1.26
***************
*** 598,602 ****
                 vlayout    <- newVar empty
                 vdomain    <- newVar (sz 0 0)
!                vpen       <- newVar defaultPen
                 vbufferMode<- newVar UnBuffered
                 return (CompoundControl cchandle (hwindow w) vdomain vautosize vpen vbufferMode vpaint vlayout)
--- 598,602 ----
                 vlayout    <- newVar empty
                 vdomain    <- newVar (sz 0 0)
!                vpen       <- newVar windowPen
                 vbufferMode<- newVar UnBuffered
                 return (CompoundControl cchandle (hwindow w) vdomain vautosize vpen vbufferMode vpaint vlayout)

Index: Font.hs
===================================================================
RCS file: /cvsroot/htoolkit/gio/src/Graphics/UI/GIO/Font.hs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Font.hs	1 Jun 2003 09:42:31 -0000	1.2
--- Font.hs	24 Aug 2003 19:02:45 -0000	1.3
***************
*** 16,20 ****
                  createFont
                , defaultFont
-               , dialogFont
               
                -- * Enumerate
--- 16,19 ----
***************
*** 23,27 ****
                -- * Standard font definitions.
                , defaultFontDef
-               , dialogFontDef
                , serifFontDef
                , sansSerifFontDef
--- 22,25 ----

Index: Types.hs
===================================================================
RCS file: /cvsroot/htoolkit/gio/src/Graphics/UI/GIO/Types.hs,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Types.hs	23 Aug 2003 18:03:57 -0000	1.16
--- Types.hs	24 Aug 2003 19:02:45 -0000	1.17
***************
*** 85,89 ****
              , LineStyle(..)
              , HatchStyle(..)
!             , Pen(..), defaultPen, dialogPen
  
              -- ** Fonts
--- 85,89 ----
              , LineStyle(..)
              , HatchStyle(..)
!             , Pen(..), windowPen, dialogPen
  
              -- ** Fonts
***************
*** 116,120 ****
  import Graphics.UI.Port.Types
  import Graphics.UI.Port.Colors
! import Graphics.UI.Port.Canvas(Pen(..), defaultPen, dialogPen)
  import Control.Concurrent.MVar
  {--------------------------------------------------------------------
--- 116,120 ----
  import Graphics.UI.Port.Types
  import Graphics.UI.Port.Colors
! import Graphics.UI.Port.Canvas(Pen(..), windowPen, dialogPen)
  import Control.Concurrent.MVar
  {--------------------------------------------------------------------

Index: Window.hs
===================================================================
RCS file: /cvsroot/htoolkit/gio/src/Graphics/UI/GIO/Window.hs,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** Window.hs	23 Aug 2003 00:04:47 -0000	1.24
--- Window.hs	24 Aug 2003 19:02:45 -0000	1.25
***************
*** 38,43 ****
  window :: [Prop Window] -> IO Window
  window props
!   = do w <- Lib.createWindow >>= form defaultPen
!        set w [bgcolor =: white]
         set w props
         Lib.showWindow (hwindow w)
--- 38,42 ----
  window :: [Prop Window] -> IO Window
  window props
!   = do w <- Lib.createWindow >>= form windowPen
         set w props
         Lib.showWindow (hwindow w)