Mirrors_UI_SDK/wxWidgets
1
0
Fork 0
mirror of https://github.com/wxWidgets/wxWidgets.git synced 2026-08-20 22:06:25 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

no real change; just reorganize the sample splitting it in two source files

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58102 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2009-01-14 17:41:21 +00:00
parent 604898dc4a
commit 09ddabf738
14 changed files with 824 additions and 714 deletions
Download Patch File Download Diff File Expand all files Collapse all files
samples/image/Makefile.in
+4
View File
@@ -50,6 +50,7 @@ IMAGE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
IMAGE_OBJECTS = \
$(__image_os2_lib_res) \
image_image.o \
image_canvas.o \
$(__image___win32rc)
### Conditionally set variables: ###
@@ -190,6 +191,9 @@ data:
image_image.o: $(srcdir)/image.cpp
$(CXXC) -c -o $@ $(IMAGE_CXXFLAGS) $(srcdir)/image.cpp
image_canvas.o: $(srcdir)/canvas.cpp
$(CXXC) -c -o $@ $(IMAGE_CXXFLAGS) $(srcdir)/canvas.cpp
image_image_rc.o: $(srcdir)/image.rc
$(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include
samples/image/canvas.cpp
+610
View File
File diff suppressed because it is too large Load Diff
samples/image/canvas.h
+71
View File
@@ -0,0 +1,71 @@
///////////////////////////////////////////////////////////////////////////////
// Name: samples/image/canvas.h
// Purpose: sample showing operations with wxImage
// Author: Robert Roebling
// Modified by: Francesco Montorsi
// Created: 1998
// RCS-ID: $Id$
// Copyright: (c) 1998-2005 Robert Roebling
// License: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
#include "wx/scrolwin.h"
//-----------------------------------------------------------------------------
// MyCanvas
//-----------------------------------------------------------------------------
class MyCanvas: public wxScrolledWindow
{
public:
MyCanvas( wxWindow *parent, wxWindowID, const wxPoint &pos, const wxSize &size );
~MyCanvas();
void OnPaint( wxPaintEvent &event );
void CreateAntiAliasedBitmap();
wxBitmap my_horse_png;
wxBitmap my_horse_jpeg;
wxBitmap my_horse_gif;
wxBitmap my_horse_bmp;
wxBitmap my_horse_bmp2;
wxBitmap my_horse_pcx;
wxBitmap my_horse_pnm;
wxBitmap my_horse_tiff;
wxBitmap my_horse_tga;
wxBitmap my_horse_xpm;
wxBitmap my_horse_ico32;
wxBitmap my_horse_ico16;
wxBitmap my_horse_ico;
wxBitmap my_horse_cur;
wxBitmap my_smile_xbm;
wxBitmap my_square;
wxBitmap my_anti;
wxBitmap my_horse_asciigrey_pnm;
wxBitmap my_horse_rawgrey_pnm;
wxBitmap colorized_horse_jpeg;
wxBitmap my_cmyk_jpeg;
wxBitmap my_toucan;
wxBitmap my_toucan_flipped_horiz;
wxBitmap my_toucan_flipped_vert;
wxBitmap my_toucan_flipped_both;
wxBitmap my_toucan_grey;
wxBitmap my_toucan_head;
wxBitmap my_toucan_scaled_normal;
wxBitmap my_toucan_scaled_high;
wxBitmap my_toucan_blur;
int xH, yH;
int m_ani_images;
wxBitmap *my_horse_ani;
private:
wxBitmap m_bmpSmileXpm;
wxIcon m_iconSmileXpm;
DECLARE_EVENT_TABLE()
};
samples/image/image.bkl
+1 -1
View File
@@ -6,7 +6,7 @@
<include file="../../build/bakefiles/common_samples.bkl"/>
<exe id="image" template="wx_sample" template_append="wx_append">
<sources>image.cpp</sources>
<sources>image.cpp canvas.cpp</sources>
<wx-lib>core</wx-lib>
<wx-lib>base</wx-lib>
<win32-res>image.rc</win32-res>
samples/image/image.cpp
+100 -710
View File
File diff suppressed because it is too large Load Diff
samples/image/image.dsp
+4
View File
@@ -252,6 +252,10 @@ LINK32=link.exe
# PROP Default_Filter ""
# Begin Source File
SOURCE=.\canvas.cpp
# End Source File
# Begin Source File
SOURCE=.\image.cpp
# End Source File
# Begin Source File
samples/image/image_vc7.vcproj
+3
View File
@@ -525,6 +525,9 @@
Name="Source Files"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
RelativePath=".\canvas.cpp">
</File>
<File
RelativePath=".\image.cpp">
</File>
samples/image/image_vc8.vcproj
+4
View File
@@ -787,6 +787,10 @@
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\canvas.cpp"
>
</File>
<File
RelativePath=".\image.cpp"
>
samples/image/image_vc9.vcproj
+4
View File
@@ -759,6 +759,10 @@
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\canvas.cpp"
>
</File>
<File
RelativePath=".\image.cpp"
>
samples/image/makefile.bcc
+5 -1
View File
@@ -35,7 +35,8 @@ IMAGE_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
$(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
-I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
IMAGE_OBJECTS = \
$(OBJS)\image_image.obj
$(OBJS)\image_image.obj \
$(OBJS)\image_canvas.obj
### Conditionally set variables: ###
@@ -240,6 +241,9 @@ data:
$(OBJS)\image_image.obj: .\image.cpp
$(CXX) -q -c -P -o$@ $(IMAGE_CXXFLAGS) .\image.cpp
$(OBJS)\image_canvas.obj: .\canvas.cpp
$(CXX) -q -c -P -o$@ $(IMAGE_CXXFLAGS) .\canvas.cpp
$(OBJS)\image_image.res: .\image.rc
brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\image.rc
samples/image/makefile.gcc
+4
View File
@@ -29,6 +29,7 @@ IMAGE_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
$(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
IMAGE_OBJECTS = \
$(OBJS)\image_image.o \
$(OBJS)\image_canvas.o \
$(OBJS)\image_image_rc.o
### Conditionally set variables: ###
@@ -233,6 +234,9 @@ data:
$(OBJS)\image_image.o: ./image.cpp
$(CXX) -c -o $@ $(IMAGE_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\image_canvas.o: ./canvas.cpp
$(CXX) -c -o $@ $(IMAGE_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\image_image_rc.o: ./image.rc
windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
samples/image/makefile.unx
+5 -1
View File
@@ -57,7 +57,8 @@ WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \
IMAGE_CXXFLAGS = -I. `$(WX_CONFIG) --cxxflags $(WX_CONFIG_FLAGS)` $(CPPFLAGS) \
$(CXXFLAGS)
IMAGE_OBJECTS = \
image_image.o
image_image.o \
image_canvas.o
### Conditionally set variables: ###
@@ -103,6 +104,9 @@ image: $(IMAGE_OBJECTS)
image_image.o: ./image.cpp
$(CXX) -c -o $@ $(IMAGE_CXXFLAGS) $(CPPDEPS) $<
image_canvas.o: ./canvas.cpp
$(CXX) -c -o $@ $(IMAGE_CXXFLAGS) $(CPPDEPS) $<
.PHONY: all install uninstall clean
samples/image/makefile.vc
+4
View File
@@ -30,6 +30,7 @@ IMAGE_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \
$(CPPFLAGS) $(CXXFLAGS)
IMAGE_OBJECTS = \
$(OBJS)\image_image.obj \
$(OBJS)\image_canvas.obj \
$(OBJS)\image_image.res
### Conditionally set variables: ###
@@ -316,6 +317,9 @@ data:
$(OBJS)\image_image.obj: .\image.cpp
$(CXX) /c /nologo /TP /Fo$@ $(IMAGE_CXXFLAGS) .\image.cpp
$(OBJS)\image_canvas.obj: .\canvas.cpp
$(CXX) /c /nologo /TP /Fo$@ $(IMAGE_CXXFLAGS) .\canvas.cpp
$(OBJS)\image_image.res: .\image.rc
rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\image.rc
samples/image/makefile.wat
+5 -1
View File
@@ -227,7 +227,8 @@ IMAGE_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
-i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
$(CXXFLAGS)
IMAGE_OBJECTS = &
$(OBJS)\image_image.obj
$(OBJS)\image_image.obj &
$(OBJS)\image_canvas.obj
all : $(OBJS)
@@ -265,6 +266,9 @@ data : .SYMBOLIC
$(OBJS)\image_image.obj : .AUTODEPEND .\image.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(IMAGE_CXXFLAGS) $<
$(OBJS)\image_canvas.obj : .AUTODEPEND .\canvas.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(IMAGE_CXXFLAGS) $<
$(OBJS)\image_image.res : .AUTODEPEND .\image.rc
wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<