htoolkit-cvs — HToolkit CVS commit messages

[htoolkit-cvs] port/src/include Window.h,1.10,1.11

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

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

Modified Files:
	Window.h 
Log Message:
Make possible to hide/show a window at any time


Index: Window.h
===================================================================
RCS file: /cvsroot/htoolkit/port/src/include/Window.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Window.h	1 Sep 2003 19:55:01 -0000	1.10
--- Window.h	7 Oct 2003 21:31:34 -0000	1.11
***************
*** 73,76 ****
--- 73,78 ----
  void osGetWindowViewSize(WindowHandle window, int *res);
  void osSetWindowViewSize(WindowHandle window, int w, int h);
+ void osSetWindowVisible(WindowHandle window, BOOL visible);
+ BOOL osGetWindowVisible(WindowHandle window);
  void osShowWindow(WindowHandle window);
  void osRunDialog(WindowHandle window);

[htoolkit-cvs] port/src/cbits/GTK Window.c,1.33,1.34

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

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

Modified Files:
	Window.c 
Log Message:
Make possible to hide/show a window at any time


Index: Window.c
===================================================================
RCS file: /cvsroot/htoolkit/port/src/cbits/GTK/Window.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** Window.c	7 Oct 2003 19:44:09 -0000	1.33
--- Window.c	7 Oct 2003 21:31:33 -0000	1.34
***************
*** 182,186 ****
  					  GTK_POLICY_AUTOMATIC,
  					  GTK_POLICY_AUTOMATIC);
- 	gtk_widget_show(sw);
  
  	/* Create a Fixed Container */
--- 182,185 ----
***************
*** 229,232 ****
--- 228,232 ----
  		gClientWidget = sw;
  		gnome_app_set_contents(GNOME_APP(gFrameWidget),sw);
+ 		gtk_widget_hide(sw);
  	}
  
***************
*** 617,625 ****
  }
  
! void osShowWindow(WindowHandle window)
  {
  	GtkWidget *toplevel = gtk_widget_get_toplevel(window);
! 	gtk_widget_show(window);
! 	gtk_widget_show(toplevel);
  };
  
--- 617,639 ----
  }
  
! void osSetWindowVisible(WindowHandle window, BOOL visible)
  {
  	GtkWidget *toplevel = gtk_widget_get_toplevel(window);
! 
! 	if (visible)
! 	{
! 		gtk_widget_show(window);
! 		if (toplevel != gFrameWidget) gtk_widget_show(toplevel);
! 	}
! 	else
! 	{
! 		gtk_widget_hide(window);
! 		if (toplevel != gFrameWidget) gtk_widget_hide(toplevel);
! 	}
! };
! 
! BOOL osGetWindowVisible(WindowHandle window)
! {
! 	return GTK_WIDGET_VISIBLE(window);
  };
  
***************
*** 627,630 ****
--- 641,648 ----
  {
  	GtkWidget *toplevel = gtk_widget_get_toplevel(window);
+ 
+ 	gtk_widget_show(window);
+ 	gtk_widget_show(toplevel);
+ 
  	gtk_window_set_modal(GTK_WINDOW(toplevel), TRUE);
  	gtk_signal_connect (GTK_OBJECT(toplevel), "delete-event",

[htoolkit-cvs] port/src/cbits/Win32 Window.c,1.49,1.50

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

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

Modified Files:
	Window.c 
Log Message:
Make possible to hide/show a window at any time


Index: Window.c
===================================================================
RCS file: /cvsroot/htoolkit/port/src/cbits/Win32/Window.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** Window.c	4 Oct 2003 14:45:06 -0000	1.49
--- Window.c	7 Oct 2003 21:31:34 -0000	1.50
***************
*** 745,749 ****
  				  "HSDIWINDOW",
  				  NULL,
! 				  WS_CHILD | WS_VISIBLE | WS_HSCROLL | WS_VSCROLL,
  				  0,0,rect.right-rect.left,rect.bottom-rect.top,
  				  ghWndFrame,
--- 745,749 ----
  				  "HSDIWINDOW",
  				  NULL,
! 				  WS_CHILD | WS_HSCROLL | WS_VSCROLL,
  				  0,0,rect.right-rect.left,rect.bottom-rect.top,
  				  ghWndFrame,
***************
*** 766,770 ****
  			mdicreate.cx      = 0;
  			mdicreate.cy      = 0;
! 			mdicreate.style   = WS_OVERLAPPEDWINDOW | WS_VISIBLE | WS_HSCROLL | WS_VSCROLL;
  			mdicreate.lParam  = 0;
  
--- 766,770 ----
  			mdicreate.cx      = 0;
  			mdicreate.cy      = 0;
! 			mdicreate.style   = WS_OVERLAPPEDWINDOW | WS_HSCROLL | WS_VSCROLL;
  			mdicreate.lParam  = 0;
  
***************
*** 784,787 ****
--- 784,788 ----
      WORD dlgtemplate[60];
      DWORD lStyle;
+     HWND hDlg;
  
      // start to fill in the dlgtemplate information. Addressing by WORDs
***************
*** 805,811 ****
      s = "MS Sans Serif"; do { *p++ = (WORD) *s; } while (*s++);
  
! 	if (!parent) parent = ghWndFrame;
! 	
!     return CreateDialogIndirectParam (ghModule, (LPCDLGTEMPLATE) dlgtemplate, parent, (DLGPROC) NULL, (LPARAM) 0);
  };
  
--- 806,817 ----
      s = "MS Sans Serif"; do { *p++ = (WORD) *s; } while (*s++);
  
!     if (!parent) parent = ghWndFrame;
! 
!     hDlg = CreateDialogIndirectParam (ghModule, (LPCDLGTEMPLATE) dlgtemplate, parent, (DLGPROC) NULL, (LPARAM) 0);
!     if (!hDlg) return NULL;
! 
!     ShowWindow(hDlg, SW_HIDE);
! 
!     return hDlg;
  };
  
***************
*** 980,986 ****
  }
  
! void osShowWindow(WindowHandle window)
  {
!     ShowWindow(window, SW_SHOW);
  }
  
--- 986,997 ----
  }
  
! void osSetWindowVisible(WindowHandle window, BOOL visible)
  {
!     ShowWindow(window, visible ? SW_SHOW : SW_HIDE);
! }
! 
! BOOL osGetWindowVisible(WindowHandle window)
! {
!     return (GetWindowLong(hCtrl, GWL_STYLE) & WS_VISIBLE) != 0;
  }
  
***************
*** 988,996 ****
  {
      MSG msg;
!     
! 	ShowWindow(window, SW_SHOW);
      SetActiveWindow(window);
      EnableWindow(GetWindow(window, GW_OWNER), FALSE);
!     
      while (IsWindow(window) && GetMessage(&msg, NULL, 0, 0) != 0)
      {
--- 999,1007 ----
  {
      MSG msg;
! 
!     ShowWindow(window, SW_SHOW);
      SetActiveWindow(window);
      EnableWindow(GetWindow(window, GW_OWNER), FALSE);
! 
      while (IsWindow(window) && GetMessage(&msg, NULL, 0, 0) != 0)
      {

[htoolkit-cvs] port/src/Port Window.hs,1.15,1.16

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

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

Modified Files:
	Window.hs 
Log Message:
Make possible to hide/show a window at any time


Index: Window.hs
===================================================================
RCS file: /cvsroot/htoolkit/port/src/Port/Window.hs,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Window.hs	24 Aug 2003 19:02:45 -0000	1.15
--- Window.hs	7 Oct 2003 21:31:29 -0000	1.16
***************
*** 17,21 ****
                 createWindow, createDialog
               -- * Operations
!              , showWindow, runDialog
               , dismissWindow, dismissAllWindows
               , destroyWindow, destroyAllWindows
--- 17,21 ----
                 createWindow, createDialog
               -- * Operations
!              , runDialog
               , dismissWindow, dismissAllWindows
               , destroyWindow, destroyAllWindows
***************
*** 23,27 ****
               , invalidateWindow
               -- * Properties
!              , getWindowFrame, setWindowFrame
               , setWindowResizeable
               , setWindowColor
--- 23,28 ----
               , invalidateWindow
               -- * Properties
! 	     , setWindowVisible, getWindowVisible
!              , setWindowFrame, getWindowFrame
               , setWindowResizeable
               , setWindowColor
***************
*** 128,133 ****
  foreign import ccall osSetWindowResizeable :: WindowHandle -> CBool -> IO ()
  
! -- | Make the window visible.
! foreign import ccall "osShowWindow" showWindow :: WindowHandle -> IO ()
  
  -- | Run a modal dialog.
--- 129,137 ----
  foreign import ccall osSetWindowResizeable :: WindowHandle -> CBool -> IO ()
  
! -- | Make the window visible\/invisible.
! foreign import ccall "osSetWindowVisible" setWindowVisible :: WindowHandle -> Bool -> IO ()
! 
! -- | Retrieves whether is visible.
! foreign import ccall "osGetWindowVisible" getWindowVisible :: WindowHandle -> IO Bool
  
  -- | Run a modal dialog.

[htoolkit-cvs] gio/src/Graphics/UI/GIO Controls.hs,1.32,1.33

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

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

Modified Files:
	Controls.hs 
Log Message:
Rename visible attribute to password


Index: Controls.hs
===================================================================
RCS file: /cvsroot/htoolkit/gio/src/Graphics/UI/GIO/Controls.hs,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** Controls.hs	1 Sep 2003 20:27:50 -0000	1.32
--- Controls.hs	7 Oct 2003 20:22:18 -0000	1.33
***************
*** 8,15 ****
      Portability :  portable
  
!     This module contains interface to all controls supported from GIO. 
!     A control is a child window an application uses in conjunction with 
!     another window to perform simple input and output tasks. 
!     The controls provides the user with the means to type text, choose options, 
      and execute an actions.
  -}
--- 8,15 ----
      Portability :  portable
  
!     This module contains interface to all controls supported from GIO.
!     A control is a child window an application uses in conjunction with
!     another window to perform simple input and output tasks.
!     The controls provides the user with the means to type text, choose options,
      and execute an actions.
  -}
***************
*** 18,35 ****
                                 -- * Controls
                                 -- ** Button
!                                -- | A button control is a small, rectangular child window that can be 
                                 -- clicked on and off. Buttons can be labeled or appear without text.
                                 -- A button typically changes appearance when the user clicks it.
                                   Button, button
!                                  
                                 -- ** Label
!                                -- | A label control simply displays a text string and it can be used 
                                 -- to label other controls. A label control can\'t take input and can\'t provide output.
                                 , Label, label
!                                
                                 -- ** Entry
                                 -- | An entry control is a rectangular widget in which the user can enter text.
!                                , Entry, entry, readOnly, visible
!                                
                                 -- ** Popup
                                 -- | A popup control consists of a list box combined with a label control.
--- 18,35 ----
                                 -- * Controls
                                 -- ** Button
!                                -- | A button control is a small, rectangular child window that can be
                                 -- clicked on and off. Buttons can be labeled or appear without text.
                                 -- A button typically changes appearance when the user clicks it.
                                   Button, button
! 
                                 -- ** Label
!                                -- | A label control simply displays a text string and it can be used
                                 -- to label other controls. A label control can\'t take input and can\'t provide output.
                                 , Label, label
! 
                                 -- ** Entry
                                 -- | An entry control is a rectangular widget in which the user can enter text.
!                                , Entry, entry, readOnly, password
! 
                                 -- ** Popup
                                 -- | A popup control consists of a list box combined with a label control.
***************
*** 245,251 ****
  readOnly = newStdAttr ehandle Port.getEditReadOnly Port.setEditReadOnly
  
! -- | Determines if the user can edit the text in the editable widget or not. 
! visible :: Attr Entry Bool    
! visible = newStdAttr ehandle Port.getEditVisibility Port.setEditVisibility
  
  {--------------------------------------------------------------------
--- 245,251 ----
  readOnly = newStdAttr ehandle Port.getEditReadOnly Port.setEditReadOnly
  
! -- | Determines whether the entry is used to edit a password or a normal text.
! password :: Attr Entry Bool
! password = newStdAttr ehandle Port.getEditPassword Port.setEditPassword
  
  {--------------------------------------------------------------------

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

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

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

Modified Files:
	EditBox.h 
Log Message:
Rename visible attribute to password


Index: EditBox.h
===================================================================
RCS file: /cvsroot/htoolkit/port/src/include/EditBox.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** EditBox.h	26 Mar 2003 22:10:04 -0000	1.5
--- EditBox.h	7 Oct 2003 20:20:43 -0000	1.6
***************
*** 1,16 ****
! #ifndef EDITBOX_H
! #define EDITBOX_H
! 
! #include "Types.h"
! 
! WindowHandle osCreateEdit(WindowHandle window);
! void osGetEditReqSize(WindowHandle edit, int *res);
! char *osGetEditText(WindowHandle editbox);
! void osSetEditText(WindowHandle editbox, char *txt);
! void osSetEditReadOnly(WindowHandle editbox, BOOL readOnly);
! BOOL osGetEditReadOnly(WindowHandle editbox);
! void osSetEditVisibility(WindowHandle editbox, BOOL visible);
! BOOL osGetEditVisibility(WindowHandle editbox);
! void osChangeEditBoxFont(WindowHandle editbox, FontHandle font);
! 
! #endif
--- 1,16 ----
! #ifndef EDITBOX_H
! #define EDITBOX_H
! 
! #include "Types.h"
! 
! WindowHandle osCreateEdit(WindowHandle window);
! void osGetEditReqSize(WindowHandle edit, int *res);
! char *osGetEditText(WindowHandle editbox);
! void osSetEditText(WindowHandle editbox, char *txt);
! void osSetEditReadOnly(WindowHandle editbox, BOOL readOnly);
! BOOL osGetEditReadOnly(WindowHandle editbox);
! void osSetEditPassword(WindowHandle editbox, BOOL visible);
! BOOL osGetEditPassword(WindowHandle editbox);
! void osChangeEditBoxFont(WindowHandle editbox, FontHandle font);
! 
! #endif

[htoolkit-cvs] port/src/Port Controls.hs,1.22,1.23

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

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

Modified Files:
	Controls.hs 
Log Message:
Rename visible attribute to password


Index: Controls.hs
===================================================================
RCS file: /cvsroot/htoolkit/port/src/Port/Controls.hs,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** Controls.hs	1 Sep 2003 20:27:49 -0000	1.22
--- Controls.hs	7 Oct 2003 20:20:42 -0000	1.23
***************
*** 57,61 ****
             , getEditText,      setEditText
             , getEditReadOnly,  setEditReadOnly
!            , getEditVisibility,setEditVisibility
             , changeEditBoxFont
             -- * Check box
--- 57,61 ----
             , getEditText,      setEditText
             , getEditReadOnly,  setEditReadOnly
!            , getEditPassword,setEditPassword
             , changeEditBoxFont
             -- * Check box
***************
*** 246,251 ****
  foreign import ccall "osGetEditReadOnly" getEditReadOnly :: WindowHandle -> IO Bool
  
! foreign import ccall "osSetEditVisibility" setEditVisibility :: WindowHandle -> Bool -> IO ()
! foreign import ccall "osGetEditVisibility" getEditVisibility :: WindowHandle -> IO Bool
  
  changeEditBoxFont :: WindowHandle -> Font -> IO ()
--- 246,251 ----
  foreign import ccall "osGetEditReadOnly" getEditReadOnly :: WindowHandle -> IO Bool
  
! foreign import ccall "osSetEditPassword" setEditPassword :: WindowHandle -> Bool -> IO ()
! foreign import ccall "osGetEditPassword" getEditPassword :: WindowHandle -> IO Bool
  
  changeEditBoxFont :: WindowHandle -> Font -> IO ()

[htoolkit-cvs] port/src/cbits/Win32 EditBox.c,1.9,1.10

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

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

Modified Files:
	EditBox.c 
Log Message:
Rename visible attribute to password


Index: EditBox.c
===================================================================
RCS file: /cvsroot/htoolkit/port/src/cbits/Win32/EditBox.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** EditBox.c	24 Aug 2003 21:07:48 -0000	1.9
--- EditBox.c	7 Oct 2003 20:20:42 -0000	1.10
***************
*** 1,92 ****
! #include "EditBox.h"
! #include "Internals.h"
! #include "Handlers_stub.h"
! 
! WindowHandle osCreateEdit(WindowHandle window)
! {
! 	HWND hEdit;
! 
! 	hEdit = CreateWindowEx(
! 			  WS_EX_CLIENTEDGE,
! 			  "EDIT",
! 			  NULL,
! 			  WS_CHILD | WS_VISIBLE | WS_BORDER | ES_AUTOHSCROLL | WS_TABSTOP,
! 			  0,0,0,0,
! 			  window,
! 			  NULL,
! 			  ghModule,
! 			  NULL
! 			);
! 
! 	return checkWindow(hEdit, "EDIT");
! };
! 
! void osGetEditReqSize(WindowHandle edit, int *res)
! {
! 	SIZE sz;
! 	HDC hDC = GetDC(edit);
! 	HFONT hFont = (HFONT) SendMessage(edit,WM_GETFONT,0,0);
! 	int nLen     = 1;
! 	char *buffer = "m";    /* pretend a single letter as a minimal size */
! 
! 	if (hFont) SelectObject(hDC, hFont);
! 	GetTextExtentPoint32(hDC, buffer, nLen, &sz);
!  	ReleaseDC(edit, hDC);
! 
! 	res[0] = sz.cx + GetSystemMetrics(SM_CXBORDER)*2 + 6;
! 	res[1] = sz.cy + GetSystemMetrics(SM_CYBORDER)*2 + 6;
! }
! 
! char *osGetEditText(WindowHandle editbox)
! {
! 	int nLen = GetWindowTextLength(editbox);
! 	char *buffer = (char *) rmalloc(nLen+1);
! 	GetWindowText(editbox, buffer, nLen+1);
! 	return buffer;
! };
! 
! void osSetEditText(WindowHandle editbox, char *txt)
! {
! 	SetWindowText(editbox, txt);
! };
! 
! void osSetEditReadOnly(WindowHandle editbox, BOOL readOnly)
! {
! 	SendMessage(editbox,EM_SETREADONLY,readOnly,0);
! }
! 
! BOOL osGetEditReadOnly(WindowHandle editbox)
! {
! 	return (GetWindowLong(editbox, GWL_STYLE) & ES_READONLY) != 0;
! }
! 
! void osSetEditVisibility(WindowHandle editbox, BOOL visible)
! {
! 	LONG lStyle;
! 
! 	lStyle = GetWindowLong(editbox, GWL_STYLE);
! 
! 	if (visible)
! 	{
! 		SetWindowLong(editbox, GWL_STYLE,  lStyle & ~ES_PASSWORD);
! 		SendMessage(editbox, EM_SETPASSWORDCHAR, 0, 0);
! 	}
! 	else
! 	{
! 		SetWindowLong(editbox, GWL_STYLE,  lStyle | ES_PASSWORD);
! 		SendMessage(editbox, EM_SETPASSWORDCHAR, (WPARAM) '*', 0);
! 	}
! 
! 	InvalidateRect(editbox,NULL,TRUE);
! }
! 
! BOOL osGetEditVisibility(WindowHandle editbox)
! {
! 	return (GetWindowLong(editbox, GWL_STYLE) & ES_PASSWORD) == 0;
! }
! 
! void osChangeEditBoxFont(WindowHandle editbox, FontHandle font)
! {
! 	SendMessage(editbox, WM_SETFONT, (WPARAM) font, MAKELPARAM (TRUE,0));
! 	osForceContainerReLayout(editbox);
! };
--- 1,92 ----
! #include "EditBox.h"
! #include "Internals.h"
! #include "Handlers_stub.h"
! 
! WindowHandle osCreateEdit(WindowHandle window)
! {
! 	HWND hEdit;
! 
! 	hEdit = CreateWindowEx(
! 			  WS_EX_CLIENTEDGE,
! 			  "EDIT",
! 			  NULL,
! 			  WS_CHILD | WS_VISIBLE | WS_BORDER | ES_AUTOHSCROLL | WS_TABSTOP,
! 			  0,0,0,0,
! 			  window,
! 			  NULL,
! 			  ghModule,
! 			  NULL
! 			);
! 
! 	return checkWindow(hEdit, "EDIT");
! };
! 
! void osGetEditReqSize(WindowHandle edit, int *res)
! {
! 	SIZE sz;
! 	HDC hDC = GetDC(edit);
! 	HFONT hFont = (HFONT) SendMessage(edit,WM_GETFONT,0,0);
! 	int nLen     = 1;
! 	char *buffer = "m";    /* pretend a single letter as a minimal size */
! 
! 	if (hFont) SelectObject(hDC, hFont);
! 	GetTextExtentPoint32(hDC, buffer, nLen, &sz);
!  	ReleaseDC(edit, hDC);
! 
! 	res[0] = sz.cx + GetSystemMetrics(SM_CXBORDER)*2 + 6;
! 	res[1] = sz.cy + GetSystemMetrics(SM_CYBORDER)*2 + 6;
! }
! 
! char *osGetEditText(WindowHandle editbox)
! {
! 	int nLen = GetWindowTextLength(editbox);
! 	char *buffer = (char *) rmalloc(nLen+1);
! 	GetWindowText(editbox, buffer, nLen+1);
! 	return buffer;
! };
! 
! void osSetEditText(WindowHandle editbox, char *txt)
! {
! 	SetWindowText(editbox, txt);
! };
! 
! void osSetEditReadOnly(WindowHandle editbox, BOOL readOnly)
! {
! 	SendMessage(editbox,EM_SETREADONLY,readOnly,0);
! }
! 
! BOOL osGetEditReadOnly(WindowHandle editbox)
! {
! 	return (GetWindowLong(editbox, GWL_STYLE) & ES_READONLY) != 0;
! }
! 
! void osSetEditPassword(WindowHandle editbox, BOOL visible)
! {
! 	LONG lStyle;
! 
! 	lStyle = GetWindowLong(editbox, GWL_STYLE);
! 
! 	if (visible)
! 	{
! 		SetWindowLong(editbox, GWL_STYLE,  lStyle & ~ES_PASSWORD);
! 		SendMessage(editbox, EM_SETPASSWORDCHAR, 0, 0);
! 	}
! 	else
! 	{
! 		SetWindowLong(editbox, GWL_STYLE,  lStyle | ES_PASSWORD);
! 		SendMessage(editbox, EM_SETPASSWORDCHAR, (WPARAM) '*', 0);
! 	}
! 
! 	InvalidateRect(editbox,NULL,TRUE);
! }
! 
! BOOL osGetEditPassword(WindowHandle editbox)
! {
! 	return (GetWindowLong(editbox, GWL_STYLE) & ES_PASSWORD) == 0;
! }
! 
! void osChangeEditBoxFont(WindowHandle editbox, FontHandle font)
! {
! 	SendMessage(editbox, WM_SETFONT, (WPARAM) font, MAKELPARAM (TRUE,0));
! 	osForceContainerReLayout(editbox);
! };

[htoolkit-cvs] port/src/cbits/GTK EditBox.c,1.12,1.13

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

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

Modified Files:
	EditBox.c 
Log Message:
Rename visible attribute to password


Index: EditBox.c
===================================================================
RCS file: /cvsroot/htoolkit/port/src/cbits/GTK/EditBox.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** EditBox.c	4 Oct 2003 22:25:02 -0000	1.12
--- EditBox.c	7 Oct 2003 20:20:42 -0000	1.13
***************
*** 44,53 ****
  }
  
! void osSetEditVisibility(WindowHandle entry, BOOL visible)
  {
  	gtk_entry_set_visibility(GTK_ENTRY(entry), visible);
  }
  
! BOOL osGetEditVisibility(WindowHandle entry)
  {
  	return gtk_entry_get_visibility(GTK_ENTRY(entry));
--- 44,53 ----
  }
  
! void osSetEditPassword(WindowHandle entry, BOOL visible)
  {
  	gtk_entry_set_visibility(GTK_ENTRY(entry), visible);
  }
  
! BOOL osGetEditPassword(WindowHandle entry)
  {
  	return gtk_entry_get_visibility(GTK_ENTRY(entry));

[htoolkit-cvs] gio/src/Graphics/UI/GIO Canvas.hs,1.14,1.15

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

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

Modified Files:
	Canvas.hs 
Log Message:
rename drawInBitmap to paintInBitmap


Index: Canvas.hs
===================================================================
RCS file: /cvsroot/htoolkit/gio/src/Graphics/UI/GIO/Canvas.hs,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Canvas.hs	24 Aug 2003 19:02:45 -0000	1.14
--- Canvas.hs	7 Oct 2003 20:09:10 -0000	1.15
***************
*** 32,36 ****
                , setCanvasPen, getCanvasPen
                
!               , drawInBitmap
  
                -- * Drawing primitives
--- 32,36 ----
                , setCanvasPen, getCanvasPen
                
!               , paintInBitmap
  
                -- * Drawing primitives
***************
*** 150,158 ****
         Port.withCanvas pen bmode handle (f (Canvas handle vpen bmode))
  
! -- | The drawInBitmap executes the given function with canvas
  -- associated with given Bitmap.
! drawInBitmap :: BufferMode -> Pen -> Bitmap -> (Canvas -> IO a) -> IO a
! drawInBitmap bmode pen bmp f = do
!    Port.drawInBitmap bmp (\hcanvas -> withCanvas bmode pen hcanvas f)
  
  --------------------------------------------------------------------
--- 150,158 ----
         Port.withCanvas pen bmode handle (f (Canvas handle vpen bmode))
  
! -- | The paintInBitmap executes the given function with canvas
  -- associated with given Bitmap.
! paintInBitmap :: Bitmap -> Pen -> (Canvas -> IO a) -> IO a
! paintInBitmap bmp pen f = do
!    Port.drawInBitmap bmp (\hcanvas -> withCanvas UnBuffered pen hcanvas f)
  
  --------------------------------------------------------------------

[htoolkit-cvs] port/src/cbits/GTK Font.c,1.7,1.8

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

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

Modified Files:
	Font.c 
Log Message:
fix


Index: Font.c
===================================================================
RCS file: /cvsroot/htoolkit/port/src/cbits/GTK/Font.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Font.c	7 Oct 2003 19:44:09 -0000	1.7
--- Font.c	7 Oct 2003 19:47:12 -0000	1.8
***************
*** 208,213 ****
  	}
  	gtk_style_unref(gtkstyle);
- 
- 	*style   = FONT_UNDERLINED ;
  }
  
--- 208,211 ----

[htoolkit-cvs] port/src/cbits/GTK Bitmap.c,1.5,1.6 Canvas.c,1.14,1.15 Font.c,1.6,1.7 Window.c,1.32,1.33

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

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

Modified Files:
	Bitmap.c Canvas.c Font.c Window.c 
Log Message:
better support for fonts


Index: Bitmap.c
===================================================================
RCS file: /cvsroot/htoolkit/port/src/cbits/GTK/Bitmap.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Bitmap.c	7 Apr 2003 20:58:47 -0000	1.5
--- Bitmap.c	7 Oct 2003 19:44:09 -0000	1.6
***************
*** 95,101 ****
--- 95,103 ----
  CanvasHandle osGetBitmapCanvas(BitmapHandle bitmap)
  {
+ 	Display *display;
  	CanvasHandle canvas;
  	GdkRectangle rectangle;
  	GdkColormap *sys_colormap;
+ 	PangoContext *pango_context;
  
  	rectangle.x = 0;
***************
*** 106,112 ****
--- 108,119 ----
  	sys_colormap = gdk_colormap_get_system();
  
+ 	display = GDK_DISPLAY_XDISPLAY(gdk_display_get_default());
+ 	pango_context = pango_x_get_context(display);
+ 	gdk_pango_context_set_colormap(pango_context, sys_colormap);
+ 
  	canvas = rmalloc(sizeof(*canvas));
  	memset(canvas, 0, sizeof(*canvas));
  	canvas->drawable = GDK_DRAWABLE(gdk_pixmap_new(NULL, bitmap->width, bitmap->height, sys_colormap->visual->depth));
+ 	canvas->layout = pango_layout_new(pango_context);
  	canvas->region = gdk_region_rectangle(&rectangle);
  	canvas->buffered = 0;
***************
*** 134,137 ****
--- 141,145 ----
  	gdk_pixmap_unref(canvas->drawable);
  	if (canvas->region) gdk_region_destroy(canvas->region);
+ 	g_object_unref(canvas->layout);
  }
  

Index: Canvas.c
===================================================================
RCS file: /cvsroot/htoolkit/port/src/cbits/GTK/Canvas.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Canvas.c	25 Aug 2003 20:41:08 -0000	1.14
--- Canvas.c	7 Oct 2003 19:44:09 -0000	1.15
***************
*** 84,88 ****
  
  	canvas->theFont = font;
- 
  	osChangeCanvasPen(size,function,pcolor,bcolor,joinStyle,capStyle,lineStyle,lineCustomCount,lineCustomDashes,backDraw,hatchStyle,hatchBitmap,font,canvas);
  
--- 84,87 ----
***************
*** 447,450 ****
--- 446,450 ----
  		
  		canvas->theFont = font;
+ 		pango_layout_set_font_description(canvas->layout, font->font_descr);
  	}
  }
***************
*** 510,524 ****
  }
  
! static void osSetupFont(FontHandle font, int len)
  {
! 	if (font->style & (FONT_UNDERLINED | FONT_STRIKED))
  	{
  		PangoAttribute *attr;
- 
  		PangoAttrList *attr_list;
  
! 		attr_list = pango_layout_get_attributes(font->layout);
  
! 		if (font->style & FONT_UNDERLINED)
  		{
  			attr = pango_attr_underline_new(PANGO_UNDERLINE_SINGLE);
--- 510,529 ----
  }
  
! static void osSetupFont(CanvasHandle canvas, int len)
  {
! 	if (canvas->theFont->style & (FONT_UNDERLINED | FONT_STRIKED))
  	{
  		PangoAttribute *attr;
  		PangoAttrList *attr_list;
  
! 		attr_list = pango_layout_get_attributes(canvas->layout);
  
! 		if (!attr_list)
! 		{
! 			attr_list = pango_attr_list_new();
! 			pango_layout_set_attributes(canvas->layout, attr_list);
! 		}
! 
! 		if (canvas->theFont->style & FONT_UNDERLINED)
  		{
  			attr = pango_attr_underline_new(PANGO_UNDERLINE_SINGLE);
***************
*** 529,533 ****
  		}
  
! 		if (font->style & FONT_STRIKED)
  		{
  			attr = pango_attr_strikethrough_new(gtk_true());
--- 534,538 ----
  		}
  
! 		if (canvas->theFont->style & FONT_STRIKED)
  		{
  			attr = pango_attr_strikethrough_new(gtk_true());
***************
*** 544,568 ****
  	if (canvas->drawable)
  	{
! 		osSetupFont(canvas->theFont, 1);
! 
! 		pango_layout_set_text(canvas->theFont->layout, &c, 1);
! 
! 		y -= pango_font_metrics_get_ascent(canvas->theFont->metrics)/PANGO_SCALE;
! 
! 		if (canvas->backDraw)
! 		{
! 			int width, height;
  
! 			pango_layout_get_pixel_size(canvas->theFont->layout, &width, &height);
! 			gdk_draw_rectangle(canvas->drawable, canvas->theEraseGC, TRUE,
! 	                   x, y, width, height);
! 		}
  
! 		gdk_draw_layout(canvas->drawable,
                          canvas->theTextGC,
                          x, y,
!                         canvas->theFont->layout);
  
! 		pango_layout_set_text(canvas->theFont->layout, NULL, 0);
  	}
  }	/* osDrawChar */
--- 549,565 ----
  	if (canvas->drawable)
  	{
! 		PangoLayoutLine *layout_line;
  
! 		osSetupFont(canvas, 1);
! 		pango_layout_set_text(canvas->layout, &c, 1);
! 		layout_line = pango_layout_get_line(canvas->layout, 0);
  
! 		gdk_draw_layout_line_with_colors (canvas->drawable,
                          canvas->theTextGC,
                          x, y,
!                         layout_line,
!                         NULL, canvas->backDraw ? &canvas->backColor : NULL);
  
! 		pango_layout_set_text(canvas->layout, NULL, 0);
  	}
  }	/* osDrawChar */
***************
*** 572,596 ****
  	if (canvas->drawable)
  	{
! 		osSetupFont(canvas->theFont, strlen(string));
! 
! 		pango_layout_set_text(canvas->theFont->layout, string, -1);
! 
! 		y -= pango_font_metrics_get_ascent(canvas->theFont->metrics)/PANGO_SCALE;
! 
! 		if (canvas->backDraw)
! 		{
! 			int width, height;
  
! 			pango_layout_get_pixel_size(canvas->theFont->layout, &width, &height);
! 			gdk_draw_rectangle(canvas->drawable, canvas->theEraseGC, TRUE,
! 	                   x, y, width, height);
! 		}
  
! 		gdk_draw_layout(canvas->drawable,
                          canvas->theTextGC,
                          x, y,
!                         canvas->theFont->layout);
  
! 		pango_layout_set_text(canvas->theFont->layout, NULL, 0);
  	}
  }	/* osDrawString */
--- 569,585 ----
  	if (canvas->drawable)
  	{
! 		PangoLayoutLine *layout_line;
  
! 		osSetupFont(canvas, strlen(string));
! 		pango_layout_set_text(canvas->layout, string, -1);
! 		layout_line = pango_layout_get_line(canvas->layout, 0);
  
! 		gdk_draw_layout_line_with_colors (canvas->drawable,
                          canvas->theTextGC,
                          x, y,
!                         layout_line,
!                         NULL, canvas->backDraw ? &canvas->backColor : NULL);
  
! 		pango_layout_set_text(canvas->layout, NULL, 0);
  	}
  }	/* osDrawString */
***************
*** 643,651 ****
  CanvasHandle osGetTemporaryCanvas()
  {
  	CanvasHandle canvas;
  
  	canvas = rmalloc(sizeof(*canvas));
  	memset(canvas, 0, sizeof(*canvas));
! 
  	canvas->buffered = 0;
  
--- 632,645 ----
  CanvasHandle osGetTemporaryCanvas()
  {
+ 	Display *display;
  	CanvasHandle canvas;
+ 	PangoContext *pango_context;
+ 
+ 	display = GDK_DISPLAY_XDISPLAY(gdk_display_get_default());
+ 	pango_context = pango_x_get_context(display);
  
  	canvas = rmalloc(sizeof(*canvas));
  	memset(canvas, 0, sizeof(*canvas));
! 	canvas->layout = pango_layout_new(pango_context);
  	canvas->buffered = 0;
  
***************
*** 655,658 ****
--- 649,653 ----
  void osReleaseTemporaryCanvas (CanvasHandle canvas)
  {
+ 	g_object_unref(canvas->layout);
  	rfree(canvas);
  }	/* osReleaseTemporaryCanvas */

Index: Font.c
===================================================================
RCS file: /cvsroot/htoolkit/port/src/cbits/GTK/Font.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Font.c	25 Aug 2003 20:41:08 -0000	1.6
--- Font.c	7 Oct 2003 19:44:09 -0000	1.7
***************
*** 101,105 ****
  	display = GDK_DISPLAY_XDISPLAY(gdk_display_get_default());
  	pango_context = pango_x_get_context(display);
- 	font->layout = pango_layout_new(pango_context);
  
  	font->font_descr = pango_font_description_new();
--- 101,104 ----
***************
*** 109,116 ****
  	pango_font_description_set_size(font->font_descr, size*PANGO_SCALE);
  
- 	pango_layout_set_font_description(font->layout, font->font_descr);
- 
  	pango_font = pango_font_map_load_font
!   			( pango_x_font_map_for_display(display)
  			, NULL
  			, font->font_descr
--- 108,113 ----
  	pango_font_description_set_size(font->font_descr, size*PANGO_SCALE);
  
  	pango_font = pango_font_map_load_font
! 			( pango_x_font_map_for_display(display)
  			, NULL
  			, font->font_descr
***************
*** 120,126 ****
  	font->style = style;
  
- 	if (font->style & (FONT_UNDERLINED | FONT_STRIKED))
- 		pango_layout_set_attributes(font->layout, pango_attr_list_new());
- 
  	return font;
  }
--- 117,120 ----
***************
*** 130,134 ****
  	pango_font_metrics_unref(font->metrics);
  	pango_font_description_free(font->font_descr);
- 	g_object_unref(font->layout);
  	rfree(font);
  }	/* osDeleteFont */
--- 124,127 ----
***************
*** 156,163 ****
  	int width;
  
! 	pango_layout_set_text(canvas->theFont->layout, string, -1);
! 	pango_layout_get_pixel_size(canvas->theFont->layout, &width, NULL);
! 	pango_layout_set_text(canvas->theFont->layout, NULL, 0);
! 
  
  	return width;
--- 149,155 ----
  	int width;
  
! 	pango_layout_set_text(canvas->layout, string, -1);
! 	pango_layout_get_pixel_size(canvas->layout, &width, NULL);
! 	pango_layout_set_text(canvas->layout, NULL, 0);
  
  	return width;
***************
*** 168,174 ****
  	int width;
  
! 	pango_layout_set_text(canvas->theFont->layout, &ch, 1);
! 	pango_layout_get_pixel_size(canvas->theFont->layout, &width, NULL);
! 	pango_layout_set_text(canvas->theFont->layout, NULL, 0);
  
  	return width;
--- 160,166 ----
  	int width;
  
! 	pango_layout_set_text(canvas->layout, &ch, 1);
! 	pango_layout_get_pixel_size(canvas->layout, &width, NULL);
! 	pango_layout_set_text(canvas->layout, NULL, 0);
  
  	return width;
***************
*** 179,185 ****
  	int width;
  
! 	pango_layout_set_text(font->layout, string, -1);
! 	pango_layout_get_pixel_size(font->layout, &width, NULL);
! 	pango_layout_set_text(font->layout, NULL, 0);
  
  	return width;
--- 171,179 ----
  	int width;
  
! 	pango_layout_set_font_description(canvas->layout, font->font_descr);
! 	pango_layout_set_text(canvas->layout, string, -1);
! 	pango_layout_get_pixel_size(canvas->layout, &width, NULL);
! 	pango_layout_set_text(canvas->layout, NULL, 0);
! 	pango_layout_set_font_description(canvas->layout, canvas->theFont->font_descr);
  
  	return width;
***************
*** 190,196 ****
  	int width;
  
! 	pango_layout_set_text(font->layout, &ch, 1);
! 	pango_layout_get_pixel_size(font->layout, &width, NULL);
! 	pango_layout_set_text(font->layout, NULL, 0);
  
  	return width;
--- 184,192 ----
  	int width;
  
! 	pango_layout_set_font_description(canvas->layout, font->font_descr);
! 	pango_layout_set_text(canvas->layout, &ch, 1);
! 	pango_layout_get_pixel_size(canvas->layout, &width, NULL);
! 	pango_layout_set_text(canvas->layout, NULL, 0);
! 	pango_layout_set_font_description(canvas->layout, canvas->theFont->font_descr);
  
  	return width;
***************
*** 212,215 ****
--- 208,213 ----
  	}
  	gtk_style_unref(gtkstyle);
+ 
+ 	*style   = FONT_UNDERLINED ;
  }
  

Index: Window.c
===================================================================
RCS file: /cvsroot/htoolkit/port/src/cbits/GTK/Window.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** Window.c	7 Oct 2003 17:31:49 -0000	1.32
--- Window.c	7 Oct 2003 19:44:09 -0000	1.33
***************
*** 57,60 ****
--- 57,61 ----
  	memset(canvas, 0, sizeof(*canvas));
  	canvas->drawable = GDK_DRAWABLE(event->window);
+ 	canvas->layout = gtk_widget_create_pango_layout(layout, NULL);
  	canvas->region = gdk_region_copy(event->region);
  	canvas->buffered = (GTK_WIDGET_FLAGS(widget) & GTK_DOUBLE_BUFFERED) ? 2 : 0;
***************
*** 65,68 ****
--- 66,71 ----
  
  	if (canvas->region) gdk_region_destroy(canvas->region);
+ 	g_object_unref(canvas->layout);
+ 	
  	return gtk_false();
  }
***************
*** 691,694 ****
--- 694,698 ----
  	memset(canvas, 0, sizeof(*canvas));
  	canvas->drawable = GDK_DRAWABLE(PORT_LAYOUT(layout)->bin_window);
+ 	canvas->layout = gtk_widget_create_pango_layout(layout, NULL);
  	canvas->region = gdk_region_rectangle(&rectangle);
  	canvas->buffered = 0;
***************
*** 704,707 ****
--- 708,712 ----
  	gdk_window_unref(GDK_WINDOW(canvas->drawable));
  	if (canvas->region) gdk_region_destroy(canvas->region);
+ 	g_object_unref(canvas->layout);
  	rfree(canvas);
  }	/* osReleaseWindowCanvas */

[htoolkit-cvs] port/src/include Types.h,1.17,1.18

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

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

Modified Files:
	Types.h 
Log Message:
better support for fonts


Index: Types.h
===================================================================
RCS file: /cvsroot/htoolkit/port/src/include/Types.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Types.h	24 Aug 2003 19:02:45 -0000	1.17
--- Types.h	7 Oct 2003 19:44:10 -0000	1.18
***************
*** 100,104 ****
  typedef struct
  {
- 	PangoLayout *layout;
  	PangoFontDescription *font_descr;
  	PangoFontMetrics *metrics;
--- 100,103 ----
***************
*** 131,134 ****
--- 130,134 ----
  	GdkPixbuf *pixbuf;
  	GdkPixmap *tile;
+ 	PangoLayout *layout;
  } *CanvasHandle;
  

[htoolkit-cvs] port/src/cbits/GTK Window.c,1.31,1.32

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

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

Modified Files:
	Window.c 
Log Message:
bugfix


Index: Window.c
===================================================================
RCS file: /cvsroot/htoolkit/port/src/cbits/GTK/Window.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** Window.c	6 Oct 2003 17:36:31 -0000	1.31
--- Window.c	7 Oct 2003 17:31:49 -0000	1.32
***************
*** 73,88 ****
  {
  	GtkWidget *window = (GtkWidget *) user_data;
- 	GtkScrolledWindow *sw = GTK_SCROLLED_WINDOW(window);
  
- 	int x, y;
  	int modifiers = 0;
- 
  	if (event->state & GDK_SHIFT_MASK) modifiers |= shiftBIT;
  	if (event->state & GDK_CONTROL_MASK) modifiers |= ctrlBIT;
  	if (event->state & GDK_MOD1_MASK) modifiers |= altBIT;
  
- 	x = gtk_scrolled_window_get_hadjustment (sw)->value + event->x;
- 	y = gtk_scrolled_window_get_vadjustment (sw)->value + event->y;
- 
  	switch (event->type)
  	{
--- 73,82 ----
***************
*** 92,100 ****
  				case 1:
  					bInDragMode = TRUE;
! 					handleWindowMouse(window,evMouseLeftDown,x,y,modifiers);
  					break;
  				case 3:
! 					handleWindowMouse(window,evMouseRightDown,x,y,modifiers);
! 					handleWindowContextMenu(window,x,y,modifiers);
  					break;
  			}
--- 86,94 ----
  				case 1:
  					bInDragMode = TRUE;
! 					handleWindowMouse(window,evMouseLeftDown,event->x,event->y,modifiers);
  					break;
  				case 3:
! 					handleWindowMouse(window,evMouseRightDown,event->x,event->y,modifiers);
! 					handleWindowContextMenu(window,event->x,event->y,modifiers);
  					break;
  			}
***************
*** 102,106 ****
  		case GDK_2BUTTON_PRESS:
  			if (event->button == 1)
! 				handleWindowMouse(window,evMouseDoubleClick,x,y,modifiers);
  			break;
  		default:
--- 96,100 ----
  		case GDK_2BUTTON_PRESS:
  			if (event->button == 1)
! 				handleWindowMouse(window,evMouseDoubleClick,event->x,event->y,modifiers);
  			break;
  		default:
***************
*** 114,137 ****
  {
  	GtkWidget *window = (GtkWidget *) user_data;
- 	GtkScrolledWindow *sw = GTK_SCROLLED_WINDOW(window);
  
- 	int x, y;
  	int modifiers = 0;
- 
  	if (event->state & GDK_SHIFT_MASK) modifiers |= shiftBIT;
  	if (event->state & GDK_CONTROL_MASK) modifiers |= ctrlBIT;
  	if (event->state & GDK_MOD1_MASK) modifiers |= altBIT;
  
- 	x = gtk_scrolled_window_get_hadjustment (sw)->value + event->x;
- 	y = gtk_scrolled_window_get_vadjustment (sw)->value + event->y;
- 
  	switch (event->button)
  	{
  		case 1:
  			bInDragMode = FALSE;
! 			handleWindowMouse(window,evMouseLeftUp,x,y,modifiers);
  			break;
  		case 3:
! 			handleWindowMouse(window,evMouseRightUp,x,y,modifiers);
  			break;
  	}
--- 108,125 ----
  {
  	GtkWidget *window = (GtkWidget *) user_data;
  
  	int modifiers = 0;
  	if (event->state & GDK_SHIFT_MASK) modifiers |= shiftBIT;
  	if (event->state & GDK_CONTROL_MASK) modifiers |= ctrlBIT;
  	if (event->state & GDK_MOD1_MASK) modifiers |= altBIT;
  
  	switch (event->button)
  	{
  		case 1:
  			bInDragMode = FALSE;
! 			handleWindowMouse(window,evMouseLeftUp,event->x,event->y,modifiers);
  			break;
  		case 3:
! 			handleWindowMouse(window,evMouseRightUp,event->x,event->y,modifiers);
  			break;
  	}
***************
*** 143,164 ****
  {
  	GtkWidget *window = (GtkWidget *) user_data;
- 	GtkScrolledWindow *sw = GTK_SCROLLED_WINDOW(window);
  
- 	int x, y;
  	int modifiers = 0;
- 
- 
- 
  	if (event->state & GDK_SHIFT_MASK) modifiers |= shiftBIT;
  	if (event->state & GDK_CONTROL_MASK) modifiers |= ctrlBIT;
  	if (event->state & GDK_MOD1_MASK) modifiers |= altBIT;
  
- 	x = gtk_scrolled_window_get_hadjustment (sw)->value + event->x;
- 	y = gtk_scrolled_window_get_vadjustment (sw)->value + event->y;
- 
  	if (bInDragMode)
! 		handleWindowMouse(window,evMouseDrag,x,y,modifiers);
  	else
! 		handleWindowMouse(window,evMouseMove,x,y,modifiers);
  
  	return gtk_true();
--- 131,144 ----
  {
  	GtkWidget *window = (GtkWidget *) user_data;
  
  	int modifiers = 0;
  	if (event->state & GDK_SHIFT_MASK) modifiers |= shiftBIT;
  	if (event->state & GDK_CONTROL_MASK) modifiers |= ctrlBIT;
  	if (event->state & GDK_MOD1_MASK) modifiers |= altBIT;
  
  	if (bInDragMode)
! 		handleWindowMouse(window,evMouseDrag,event->x,event->y,modifiers);
  	else
! 		handleWindowMouse(window,evMouseMove,event->x,event->y,modifiers);
  
  	return gtk_true();

[htoolkit-cvs] gio makefile,1.15,1.16

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

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

Modified Files:
	makefile 
Log Message:
bugfix


Index: makefile
===================================================================
RCS file: /cvsroot/htoolkit/gio/makefile,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** makefile	24 Aug 2003 11:44:51 -0000	1.15
--- makefile	6 Oct 2003 19:04:50 -0000	1.16
***************
*** 28,34 ****
  # haskell (H) and C sources
  
! HSOURCES = GIO/Types.hs GIO/Font.hs GIO/Attributes.hs GIO/Layout.hs \
  	   GIO/Bitmap.hs GIO/Canvas.hs \
! 	   GIO/Events.hs GIO/Timer.hs \
  	   GIO/Window.hs GIO/Menu.hs \
  	   GIO/CommonDialogs.hs GIO/Controls.hs \
--- 28,34 ----
  # haskell (H) and C sources
  
! HSOURCES = GIO/Types.hs GIO/Font.hs GIO/Attributes.hs \
  	   GIO/Bitmap.hs GIO/Canvas.hs \
! 	   GIO/Events.hs GIO/Timer.hs GIO/Layout.hs \
  	   GIO/Window.hs GIO/Menu.hs \
  	   GIO/CommonDialogs.hs GIO/Controls.hs \

[htoolkit-cvs] port/src/cbits/GTK Window.c,1.30,1.31

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

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

Modified Files:
	Window.c 
Log Message:
bugfix


Index: Window.c
===================================================================
RCS file: /cvsroot/htoolkit/port/src/cbits/GTK/Window.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** Window.c	2 Oct 2003 22:31:39 -0000	1.30
--- Window.c	6 Oct 2003 17:36:31 -0000	1.31
***************
*** 11,20 ****
  static void getWindowClipRect(GtkWidget *window, GdkRegion *region)
  {
! 	GList *childrens = gtk_container_get_children(GTK_CONTAINER(GTK_BIN(window)->child));
  
! 	while (childrens)
  	{
  		GdkRectangle rectangle;
! 		GtkWidget *widget = (GtkWidget *) childrens->data;
  
  		rectangle.x = widget->allocation.x;
--- 11,20 ----
  static void getWindowClipRect(GtkWidget *window, GdkRegion *region)
  {
! 	GList *children = gtk_container_get_children(GTK_CONTAINER(GTK_BIN(window)->child));
  
! 	while (children)
  	{
  		GdkRectangle rectangle;
! 		GtkWidget *widget = (GtkWidget *) children->data;
  
  		rectangle.x = widget->allocation.x;
***************
*** 24,28 ****
  		gdk_region_subtract(region, gdk_region_rectangle (&rectangle));
  
! 		childrens = childrens->next;
  	}
  }
--- 24,28 ----
  		gdk_region_subtract(region, gdk_region_rectangle (&rectangle));
  
! 		children = g_list_remove(children, widget);
  	}
  }
***************
*** 685,691 ****
  
  	GtkRequisition child_requisition, hscrollbar_requisition, vscrollbar_requisition;
! 	GtkWidget *viewport;
  
! 	viewport = GTK_BIN(window)->child;
  
  	rectangle.x = gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW(window))->value;
--- 685,691 ----
  
  	GtkRequisition child_requisition, hscrollbar_requisition, vscrollbar_requisition;
! 	GtkWidget *layout;
  
! 	layout = GTK_BIN(window)->child;
  
  	rectangle.x = gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW(window))->value;
***************
*** 694,699 ****
  	rectangle.height = window->allocation.height;
  
! 	gtk_widget_size_request(viewport, &child_requisition);
! 
  
  	gtk_widget_size_request(GTK_SCROLLED_WINDOW(window)->hscrollbar, &hscrollbar_requisition);
--- 694,698 ----
  	rectangle.height = window->allocation.height;
  
! 	gtk_widget_size_request(layout, &child_requisition);
  
  	gtk_widget_size_request(GTK_SCROLLED_WINDOW(window)->hscrollbar, &hscrollbar_requisition);
***************
*** 711,715 ****
  	canvas = rmalloc(sizeof(*canvas));
  	memset(canvas, 0, sizeof(*canvas));
! 	canvas->drawable = GDK_DRAWABLE(GTK_BIN(viewport)->child->window);
  	canvas->region = gdk_region_rectangle(&rectangle);
  	canvas->buffered = 0;
--- 710,714 ----
  	canvas = rmalloc(sizeof(*canvas));
  	memset(canvas, 0, sizeof(*canvas));
! 	canvas->drawable = GDK_DRAWABLE(PORT_LAYOUT(layout)->bin_window);
  	canvas->region = gdk_region_rectangle(&rectangle);
  	canvas->buffered = 0;

[htoolkit-cvs] port/src/cbits/GTK EditBox.c,1.11,1.12

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

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

Modified Files:
	EditBox.c 
Log Message:
bugfix


Index: EditBox.c
===================================================================
RCS file: /cvsroot/htoolkit/port/src/cbits/GTK/EditBox.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** EditBox.c	2 Oct 2003 22:31:39 -0000	1.11
--- EditBox.c	4 Oct 2003 22:25:02 -0000	1.12
***************
*** 8,11 ****
--- 8,12 ----
  
  	entry = gtk_entry_new();
+ 	GTK_ENTRY(entry)->is_cell_renderer = TRUE;
  	port_layout_put(PORT_LAYOUT(GTK_BIN(window)->child), entry);
  	gtk_widget_show(entry);

[htoolkit-cvs] port/src/cbits/GTK GroupBox.c,1.3,1.4 Notebook.c,1.6,1.7

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

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

Modified Files:
	GroupBox.c Notebook.c 
Log Message:
bugfix


Index: GroupBox.c
===================================================================
RCS file: /cvsroot/htoolkit/port/src/cbits/GTK/GroupBox.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** GroupBox.c	1 Oct 2003 22:29:59 -0000	1.3
--- GroupBox.c	4 Oct 2003 17:04:48 -0000	1.4
***************
*** 20,29 ****
  	GtkRequisition requisition;
  
! 	gtk_widget_size_request (groupbox, &requisition);
  
  	res[0] = 0;
  	res[1] = 0;
! 	res[2] = requisition.width;
! 	res[3] = requisition.height;
  }
  
--- 20,30 ----
  	GtkRequisition requisition;
  
!  	gtk_widget_size_request (GTK_FRAME(groupbox)->label_widget, &requisition);
  
  	res[0] = 0;
  	res[1] = 0;
! 	res[2] = (GTK_CONTAINER (groupbox)->border_width + GTK_WIDGET (groupbox)->style->xthickness) * 2;
! 	res[3] = MAX (0, requisition.height - GTK_WIDGET (groupbox)->style->xthickness) +
!                                     (GTK_CONTAINER (groupbox)->border_width + GTK_WIDGET (groupbox)->style->ythickness) * 2;
  }
  

Index: Notebook.c
===================================================================
RCS file: /cvsroot/htoolkit/port/src/cbits/GTK/Notebook.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Notebook.c	1 Oct 2003 22:09:00 -0000	1.6
--- Notebook.c	4 Oct 2003 17:04:48 -0000	1.7
***************
*** 29,44 ****
  };
  
! void osGetNotebookReqSize(WindowHandle notebook, int *res)
  {
! 	GtkRequisition requisition;
  
! 	// The size requisition of PortLayout is always 0. That means that the size request of notebook
! 	// will be equal to the external size of the notebook (i.e. the size consumed from borders and from
! 	// page labels. This is exactly what we need. In the haskell world to the external size is added
! 	// the size required to fit the pages of the notebook.
! 	gtk_widget_size_request (notebook, &requisition);
  
! 	res[0] = requisition.width;
! 	res[1] = requisition.height;
  }
  
--- 29,79 ----
  };
  
! void osGetNotebookReqSize(WindowHandle widget, int *res)
  {
! 	GtkWidget *page, *label;
! 	GList *children;
! 	GtkRequisition child_requisition;
! 	gint focus_width;
! 	gint tab_width, tab_height;
! 	GtkNotebook *notebook = GTK_NOTEBOOK (widget);
  
! 	gtk_widget_style_get (widget, "focus-line-width", &focus_width, NULL);
  
! 	tab_width  = 0;
! 	tab_height = 0;
! 
! 	children = gtk_container_get_children(GTK_CONTAINER(notebook));
! 	while (children)
! 	{
! 		page = children->data;
! 
! 		if (GTK_WIDGET_VISIBLE (page))
! 		{
! 			label = gtk_notebook_get_tab_label(notebook, page);
! 			gtk_widget_size_request (label, &child_requisition);
! 
! 			child_requisition.width  += 2 * widget->style->xthickness;
! 			child_requisition.height += 2 * widget->style->ythickness;
! 
! 			switch (notebook->tab_pos)
! 			{
! 			case GTK_POS_TOP:
! 			case GTK_POS_BOTTOM:
! 				child_requisition.height += 2 * (notebook->tab_vborder + focus_width);
! 				tab_height = MAX (tab_height, child_requisition.height);
! 				break;
! 			case GTK_POS_LEFT:
! 			case GTK_POS_RIGHT:
! 				child_requisition.width += 2 * (notebook->tab_hborder + focus_width);
! 				tab_width = MAX (tab_width, child_requisition.width);
! 				break;
! 			}
! 		}
! 
! 		children = g_list_remove(children, page);
! 	}
! 
! 	res[0] = (widget->style->xthickness + GTK_CONTAINER (widget)->border_width) * 2 + tab_width;
! 	res[1] = (widget->style->ythickness + GTK_CONTAINER (widget)->border_width) * 2 + tab_height;
  }
  

[htoolkit-cvs] port/src/cbits/Win32 Window.c,1.48,1.49

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

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

Modified Files:
	Window.c 
Log Message:
be sure that the dialog is visible before running


Index: Window.c
===================================================================
RCS file: /cvsroot/htoolkit/port/src/cbits/Win32/Window.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** Window.c	4 Oct 2003 14:09:10 -0000	1.48
--- Window.c	4 Oct 2003 14:45:06 -0000	1.49
***************
*** 989,992 ****
--- 989,993 ----
      MSG msg;
      
+ 	ShowWindow(window, SW_SHOW);
      SetActiveWindow(window);
      EnableWindow(GetWindow(window, GW_OWNER), FALSE);

[htoolkit-cvs] port/src/cbits/Win32 Window.c,1.47,1.48

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

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

Modified Files:
	Window.c 
Log Message:
Bugfix


Index: Window.c
===================================================================
RCS file: /cvsroot/htoolkit/port/src/cbits/Win32/Window.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** Window.c	1 Sep 2003 20:27:49 -0000	1.47
--- Window.c	4 Oct 2003 14:09:10 -0000	1.48
***************
*** 1319,1343 ****
    RECT rc;
    LONG style;
    FrameData *pFrameData = (FrameData *) GetWindowLong(ghWndFrame,GWL_USERDATA);
    
!   if (pFrameData->DocumentInterface == 1)
!   	hwnd = ghWndFrame;
    	
!   style = GetWindowLong(hwnd, GWL_STYLE );
    if (resizeable) style |= WS_THICKFRAME;
              else  style &= ~WS_THICKFRAME;
!   SetWindowLong(hwnd, GWL_STYLE, style );
  
!   if (hwnd == ghWndFrame)
!   {
!   	GetWindowRect(hwnd,&rc);
!   	SetWindowPos(ghWndFrame,NULL,rc.left,rc.top,rc.right-rc.left,rc.bottom-rc.top,SWP_NOZORDER | SWP_FRAMECHANGED);
!   }
!   else
!   {
!   	GetClientRect(hwnd,&rc);
!   	handleWindowResize(hwnd,rc.right-rc.left,rc.bottom-rc.top);
!   	handleContainerReLayout(hwnd);
!   }
  }
  
--- 1319,1340 ----
    RECT rc;
    LONG style;
+   HWND hTargetWnd;
    FrameData *pFrameData = (FrameData *) GetWindowLong(ghWndFrame,GWL_USERDATA);
    
!   hTargetWnd = hwnd;
!   if (pFrameData->DocumentInterface == 1 && GetParent(hwnd) == ghWndFrame)
!   	hTargetWnd = ghWndFrame;
    	
!   style = GetWindowLong(hTargetWnd, GWL_STYLE);
    if (resizeable) style |= WS_THICKFRAME;
              else  style &= ~WS_THICKFRAME;
!   SetWindowLong(hTargetWnd, GWL_STYLE, style);
  
!   GetWindowRect(hTargetWnd,&rc);
!   SetWindowPos(hTargetWnd,NULL,rc.left,rc.top,rc.right-rc.left,rc.bottom-rc.top,SWP_NOZORDER | SWP_FRAMECHANGED);
! 
!   GetClientRect(hwnd,&rc);
!   handleWindowResize(hwnd,rc.right-rc.left,rc.bottom-rc.top);
!   handleContainerReLayout(hwnd);
  }
  

[htoolkit-cvs] port/src/cbits/Win32 Frame.c,1.16,1.17

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

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

Modified Files:
	Frame.c 
Log Message:
bugfix


Index: Frame.c
===================================================================
RCS file: /cvsroot/htoolkit/port/src/cbits/Win32/Frame.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Frame.c	27 Aug 2003 08:16:53 -0000	1.16
--- Frame.c	4 Oct 2003 09:58:36 -0000	1.17
***************
*** 115,119 ****
  				if (handle->type & (MENU_RADIO_ITEM | MENU_CHECK_ITEM))
  					osSetMenuItemChecked(handle, TRUE);
! 				handleMenuCommand(handle);				
  			}
  		}
--- 115,120 ----
  				if (handle->type & (MENU_RADIO_ITEM | MENU_CHECK_ITEM))
  					osSetMenuItemChecked(handle, TRUE);
! 				else
! 					handleMenuCommand(handle);				
  			}
  		}

[htoolkit-cvs] port/src/cbits/Win32 Menu.c,1.16,1.17

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

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

Modified Files:
	Menu.c 
Log Message:
bugfix


Index: Menu.c
===================================================================
RCS file: /cvsroot/htoolkit/port/src/cbits/Win32/Menu.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Menu.c	24 Aug 2003 19:28:57 -0000	1.16
--- Menu.c	4 Oct 2003 09:53:44 -0000	1.17
***************
*** 229,236 ****
  	
  	CHECK_MENU_TYPE(parent, MENU_SUBMENU | MENU_POPUP, NULL);
- 
  	pFrameData = (FrameData *) GetWindowLong(ghWndFrame,GWL_USERDATA);
  	handle = newMenuHandle(pFrameData->pMenuHandlesMap, parent, MENU_RADIO_ITEM, pos);
- 	
  	if (handle)
  	{
--- 229,234 ----
***************
*** 239,247 ****
  		mii.wID    = handle->id;
  		mii.fState = MFS_ENABLED;
! 		mii.fType  = MFT_RADIOCHECK;
  		InsertMenuItem(getParentHMENU(handle),getMenuPos(pFrameData->pMenuHandlesMap, handle),TRUE,&mii);
  		updateMenuBar(parent);
  	}
- 	
  	return handle;
  };
--- 237,246 ----
  		mii.wID    = handle->id;
  		mii.fState = MFS_ENABLED;
! 		mii.fType  = MFT_RADIOCHECK | MFT_STRING;
! 		mii.dwTypeData = (DWORD) "";
! 		mii.cch    = 0;
  		InsertMenuItem(getParentHMENU(handle),getMenuPos(pFrameData->pMenuHandlesMap, handle),TRUE,&mii);
  		updateMenuBar(parent);
  	}
  	return handle;
  };

[htoolkit-cvs] port/src/cbits/Win32 DockBar.c,1.6,1.7

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

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

Modified Files:
	DockBar.c 
Log Message:
bugfix


Index: DockBar.c
===================================================================
RCS file: /cvsroot/htoolkit/port/src/cbits/Win32/DockBar.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** DockBar.c	27 Aug 2003 08:22:13 -0000	1.6
--- DockBar.c	4 Oct 2003 09:24:22 -0000	1.7
***************
*** 89,95 ****
  void RelayoutFrameBars()
  {
! 	RECT rect;	
! 	FrameData *pData = (FrameData *) GetWindowLong(ghWndFrame,GWL_USERDATA);
  	int nWidth, nHeight, nLeft, nTop, nRight, nBottom;
  	
  	GetClientRect(ghWndFrame, &rect);
--- 89,100 ----
  void RelayoutFrameBars()
  {
! 	RECT rect;
! 	FrameData *pData;
  	int nWidth, nHeight, nLeft, nTop, nRight, nBottom;
+ 
+ 	if (!ghWndFrame)
+ 		return NULL;
+ 
+ 	pData = (FrameData *) GetWindowLong(ghWndFrame,GWL_USERDATA);
  	
  	GetClientRect(ghWndFrame, &rect);

[htoolkit-cvs] gio/src/examples/worm Main.hs,1.8,1.9

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

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

Modified Files:
	Main.hs 
Log Message:
update


Index: Main.hs
===================================================================
RCS file: /cvsroot/htoolkit/gio/src/examples/worm/Main.hs,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Main.hs	15 Aug 2003 21:24:55 -0000	1.8
--- Main.hs	4 Oct 2003 08:34:24 -0000	1.9
***************
*** 133,137 ****
          DecreaseLevel -> switchLevel state1
          Collide       -> nextLife state
!         _             -> drawInWindow UnBuffered w (drawStep state state1)
          where
              switchLevel :: State -> IO ()
--- 133,137 ----
          DecreaseLevel -> switchLevel state1
          Collide       -> nextLife state
!         _             -> paintIn w UnBuffered (drawStep state state1)
          where
              switchLevel :: State -> IO ()
***************
*** 147,151 ****
                              set tm [on command =: betweenLevels 2 1]
                          | animationStep<=nrAnimationSteps = do
!                             drawInWindow UnBuffered w 
                                  (drawAnimation animationStep step)
                              set tm [on command =: betweenLevels (animationStep+step) step]
--- 147,151 ----
                              set tm [on command =: betweenLevels 2 1]
                          | animationStep<=nrAnimationSteps = do
!                             paintIn w UnBuffered
                                  (drawAnimation animationStep step)
                              set tm [on command =: betweenLevels (animationStep+step) step]
***************
*** 169,173 ****
                          deadWorm :: Worm -> IO ()
                          deadWorm (segment:rest) = do
!                             drawInWindow UnBuffered w (eraseSegment segment)
                              set tm [on command =: deadWorm rest]
                          deadWorm [] = do
--- 169,173 ----
                          deadWorm :: Worm -> IO ()
                          deadWorm (segment:rest) = do
!                             paintIn w UnBuffered (eraseSegment segment)
                              set tm [on command =: deadWorm rest]
                          deadWorm [] = do

[htoolkit-cvs] gio/src/examples/picture Main.hs,1.1,1.2

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

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

Modified Files:
	Main.hs 
Log Message:
update


Index: Main.hs
===================================================================
RCS file: /cvsroot/htoolkit/gio/src/examples/picture/Main.hs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Main.hs	1 Jun 2003 15:45:48 -0000	1.1
--- Main.hs	4 Oct 2003 08:34:24 -0000	1.2
***************
*** 84,88 ****
  	
  	mfile  <- menu [title =: "&File"] mainMenu
! 	mopen  <- menuitem [title =: "&Open",  accel =: KeyChar '\^O', menuicon =: Just bmpOpen] mfile
  	mclose <- menuitem [title =: "&Close", enabled=:False] mfile
  	menuline mfile
--- 84,88 ----
  	
  	mfile  <- menu [title =: "&File"] mainMenu
! 	mopen  <- menuitem [title =: "&Open",  accel =: KeyChar '\^O', icon =: Just bmpOpen] mfile
  	mclose <- menuitem [title =: "&Close", enabled=:False] mfile
  	menuline mfile
***************
*** 111,122 ****
  								
  					mpic  <- menu [title =: "&Picture"] mainMenu
! 					menuitem [title =: "Rotate Left",  accel =: KeyChar '\^L', menuicon =: Just bmpRLeft,  on command =: onRotatePicture w (-pi/4) ref] mpic
! 					menuitem [title =: "Rotate Right", accel =: KeyChar '\^R', menuicon =: Just bmpRRight, on command =: onRotatePicture w ( pi/4) ref] mpic
  					menuline mpic
! 					menuitem [title =: "ScaleX +", accel =: KeyChar 'X',   menuicon =: Just bmpXPlus,  on command =: onScalePicture w (2  ,1) pic ref] mpic
! 					menuitem [title =: "ScaleX -", accel =: KeyChar '\^X', menuicon =: Just bmpXMinus, on command =: onScalePicture w (0.5,1) pic ref] mpic
  					menuline mpic
! 					menuitem [title =: "ScaleY +", accel =: KeyChar 'Y',   menuicon =: Just bmpYPlus,  on command =: onScalePicture w (1,2  ) pic ref] mpic
! 					menuitem [title =: "ScaleY -", accel =: KeyChar '\^Y', menuicon =: Just bmpYMinus, on command =: onScalePicture w (1,0.5) pic ref] mpic
  
  					set mclose [enabled =: True, on command =: destroyWidget w]
--- 111,122 ----
  								
  					mpic  <- menu [title =: "&Picture"] mainMenu
! 					menuitem [title =: "Rotate Left",  accel =: KeyChar '\^L', icon =: Just bmpRLeft,  on command =: onRotatePicture w (-pi/4) ref] mpic
! 					menuitem [title =: "Rotate Right", accel =: KeyChar '\^R', icon =: Just bmpRRight, on command =: onRotatePicture w ( pi/4) ref] mpic
  					menuline mpic
! 					menuitem [title =: "ScaleX +", accel =: KeyChar 'X',   icon =: Just bmpXPlus,  on command =: onScalePicture w (2  ,1) pic ref] mpic
! 					menuitem [title =: "ScaleX -", accel =: KeyChar '\^X', icon =: Just bmpXMinus, on command =: onScalePicture w (0.5,1) pic ref] mpic
  					menuline mpic
! 					menuitem [title =: "ScaleY +", accel =: KeyChar 'Y',   icon =: Just bmpYPlus,  on command =: onScalePicture w (1,2  ) pic ref] mpic
! 					menuitem [title =: "ScaleY -", accel =: KeyChar '\^Y', icon =: Just bmpYMinus, on command =: onScalePicture w (1,0.5) pic ref] mpic
  
  					set mclose [enabled =: True, on command =: destroyWidget w]