Added wxTLW::SetShape and implementations for wxGTK, wxMSW and an
empty stub for wxMac. Added some generic helpers and a new ctor to wxRegion. Added samples/shaped. (Backport to 2.4 from 2.5) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@19874 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -97,6 +97,7 @@ COMMONOBJS = \
|
||||
..\common\$D\memory.obj \
|
||||
..\common\$D\mimecmn.obj \
|
||||
..\common\$D\module.obj \
|
||||
..\common\$D\msgout.obj \
|
||||
..\common\$D\mstream.obj \
|
||||
..\common\$D\object.obj \
|
||||
..\common\$D\process.obj \
|
||||
|
@@ -470,6 +470,7 @@ COMMONOBJS = \
|
||||
$(MSWDIR)\radiocmn.obj \
|
||||
$(MSWDIR)\regex.obj \
|
||||
$(MSWDIR)\resource.obj \
|
||||
$(MSWDIR)\rgncmn.obj \
|
||||
$(MSWDIR)\sckaddr.obj \
|
||||
$(MSWDIR)\sckfile.obj \
|
||||
$(MSWDIR)\sckipc.obj \
|
||||
@@ -1193,6 +1194,8 @@ $(MSWDIR)\regex.obj: $(COMMDIR)\regex.$(SRCSUFF)
|
||||
|
||||
$(MSWDIR)\resource.obj: $(COMMDIR)\resource.$(SRCSUFF)
|
||||
|
||||
$(MSWDIR)\rgncmn.obj: $(COMMDIR)\rgncmn.$(SRCSUFF)
|
||||
|
||||
$(MSWDIR)\sckaddr.obj: $(COMMDIR)\sckaddr.$(SRCSUFF)
|
||||
|
||||
$(MSWDIR)\sckfile.obj: $(COMMDIR)\sckfile.$(SRCSUFF)
|
||||
|
@@ -188,6 +188,7 @@ COMMONOBJS = \
|
||||
$(MSWDIR)\radiocmn.obj \
|
||||
$(MSWDIR)\regex.obj \
|
||||
$(MSWDIR)\resource.obj \
|
||||
$(MSWDIR)\rgncmn.obj \
|
||||
$(MSWDIR)\settcmn.obj \
|
||||
$(MSWDIR)\sizer.obj \
|
||||
$(MSWDIR)\statbar.obj \
|
||||
@@ -683,6 +684,8 @@ $(MSWDIR)\regex.obj: $(COMMDIR)\regex.$(SRCSUFF)
|
||||
|
||||
$(MSWDIR)\resource.obj: $(COMMDIR)\resource.$(SRCSUFF)
|
||||
|
||||
$(MSWDIR)\rgncmn.obj: $(COMMDIR)\rgncmn.$(SRCSUFF)
|
||||
|
||||
$(MSWDIR)\settcmn.obj: $(COMMDIR)\settcmn.$(SRCSUFF)
|
||||
|
||||
$(MSWDIR)\sizer.obj: $(COMMDIR)\sizer.$(SRCSUFF)
|
||||
|
@@ -176,6 +176,7 @@ COMMONOBJS2 = \
|
||||
$(COMMDIR)\radiocmn.obj \
|
||||
$(COMMDIR)\regex.obj \
|
||||
$(COMMDIR)\resource.obj \
|
||||
$(COMMDIR)\rgncmn.obj \
|
||||
$(COMMDIR)\settcmn.obj \
|
||||
$(COMMDIR)\sizer.obj \
|
||||
$(COMMDIR)\statbar.obj \
|
||||
@@ -1223,6 +1224,11 @@ $(COMMDIR)/resource.obj: $*.$(SRCSUFF)
|
||||
$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
|
||||
<<
|
||||
|
||||
$(COMMDIR)/rgncmn.obj: $*.$(SRCSUFF)
|
||||
cl @<<
|
||||
$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
|
||||
<<
|
||||
|
||||
$(COMMDIR)/settcmn.obj: $*.$(SRCSUFF)
|
||||
cl @<<
|
||||
$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
|
||||
|
@@ -232,6 +232,7 @@ COMMONOBJS = \
|
||||
$(COMMDIR)/quantize.$(OBJSUFF) \
|
||||
$(COMMDIR)/radiocmn.$(OBJSUFF) \
|
||||
$(COMMDIR)/resource.$(OBJSUFF) \
|
||||
$(COMMDIR)/rgncmn.$(OBJSUFF) \
|
||||
$(COMMDIR)/settcmn.$(OBJSUFF) \
|
||||
$(COMMDIR)/sizer.$(OBJSUFF) \
|
||||
$(COMMDIR)/statbar.$(OBJSUFF) \
|
||||
|
@@ -154,6 +154,7 @@ COMMONOBJS = \
|
||||
$(COMMDIR)\radiocmn.obj \
|
||||
$(COMMDIR)\regex.obj \
|
||||
$(COMMDIR)\resource.obj \
|
||||
$(COMMDIR)\rgncmn.obj \
|
||||
$(COMMDIR)\sckaddr.obj \
|
||||
$(COMMDIR)\sckfile.obj \
|
||||
$(COMMDIR)\sckipc.obj \
|
||||
|
@@ -232,6 +232,7 @@ COMMONOBJS = \
|
||||
$(COMMDIR)\$D\radiocmn.obj \
|
||||
$(COMMDIR)\$D\regex.obj \
|
||||
$(COMMDIR)\$D\resource.obj \
|
||||
$(COMMDIR)\$D\rgncmn.obj \
|
||||
$(COMMDIR)\$D\sckaddr.obj \
|
||||
$(COMMDIR)\$D\sckfile.obj \
|
||||
$(COMMDIR)\$D\sckipc.obj \
|
||||
|
@@ -177,6 +177,7 @@ COMMONOBJS = &
|
||||
$(OUTPUTDIR)\radiocmn.obj &
|
||||
$(OUTPUTDIR)\regex.obj &
|
||||
$(OUTPUTDIR)\resource.obj &
|
||||
$(OUTPUTDIR)\rgncmn.obj &
|
||||
$(OUTPUTDIR)\sckaddr.obj &
|
||||
$(OUTPUTDIR)\sckfile.obj &
|
||||
$(OUTPUTDIR)\sckipc.obj &
|
||||
@@ -359,7 +360,7 @@ $(ARCHINCDIR)\wx:
|
||||
$(OUTPUTDIR):
|
||||
@if not exist $^@ mkdir $^@
|
||||
|
||||
$(SETUP_H): $(ARCHINCDIR)\wx
|
||||
$(SETUP_H): $(ARCHINCDIR)\wx
|
||||
if not exist $(WXDIR)\include\wx\msw\setup.h copy $(WXDIR)\include\wx\msw\setup0.h $(WXDIR)\include\wx\msw\setup.h
|
||||
copy $(WXDIR)\include\wx\msw\setup.h $@
|
||||
|
||||
@@ -999,6 +1000,9 @@ $(OUTPUTDIR)\regex.obj: $(COMMDIR)\regex.cpp
|
||||
$(OUTPUTDIR)\resource.obj: $(COMMDIR)\resource.cpp
|
||||
*$(CXX) $(CXXFLAGS) $<
|
||||
|
||||
$(OUTPUTDIR)\rgncmn.obj: $(COMMDIR)\rgncmn.cpp
|
||||
*$(CXX) $(CXXFLAGS) $<
|
||||
|
||||
$(OUTPUTDIR)\sckaddr.obj: $(COMMDIR)\sckaddr.cpp
|
||||
*$(CXX) $(CXXFLAGS) $<
|
||||
|
||||
|
@@ -465,6 +465,10 @@ SOURCE=.\common\resource.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\common\rgncmn.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\common\sckaddr.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
@@ -624,6 +624,10 @@ SOURCE=.\common\resource.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\common\rgncmn.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\common\sckaddr.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
Reference in New Issue
Block a user