From 4cb122de97b40f0b6c8896f40847a7aaf762abb5 Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Fri, 13 Aug 1999 14:21:06 +0000 Subject: [PATCH] Compile fixes, Big-endian fix for image.cpp (Untested, I have no sparc) Make dist works (more or less) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3368 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 108 ++++++++++++++++++++++++++++++++++------ distrib/msw/tmake/unx.t | 106 ++++++++++++++++++++++++++++++++++----- samples/image/image.cpp | 11 ++-- src/common/image.cpp | 3 +- src/common/parser.y | 2 +- src/gtk/font.cpp | 1 + src/gtk/utilsres.cpp | 1 + src/gtk1/font.cpp | 1 + src/gtk1/utilsres.cpp | 1 + 9 files changed, 199 insertions(+), 35 deletions(-) diff --git a/Makefile.in b/Makefile.in index 53ae68c8f9..ea7706a8d2 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,6 +1,6 @@ # -# This file was automatically generated by tmake at 11:22, 1999/08/13 +# This file was automatically generated by tmake at 14:38, 1999/08/13 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNX.T! # @@ -88,17 +88,19 @@ WXDIR = $(top_srcdir) # Subordinate library possibilities -GENDIR = $(WXDIR)/src/generic -COMMDIR = $(WXDIR)/src/common -HTMLDIR = $(WXDIR)/src/html -UNIXDIR = $(WXDIR)/src/unix -PNGDIR = $(WXDIR)/src/png -JPEGDIR = $(WXDIR)/src/jpeg -ZLIBDIR = $(WXDIR)/src/zlib -GTKDIR = $(WXDIR)/src/gtk +SRCDIR = $(WXDIR)/src +GENDIR = $(WXDIR)/src/generic +COMMDIR = $(WXDIR)/src/common +HTMLDIR = $(WXDIR)/src/html +UNIXDIR = $(WXDIR)/src/unix +PNGDIR = $(WXDIR)/src/png +JPEGDIR = $(WXDIR)/src/jpeg +ZLIBDIR = $(WXDIR)/src/zlib +GTKDIR = $(WXDIR)/src/gtk MOTIFDIR = $(WXDIR)/src/motif -MSWDIR = $(WXDIR)/src/msw -INCDIR = $(WXDIR)/include +MSWDIR = $(WXDIR)/src/msw +INCDIR = $(WXDIR)/include +SAMPDIR = $(WXDIR)/samples DOCDIR = $(WXDIR)/docs @@ -1322,7 +1324,7 @@ uninstall: @if test -d $(includedir)/wx/protocol; then rmdir $(includedir)/wx/protocol; fi @if test -d $(includedir)/wx; then rmdir $(includedir)/wx; fi -predist: +ALL_DIST: mkdir _dist_dir mkdir $(DISTDIR) cp $(WXDIR)/wx$(TOOLKIT).spec $(DISTDIR) @@ -1355,21 +1357,99 @@ predist: cp $(INCDIR)/wx/html/*.h $(DISTDIR)/include/wx/html cp $(INCDIR)/wx/unix/*.h $(DISTDIR)/include/wx/unix cp $(INCDIR)/wx/protocol/*.h $(DISTDIR)/include/wx/protocol + mkdir $(DISTDIR)/src + mkdir $(DISTDIR)/src/common + mkdir $(DISTDIR)/src/generic + mkdir $(DISTDIR)/src/html + mkdir $(DISTDIR)/src/html/bitmaps + mkdir $(DISTDIR)/src/$(TOOLKITDIR) + mkdir $(DISTDIR)/src/unix + mkdir $(DISTDIR)/src/png + mkdir $(DISTDIR)/src/jpeg + mkdir $(DISTDIR)/src/zlib + cp $(SRCDIR)/*.in $(DISTDIR)/src + cp $(COMMDIR)/*.cpp $(DISTDIR)/src/common + cp $(COMMDIR)/*.c $(DISTDIR)/src/common + cp $(COMMDIR)/*.inc $(DISTDIR)/src/common + cp $(COMMDIR)/*.l $(DISTDIR)/src/common + cp $(COMMDIR)/*.h $(DISTDIR)/src/common + cp $(COMMDIR)/*.y $(DISTDIR)/src/common + cp $(GENDIR)/*.cpp $(DISTDIR)/src/generic + cp $(HTMLDIR)/*.cpp $(DISTDIR)/src/html + cp $(HTMLDIR)/*.h $(DISTDIR)/src/html + cp $(HTMLDIR)/bitmaps/*.xpm $(DISTDIR)/src/html/bitmaps + cp $(UNIXDIR)/*.h $(DISTDIR)/src/unix + cp $(UNIXDIR)/*.c $(DISTDIR)/src/unix + cp $(UNIXDIR)/*.cpp $(DISTDIR)/src/unix + cp $(PNGDIR)/*.h $(DISTDIR)/src/png + cp $(PNGDIR)/*.c $(DISTDIR)/src/png + cp $(PNGDIR)/README $(DISTDIR)/src/png + cp $(ZLIBDIR)/*.h $(DISTDIR)/src/zlib + cp $(ZLIBDIR)/*.c $(DISTDIR)/src/zlib + cp $(ZLIBDIR)/README $(DISTDIR)/src/zlib + cp $(JPEGDIR)/*.h $(DISTDIR)/src/jpeg + cp $(JPEGDIR)/*.c $(DISTDIR)/src/jpeg + cp $(JPEGDIR)/README $(DISTDIR)/src/jpeg GTK_DIST: + cp $(WXDIR)/wxGTK.spec $(DISTDIR) cp $(INCDIR)/wx/gtk/*.h $(DISTDIR)/include/wx/gtk + cp $(INCDIR)/wx/gtk/*.xpm $(DISTDIR)/include/wx/gtk + cp $(GTKDIR)/*.cpp $(DISTDIR)/src/gtk + cp $(GTKDIR)/*.c $(DISTDIR)/src/gtk + cp $(GTKDIR)/*.xbm $(DISTDIR)/src/gtk MOTIF_DIST: + cp $(WXDIR)/wxMOTIF.spec $(DISTDIR) cp $(INCDIR)/wx/motif/*.h $(DISTDIR)/include/wx/motif + cp $(MOTIFDIR)/*.cpp $(DISTDIR)/src/motif + cp $(MOTIFDIR)/*.xbm $(DISTDIR)/src/motif + mkdir $(DISTDIR)/src/motif/xmcombo + cp $(MOTIFDIR)/xmcombo/*.c $(DISTDIR)/src/motif/xmcombo + cp $(MOTIFDIR)/xmcombo/*.h $(DISTDIR)/src/motif/xmcombo + cp $(MOTIFDIR)/xmcombo/copying.txt $(DISTDIR)/src/motif/xmcombo MSW_DIST: + cp $(WXDIR)/wxWINE.spec $(DISTDIR) cp $(INCDIR)/wx/msw/*.h $(DISTDIR)/include/wx/msw cp $(INCDIR)/wx/msw/*.cur $(DISTDIR)/include/wx/msw cp $(INCDIR)/wx/msw/*.ico $(DISTDIR)/include/wx/msw cp $(INCDIR)/wx/msw/*.bmp $(DISTDIR)/include/wx/msw cp $(INCDIR)/wx/msw/*.rc $(DISTDIR)/include/wx/msw - -dist: predist @GUIDIST@ + cp $(MSWDIR)/*.cpp $(DISTDIR)/src/msw + cp $(MSWDIR)/*.c $(DISTDIR)/src/msw + cp $(MSWDIR)/*.def $(DISTDIR)/src/msw + mkdir $(DISTDIR)/src/msw/ole + cp $(MSWDIR)/ole/*.cpp $(DISTDIR)/src/msw/ole + +SAMPLES_DIST: + mkdir $(DISTDIR)/samples + cp $(SAMPDIR)/Makefile.in $(DISTDIR)/samples + mkdir $(DISTDIR)/samples/bombs + cp $(SAMPDIR)/bombs/Makefile.in $(DISTDIR)/samples/bombs + cp $(SAMPDIR)/bombs/*.cpp $(DISTDIR)/samples/bombs + cp $(SAMPDIR)/bombs/*.h $(DISTDIR)/samples/bombs + cp $(SAMPDIR)/bombs/*.xpm $(DISTDIR)/samples/bombs + cp $(SAMPDIR)/bombs/readme.txt $(DISTDIR)/samples/bombs + mkdir $(DISTDIR)/samples/caret + cp $(SAMPDIR)/caret/Makefile.in $(DISTDIR)/samples/caret + cp $(SAMPDIR)/caret/*.cpp $(DISTDIR)/samples/caret + cp $(SAMPDIR)/caret/*.xpm $(DISTDIR)/samples/caret + mkdir $(DISTDIR)/samples/config + cp $(SAMPDIR)/config/Makefile.in $(DISTDIR)/samples/config + cp $(SAMPDIR)/config/*.cpp $(DISTDIR)/samples/config + mkdir $(DISTDIR)/samples/controls + mkdir $(DISTDIR)/samples/controls/icons + cp $(SAMPDIR)/controls/Makefile.in $(DISTDIR)/samples/controls + cp $(SAMPDIR)/controls/*.cpp $(DISTDIR)/samples/controls + cp $(SAMPDIR)/controls/*.xpm $(DISTDIR)/samples/controls + cp $(SAMPDIR)/controls/icons/*.??? $(DISTDIR)/samples/controls/icons + mkdir $(DISTDIR)/samples/checklst + cp $(SAMPDIR)/checklst/Makefile.in $(DISTDIR)/samples/checklst + cp $(SAMPDIR)/checklst/*.cpp $(DISTDIR)/samples/checklst + cp $(SAMPDIR)/checklst/*.xpm $(DISTDIR)/samples/checklst + +dist: ALL_DIST @GUIDIST@ SAMPLES_DIST cd _dist_dir; tar ch wx$(TOOLKIT) | gzip -f9 > $(WXARCHIVE); mv $(WXARCHIVE) .. rm -f -r _dist_dir diff --git a/distrib/msw/tmake/unx.t b/distrib/msw/tmake/unx.t index 44b8c227b4..0a1ba7ae7e 100644 --- a/distrib/msw/tmake/unx.t +++ b/distrib/msw/tmake/unx.t @@ -224,17 +224,19 @@ WXDIR = $(top_srcdir) # Subordinate library possibilities -GENDIR = $(WXDIR)/src/generic -COMMDIR = $(WXDIR)/src/common -HTMLDIR = $(WXDIR)/src/html -UNIXDIR = $(WXDIR)/src/unix -PNGDIR = $(WXDIR)/src/png -JPEGDIR = $(WXDIR)/src/jpeg -ZLIBDIR = $(WXDIR)/src/zlib -GTKDIR = $(WXDIR)/src/gtk +SRCDIR = $(WXDIR)/src +GENDIR = $(WXDIR)/src/generic +COMMDIR = $(WXDIR)/src/common +HTMLDIR = $(WXDIR)/src/html +UNIXDIR = $(WXDIR)/src/unix +PNGDIR = $(WXDIR)/src/png +JPEGDIR = $(WXDIR)/src/jpeg +ZLIBDIR = $(WXDIR)/src/zlib +GTKDIR = $(WXDIR)/src/gtk MOTIFDIR = $(WXDIR)/src/motif -MSWDIR = $(WXDIR)/src/msw -INCDIR = $(WXDIR)/include +MSWDIR = $(WXDIR)/src/msw +INCDIR = $(WXDIR)/include +SAMPDIR = $(WXDIR)/samples DOCDIR = $(WXDIR)/docs @@ -532,7 +534,7 @@ uninstall: @if test -d $(includedir)/wx/protocol; then rmdir $(includedir)/wx/protocol; fi @if test -d $(includedir)/wx; then rmdir $(includedir)/wx; fi -predist: +ALL_DIST: mkdir _dist_dir mkdir $(DISTDIR) cp $(WXDIR)/wx$(TOOLKIT).spec $(DISTDIR) @@ -565,21 +567,99 @@ predist: cp $(INCDIR)/wx/html/*.h $(DISTDIR)/include/wx/html cp $(INCDIR)/wx/unix/*.h $(DISTDIR)/include/wx/unix cp $(INCDIR)/wx/protocol/*.h $(DISTDIR)/include/wx/protocol + mkdir $(DISTDIR)/src + mkdir $(DISTDIR)/src/common + mkdir $(DISTDIR)/src/generic + mkdir $(DISTDIR)/src/html + mkdir $(DISTDIR)/src/html/bitmaps + mkdir $(DISTDIR)/src/$(TOOLKITDIR) + mkdir $(DISTDIR)/src/unix + mkdir $(DISTDIR)/src/png + mkdir $(DISTDIR)/src/jpeg + mkdir $(DISTDIR)/src/zlib + cp $(SRCDIR)/*.in $(DISTDIR)/src + cp $(COMMDIR)/*.cpp $(DISTDIR)/src/common + cp $(COMMDIR)/*.c $(DISTDIR)/src/common + cp $(COMMDIR)/*.inc $(DISTDIR)/src/common + cp $(COMMDIR)/*.l $(DISTDIR)/src/common + cp $(COMMDIR)/*.h $(DISTDIR)/src/common + cp $(COMMDIR)/*.y $(DISTDIR)/src/common + cp $(GENDIR)/*.cpp $(DISTDIR)/src/generic + cp $(HTMLDIR)/*.cpp $(DISTDIR)/src/html + cp $(HTMLDIR)/*.h $(DISTDIR)/src/html + cp $(HTMLDIR)/bitmaps/*.xpm $(DISTDIR)/src/html/bitmaps + cp $(UNIXDIR)/*.h $(DISTDIR)/src/unix + cp $(UNIXDIR)/*.c $(DISTDIR)/src/unix + cp $(UNIXDIR)/*.cpp $(DISTDIR)/src/unix + cp $(PNGDIR)/*.h $(DISTDIR)/src/png + cp $(PNGDIR)/*.c $(DISTDIR)/src/png + cp $(PNGDIR)/README $(DISTDIR)/src/png + cp $(ZLIBDIR)/*.h $(DISTDIR)/src/zlib + cp $(ZLIBDIR)/*.c $(DISTDIR)/src/zlib + cp $(ZLIBDIR)/README $(DISTDIR)/src/zlib + cp $(JPEGDIR)/*.h $(DISTDIR)/src/jpeg + cp $(JPEGDIR)/*.c $(DISTDIR)/src/jpeg + cp $(JPEGDIR)/README $(DISTDIR)/src/jpeg GTK_DIST: + cp $(WXDIR)/wxGTK.spec $(DISTDIR) cp $(INCDIR)/wx/gtk/*.h $(DISTDIR)/include/wx/gtk + cp $(INCDIR)/wx/gtk/*.xpm $(DISTDIR)/include/wx/gtk + cp $(GTKDIR)/*.cpp $(DISTDIR)/src/gtk + cp $(GTKDIR)/*.c $(DISTDIR)/src/gtk + cp $(GTKDIR)/*.xbm $(DISTDIR)/src/gtk MOTIF_DIST: + cp $(WXDIR)/wxMOTIF.spec $(DISTDIR) cp $(INCDIR)/wx/motif/*.h $(DISTDIR)/include/wx/motif + cp $(MOTIFDIR)/*.cpp $(DISTDIR)/src/motif + cp $(MOTIFDIR)/*.xbm $(DISTDIR)/src/motif + mkdir $(DISTDIR)/src/motif/xmcombo + cp $(MOTIFDIR)/xmcombo/*.c $(DISTDIR)/src/motif/xmcombo + cp $(MOTIFDIR)/xmcombo/*.h $(DISTDIR)/src/motif/xmcombo + cp $(MOTIFDIR)/xmcombo/copying.txt $(DISTDIR)/src/motif/xmcombo MSW_DIST: + cp $(WXDIR)/wxWINE.spec $(DISTDIR) cp $(INCDIR)/wx/msw/*.h $(DISTDIR)/include/wx/msw cp $(INCDIR)/wx/msw/*.cur $(DISTDIR)/include/wx/msw cp $(INCDIR)/wx/msw/*.ico $(DISTDIR)/include/wx/msw cp $(INCDIR)/wx/msw/*.bmp $(DISTDIR)/include/wx/msw cp $(INCDIR)/wx/msw/*.rc $(DISTDIR)/include/wx/msw - -dist: predist @GUIDIST@ + cp $(MSWDIR)/*.cpp $(DISTDIR)/src/msw + cp $(MSWDIR)/*.c $(DISTDIR)/src/msw + cp $(MSWDIR)/*.def $(DISTDIR)/src/msw + mkdir $(DISTDIR)/src/msw/ole + cp $(MSWDIR)/ole/*.cpp $(DISTDIR)/src/msw/ole + +SAMPLES_DIST: + mkdir $(DISTDIR)/samples + cp $(SAMPDIR)/Makefile.in $(DISTDIR)/samples + mkdir $(DISTDIR)/samples/bombs + cp $(SAMPDIR)/bombs/Makefile.in $(DISTDIR)/samples/bombs + cp $(SAMPDIR)/bombs/*.cpp $(DISTDIR)/samples/bombs + cp $(SAMPDIR)/bombs/*.h $(DISTDIR)/samples/bombs + cp $(SAMPDIR)/bombs/*.xpm $(DISTDIR)/samples/bombs + cp $(SAMPDIR)/bombs/readme.txt $(DISTDIR)/samples/bombs + mkdir $(DISTDIR)/samples/caret + cp $(SAMPDIR)/caret/Makefile.in $(DISTDIR)/samples/caret + cp $(SAMPDIR)/caret/*.cpp $(DISTDIR)/samples/caret + cp $(SAMPDIR)/caret/*.xpm $(DISTDIR)/samples/caret + mkdir $(DISTDIR)/samples/config + cp $(SAMPDIR)/config/Makefile.in $(DISTDIR)/samples/config + cp $(SAMPDIR)/config/*.cpp $(DISTDIR)/samples/config + mkdir $(DISTDIR)/samples/controls + mkdir $(DISTDIR)/samples/controls/icons + cp $(SAMPDIR)/controls/Makefile.in $(DISTDIR)/samples/controls + cp $(SAMPDIR)/controls/*.cpp $(DISTDIR)/samples/controls + cp $(SAMPDIR)/controls/*.xpm $(DISTDIR)/samples/controls + cp $(SAMPDIR)/controls/icons/*.??? $(DISTDIR)/samples/controls/icons + mkdir $(DISTDIR)/samples/checklst + cp $(SAMPDIR)/checklst/Makefile.in $(DISTDIR)/samples/checklst + cp $(SAMPDIR)/checklst/*.cpp $(DISTDIR)/samples/checklst + cp $(SAMPDIR)/checklst/*.xpm $(DISTDIR)/samples/checklst + +dist: ALL_DIST @GUIDIST@ SAMPLES_DIST cd _dist_dir; tar ch wx$(TOOLKIT) | gzip -f9 > $(WXARCHIVE); mv $(WXARCHIVE) .. rm -f -r _dist_dir diff --git a/samples/image/image.cpp b/samples/image/image.cpp index 3fcd095ffb..63e3ab54a7 100644 --- a/samples/image/image.cpp +++ b/samples/image/image.cpp @@ -102,11 +102,14 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id, wxMemoryDC dc; dc.SelectObject( bitmap ); - dc.SetBrush( wxBrush( wxColour(50,100,150), wxSOLID ) ); - dc.SetPen( *wxBLACK_PEN ); + dc.SetBrush( wxBrush( "orange", wxSOLID ) ); + dc.SetPen( *wxWHITE_PEN ); dc.DrawRectangle( 0, 0, 100, 100 ); dc.SelectObject( wxNullBitmap ); + dc.DrawText( "Loaded image", 30, 10 ); + if (my_square && my_square->Ok()) dc.DrawBitmap( *my_square, 30, 30 ); + // try to find the directory with our images wxString dir; if ( wxFile::Exists("./horse.png") ) @@ -118,10 +121,6 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id, wxImage image( bitmap ); - printf( "(1,1) red: %d\n", (int)image.GetRed(2,2) ); - printf( "(1,1) green: %d\n", (int)image.GetGreen(2,2) ); - printf( "(1,1) blue: %d\n", (int)image.GetBlue(2,2) ); - if ( !image.SaveFile( dir + wxString("test.png"), wxBITMAP_TYPE_PNG ) ) wxLogError("Can't save file"); diff --git a/src/common/image.cpp b/src/common/image.cpp index f769be03a4..18d73f4668 100644 --- a/src/common/image.cpp +++ b/src/common/image.cpp @@ -1181,7 +1181,8 @@ wxImage::wxImage( const wxBitmap &bitmap ) { for (int i = 0; i < bitmap.GetWidth(); i++) { - int pixel = gdk_image_get_pixel( gdk_image, i, j ); + wxInt32 pixel = gdk_image_get_pixel( gdk_image, i, j ); + pixel = wxINT32_SWAP_ON_BE( pixel ); if (bpp <= 8) { data[pos] = cmap->colors[pixel].red >> 8; diff --git a/src/common/parser.y b/src/common/parser.y index 65ef760816..f9b8d83d62 100644 --- a/src/common/parser.y +++ b/src/common/parser.y @@ -164,7 +164,7 @@ void yyerror(char *s) #ifndef yywrap #define yywrap() 1 #endif -#else if !defined(__alpha___) && !defined(__ultrix) +#else if !defined(__alpha___) && !defined(__alpha) && !defined(__ultrix) int yywrap() { return 1; } #endif #elif defined(__WX_SETUP_H__) diff --git a/src/gtk/font.cpp b/src/gtk/font.cpp index ceb1255ac4..656f947cc5 100644 --- a/src/gtk/font.cpp +++ b/src/gtk/font.cpp @@ -14,6 +14,7 @@ #include "wx/font.h" #include "wx/utils.h" #include "wx/log.h" +#include "wx/gdicmn.h" #include #include "gdk/gdk.h" diff --git a/src/gtk/utilsres.cpp b/src/gtk/utilsres.cpp index fda2bf5e9d..6082cd387e 100644 --- a/src/gtk/utilsres.cpp +++ b/src/gtk/utilsres.cpp @@ -16,6 +16,7 @@ #include "wx/string.h" #include "wx/list.h" #include "wx/log.h" +#include "wx/gdicmn.h" #include #include diff --git a/src/gtk1/font.cpp b/src/gtk1/font.cpp index ceb1255ac4..656f947cc5 100644 --- a/src/gtk1/font.cpp +++ b/src/gtk1/font.cpp @@ -14,6 +14,7 @@ #include "wx/font.h" #include "wx/utils.h" #include "wx/log.h" +#include "wx/gdicmn.h" #include #include "gdk/gdk.h" diff --git a/src/gtk1/utilsres.cpp b/src/gtk1/utilsres.cpp index fda2bf5e9d..6082cd387e 100644 --- a/src/gtk1/utilsres.cpp +++ b/src/gtk1/utilsres.cpp @@ -16,6 +16,7 @@ #include "wx/string.h" #include "wx/list.h" #include "wx/log.h" +#include "wx/gdicmn.h" #include #include -- 2.45.2