From 5d27c18f65e84294eb2e7f18a0d60374bf6845f9 Mon Sep 17 00:00:00 2001
From: dleijen <none>
Date: Wed, 1 Oct 2003 02:18:52 -0700
Subject: [PATCH] [wxhaskell-from-cvs @ 2003-10-01 09:18:52 by dleijen]

New samples, bumped version to 0.3

darcs-hash:20031001091852-deb31-4b785ba00939014cee5babf98c57f6cc069b86b3.gz
---
 configure         |  4 ++--
 makefile          | 17 +++++++++++------
 wxc/include/wxc.h |  2 +-
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/configure b/configure
index e2eda3d3..1220b41f 100755
--- a/configure
+++ b/configure
@@ -8,12 +8,12 @@
 #  See license.txt for details.
 #------------------------------------------------------------------------
 
-# $Id: configure,v 1.15 2003/09/30 13:38:18 dleijen Exp $
+# $Id: configure,v 1.16 2003/10/01 09:18:52 dleijen Exp $
 
 #--------------------------------------------------------------------
 # Variables
 #--------------------------------------------------------------------
-version="0.2.1"
+version="0.3"
 enablestrip="no"
 enableupx="no"
 withmsc="no"
diff --git a/makefile b/makefile
index dc6b3e45..82de4992 100644
--- a/makefile
+++ b/makefile
@@ -4,7 +4,7 @@
 #  See "license.txt" for more details.
 #-----------------------------------------------------------------------
 
-# $Id: makefile,v 1.35 2003/09/30 13:38:18 dleijen Exp $
+# $Id: makefile,v 1.36 2003/10/01 09:18:52 dleijen Exp $
 
 #--------------------------------------------------------------------------
 # make [all]	 - build the libraries (in "lib").
@@ -173,7 +173,6 @@ WXHASKELL-SOURCES= \
 	bin/wxhaskell-register.bat bin/wxhaskell-uninstall.bat
 
 SAMPLE-SOURCES= \
-	samples/wx/Camels.hs samples/wx/desert.bmp \
 	samples/wx/BouncingBalls.hs \
 	samples/wx/ByeDemo.hs \
 	samples/wx/Controls.hs \
@@ -181,7 +180,7 @@ SAMPLE-SOURCES= \
 	samples/wx/Layout.hs \
 	samples/wx/Minimal.hs \
 	samples/wx/Process.hs \
-	samples/wx/Paint.hs samples/wx/PaintDirect.hs \
+	samples/wx/Paint.hs \
 	samples/wx/ImageViewer.hs \
 	samples/wx/TimeFlows.hs \
 	samples/wx/TimeFlowsEx.hs \
@@ -192,7 +191,7 @@ SAMPLE-SOURCES= \
 	samples/wxcore/HelloWorld.hs \
 	samples/wxcore/Minimal.hs \
 	samples/wxcore/Paint.hs \
-	samples/wxcore/ImageViewer.hs samples/wxcore/ImageViewer.ico \
+	samples/wxcore/ImageViewer.hs \
 	\
 	samples/bitmaps/computer.ico \
 	samples/bitmaps/disk.ico \
@@ -203,8 +202,14 @@ SAMPLE-SOURCES= \
 	samples/bitmaps/fileopen16.png \
 	samples/bitmaps/hsicon.ico \
 	samples/bitmaps/wxwin16.png \
-	samples/bitmaps/wxwin.ico
-
+	samples/bitmaps/wxwin.ico \
+	samples/bitmaps/desert.bmp \
+	\
+	samples/contrib/Camels.hs \
+	samples/contrib/PaintDirect.hs \
+	samples/contrib/NotebookRight.hs \
+	
+	
 #--------------------------------------------------------------------------
 # Functions  ($(1) means first argument etc.)
 #--------------------------------------------------------------------------
diff --git a/wxc/include/wxc.h b/wxc/include/wxc.h
index fcad87d2..c32fc769 100644
--- a/wxc/include/wxc.h
+++ b/wxc/include/wxc.h
@@ -319,7 +319,7 @@ int wxColour_GetInt( TSelf(wxColour) colour);
 /* basic pixel manipulation */
 void wxcSetPixelRGB( void* buffer, int width, TPoint(x,y), int rgb  );
 int  wxcGetPixelRGB( void* buffer, int width, TPoint(x,y) );
-void wxcSetPixelRowRGB( void* buffer, int width, TPoint(x,y), int rgb0, int rgb1, int count );
+void wxcSetPixelRowRGB( void* buffer, int width, TPoint(x,y), int rgbStart, int rgbEnd, int count );
 void wxcInitPixelsRGB( void* buffer, TSize(width,height), int rgb );
 
 /* malloc/free */