Skip to content

Commit

Permalink
[wxhaskell-from-cvs @ 2003-10-01 09:18:52 by dleijen]
Browse files Browse the repository at this point in the history
New samples, bumped version to 0.3

darcs-hash:20031001091852-deb31-4b785ba00939014cee5babf98c57f6cc069b86b3.gz
  • Loading branch information
dleijen committed Oct 1, 2003
1 parent 698a473 commit 5d27c18
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 9 deletions.
4 changes: 2 additions & 2 deletions configure
Expand Up @@ -8,12 +8,12 @@
# See license.txt for details. # 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 # Variables
#-------------------------------------------------------------------- #--------------------------------------------------------------------
version="0.2.1" version="0.3"
enablestrip="no" enablestrip="no"
enableupx="no" enableupx="no"
withmsc="no" withmsc="no"
Expand Down
17 changes: 11 additions & 6 deletions makefile
Expand Up @@ -4,7 +4,7 @@
# See "license.txt" for more details. # 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"). # make [all] - build the libraries (in "lib").
Expand Down Expand Up @@ -173,15 +173,14 @@ WXHASKELL-SOURCES= \
bin/wxhaskell-register.bat bin/wxhaskell-uninstall.bat bin/wxhaskell-register.bat bin/wxhaskell-uninstall.bat


SAMPLE-SOURCES= \ SAMPLE-SOURCES= \
samples/wx/Camels.hs samples/wx/desert.bmp \
samples/wx/BouncingBalls.hs \ samples/wx/BouncingBalls.hs \
samples/wx/ByeDemo.hs \ samples/wx/ByeDemo.hs \
samples/wx/Controls.hs \ samples/wx/Controls.hs \
samples/wx/HelloWorld.hs \ samples/wx/HelloWorld.hs \
samples/wx/Layout.hs \ samples/wx/Layout.hs \
samples/wx/Minimal.hs \ samples/wx/Minimal.hs \
samples/wx/Process.hs \ samples/wx/Process.hs \
samples/wx/Paint.hs samples/wx/PaintDirect.hs \ samples/wx/Paint.hs \
samples/wx/ImageViewer.hs \ samples/wx/ImageViewer.hs \
samples/wx/TimeFlows.hs \ samples/wx/TimeFlows.hs \
samples/wx/TimeFlowsEx.hs \ samples/wx/TimeFlowsEx.hs \
Expand All @@ -192,7 +191,7 @@ SAMPLE-SOURCES= \
samples/wxcore/HelloWorld.hs \ samples/wxcore/HelloWorld.hs \
samples/wxcore/Minimal.hs \ samples/wxcore/Minimal.hs \
samples/wxcore/Paint.hs \ samples/wxcore/Paint.hs \
samples/wxcore/ImageViewer.hs samples/wxcore/ImageViewer.ico \ samples/wxcore/ImageViewer.hs \
\ \
samples/bitmaps/computer.ico \ samples/bitmaps/computer.ico \
samples/bitmaps/disk.ico \ samples/bitmaps/disk.ico \
Expand All @@ -203,8 +202,14 @@ SAMPLE-SOURCES= \
samples/bitmaps/fileopen16.png \ samples/bitmaps/fileopen16.png \
samples/bitmaps/hsicon.ico \ samples/bitmaps/hsicon.ico \
samples/bitmaps/wxwin16.png \ 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.) # Functions ($(1) means first argument etc.)
#-------------------------------------------------------------------------- #--------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion wxc/include/wxc.h
Expand Up @@ -319,7 +319,7 @@ int wxColour_GetInt( TSelf(wxColour) colour);
/* basic pixel manipulation */ /* basic pixel manipulation */
void wxcSetPixelRGB( void* buffer, int width, TPoint(x,y), int rgb ); void wxcSetPixelRGB( void* buffer, int width, TPoint(x,y), int rgb );
int wxcGetPixelRGB( void* buffer, int width, TPoint(x,y) ); 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 ); void wxcInitPixelsRGB( void* buffer, TSize(width,height), int rgb );


/* malloc/free */ /* malloc/free */
Expand Down

0 comments on commit 5d27c18

Please sign in to comment.