Added wxUSE_DC_CACHEING and associated code to wxMSW
Added EnableCache, CacheEnabled to wxDCBase Added mask source args to DoBlit, Blit Added cache testing code to dragimag sample Added wxSystemOptions, regenerated makefiles git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10962 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1090,7 +1090,8 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
|
||||
wxDC *source,
|
||||
wxCoord xsrc, wxCoord ysrc,
|
||||
int logical_func,
|
||||
bool useMask )
|
||||
bool useMask,
|
||||
wxCoord xsrcMask, wxCoord ysrcMask )
|
||||
{
|
||||
/* this is the nth try to get this utterly useless function to
|
||||
work. it now completely ignores the scaling or translation
|
||||
@@ -1115,6 +1116,12 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
|
||||
bool use_bitmap_method = FALSE;
|
||||
bool is_mono = FALSE;
|
||||
|
||||
/* TODO: use the mask origin when drawing transparently */
|
||||
if (xsrcMask == -1 && ysrcMask == -1)
|
||||
{
|
||||
xsrcMask = xsrc; ysrcMask = ysrc;
|
||||
}
|
||||
|
||||
if (srcDC->m_isMemDC)
|
||||
{
|
||||
if (!memDC->m_selected.Ok()) return FALSE;
|
||||
|
@@ -1,4 +1,4 @@
|
||||
# This file was automatically generated by tmake at 20:23, 2001/07/04
|
||||
# This file was automatically generated by tmake at 10:32, 2001/07/11
|
||||
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T!
|
||||
ALL_SOURCES = \
|
||||
generic/accel.cpp \
|
||||
@@ -138,6 +138,7 @@ ALL_SOURCES = \
|
||||
common/strconv.cpp \
|
||||
common/stream.cpp \
|
||||
common/string.cpp \
|
||||
common/sysopt.cpp \
|
||||
common/tbarbase.cpp \
|
||||
common/textcmn.cpp \
|
||||
common/textfile.cpp \
|
||||
@@ -180,6 +181,7 @@ ALL_SOURCES = \
|
||||
gtk/dcscreen.cpp \
|
||||
gtk/dialog.cpp \
|
||||
gtk/dnd.cpp \
|
||||
gtk/evtloop.cpp \
|
||||
gtk/font.cpp \
|
||||
gtk/fontdlg.cpp \
|
||||
gtk/frame.cpp \
|
||||
@@ -341,7 +343,6 @@ ALL_HEADERS = \
|
||||
helpchm.h \
|
||||
helphtml.h \
|
||||
helpwin.h \
|
||||
helpxlp.h \
|
||||
icon.h \
|
||||
imagbmp.h \
|
||||
image.h \
|
||||
@@ -388,6 +389,7 @@ ALL_HEADERS = \
|
||||
panel.h \
|
||||
paper.h \
|
||||
pen.h \
|
||||
popupwin.h \
|
||||
print.h \
|
||||
printdlg.h \
|
||||
prntbase.h \
|
||||
@@ -417,6 +419,7 @@ ALL_HEADERS = \
|
||||
spinctrl.h \
|
||||
splash.h \
|
||||
splitter.h \
|
||||
stack.h \
|
||||
statbmp.h \
|
||||
statbox.h \
|
||||
statline.h \
|
||||
@@ -425,6 +428,7 @@ ALL_HEADERS = \
|
||||
strconv.h \
|
||||
stream.h \
|
||||
string.h \
|
||||
sysopt.h \
|
||||
tab.h \
|
||||
tabctrl.h \
|
||||
taskbar.h \
|
||||
@@ -452,6 +456,7 @@ ALL_HEADERS = \
|
||||
validate.h \
|
||||
valtext.h \
|
||||
variant.h \
|
||||
vector.h \
|
||||
version.h \
|
||||
wave.h \
|
||||
wfstream.h \
|
||||
@@ -507,6 +512,7 @@ ALL_HEADERS = \
|
||||
gtk/minifram.h \
|
||||
gtk/notebook.h \
|
||||
gtk/pen.h \
|
||||
gtk/popupwin.h \
|
||||
gtk/radiobox.h \
|
||||
gtk/radiobut.h \
|
||||
gtk/region.h \
|
||||
@@ -546,7 +552,6 @@ ALL_HEADERS = \
|
||||
generic/helpext.h \
|
||||
generic/helphtml.h \
|
||||
generic/helpwxht.h \
|
||||
generic/helpxlp.h \
|
||||
generic/imaglist.h \
|
||||
generic/laywin.h \
|
||||
generic/listctrl.h \
|
||||
@@ -681,6 +686,7 @@ COMMONOBJS = \
|
||||
strconv.o \
|
||||
stream.o \
|
||||
string.o \
|
||||
sysopt.o \
|
||||
tbarbase.o \
|
||||
textcmn.o \
|
||||
textfile.o \
|
||||
@@ -796,6 +802,7 @@ COMMONDEPS = \
|
||||
strconv.d \
|
||||
stream.d \
|
||||
string.d \
|
||||
sysopt.d \
|
||||
tbarbase.d \
|
||||
textcmn.d \
|
||||
textfile.d \
|
||||
@@ -936,6 +943,7 @@ GUIOBJS = \
|
||||
dcscreen.o \
|
||||
dialog.o \
|
||||
dnd.o \
|
||||
evtloop.o \
|
||||
font.o \
|
||||
fontdlg.o \
|
||||
frame.o \
|
||||
@@ -997,6 +1005,7 @@ GUIDEPS = \
|
||||
dcscreen.d \
|
||||
dialog.d \
|
||||
dnd.d \
|
||||
evtloop.d \
|
||||
font.d \
|
||||
fontdlg.d \
|
||||
frame.d \
|
||||
@@ -1043,6 +1052,7 @@ GUI_LOWLEVEL_OBJS = \
|
||||
choice.o \
|
||||
clipbrd.o \
|
||||
colour.o \
|
||||
combobox.o \
|
||||
cursor.o \
|
||||
data.o \
|
||||
dataobj.o \
|
||||
@@ -1052,6 +1062,7 @@ GUI_LOWLEVEL_OBJS = \
|
||||
dcscreen.o \
|
||||
dialog.o \
|
||||
dnd.o \
|
||||
evtloop.o \
|
||||
font.o \
|
||||
frame.o \
|
||||
gdiobj.o \
|
||||
@@ -1059,7 +1070,6 @@ GUI_LOWLEVEL_OBJS = \
|
||||
icon.o \
|
||||
main.o \
|
||||
pen.o \
|
||||
popupwin.o \
|
||||
region.o \
|
||||
settings.o \
|
||||
timer.o \
|
||||
@@ -1075,6 +1085,7 @@ GUI_LOWLEVEL_DEPS = \
|
||||
choice.d \
|
||||
clipbrd.d \
|
||||
colour.d \
|
||||
combobox.d \
|
||||
cursor.d \
|
||||
data.d \
|
||||
dataobj.d \
|
||||
@@ -1084,6 +1095,7 @@ GUI_LOWLEVEL_DEPS = \
|
||||
dcscreen.d \
|
||||
dialog.d \
|
||||
dnd.d \
|
||||
evtloop.d \
|
||||
font.d \
|
||||
frame.d \
|
||||
gdiobj.d \
|
||||
@@ -1091,7 +1103,6 @@ GUI_LOWLEVEL_DEPS = \
|
||||
icon.d \
|
||||
main.d \
|
||||
pen.d \
|
||||
popupwin.d \
|
||||
region.d \
|
||||
settings.d \
|
||||
timer.d \
|
||||
|
Reference in New Issue
Block a user