From 2a736129895a619c83f43de011e2c2aed3e71b5f Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Fri, 28 Mar 2003 23:34:06 +0000
Subject: [PATCH] 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.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19858 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/msw/makefile.b32 |  3 +++
 src/msw/makefile.bcc |  3 +++
 src/msw/makefile.dos |  6 ++++++
 src/msw/makefile.g95 |  1 +
 src/msw/makefile.sc  |  2 +-
 src/msw/makefile.vc  |  1 +
 src/msw/makefile.wat |  4 ++++
 src/os2/files.lst    |  2 ++
 src/wxBase.dsp       |  8 --------
 src/wxUniv.dsp       | 20 ++++----------------
 src/wxWindows.dsp    |  4 ++++
 11 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32
index 46a02d9a96..b228f66ae1 100644
--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@@ -480,6 +480,7 @@ COMMONOBJS = \
 		$(MSWDIR)\radiocmn.obj \
 		$(MSWDIR)\regex.obj \
 		$(MSWDIR)\resource.obj \
+		$(MSWDIR)\rgncmn.obj \
 		$(MSWDIR)\sckaddr.obj \
 		$(MSWDIR)\sckfile.obj \
 		$(MSWDIR)\sckipc.obj \
@@ -1225,6 +1226,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)
diff --git a/src/msw/makefile.bcc b/src/msw/makefile.bcc
index ec55cd5aa4..c56e5a1b33 100644
--- a/src/msw/makefile.bcc
+++ b/src/msw/makefile.bcc
@@ -190,6 +190,7 @@ COMMONOBJS = \
 		$(MSWDIR)\radiocmn.obj \
 		$(MSWDIR)\regex.obj \
 		$(MSWDIR)\resource.obj \
+		$(MSWDIR)\rgncmn.obj \
 		$(MSWDIR)\settcmn.obj \
 		$(MSWDIR)\sizer.obj \
 		$(MSWDIR)\statbar.obj \
@@ -680,6 +681,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)
diff --git a/src/msw/makefile.dos b/src/msw/makefile.dos
index f7215cbdd3..095603f1f9 100644
--- a/src/msw/makefile.dos
+++ b/src/msw/makefile.dos
@@ -177,6 +177,7 @@ COMMONOBJS2 = \
 		$(COMMDIR)\radiocmn.obj \
 		$(COMMDIR)\regex.obj \
 		$(COMMDIR)\resource.obj \
+		$(COMMDIR)\rgncmn.obj \
 		$(COMMDIR)\settcmn.obj \
 		$(COMMDIR)\sizer.obj \
 		$(COMMDIR)\statbar.obj \
@@ -1211,6 +1212,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)
diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index 05ff9171fd..06fcb7e6ba 100644
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -236,6 +236,7 @@ COMMONOBJS  = \
 		$(COMMDIR)/quantize.$(OBJSUFF) \
 		$(COMMDIR)/radiocmn.$(OBJSUFF) \
 		$(COMMDIR)/resource.$(OBJSUFF) \
+		$(COMMDIR)/rgncmn.$(OBJSUFF) \
 		$(COMMDIR)/settcmn.$(OBJSUFF) \
 		$(COMMDIR)/sizer.$(OBJSUFF) \
 		$(COMMDIR)/statbar.$(OBJSUFF) \
diff --git a/src/msw/makefile.sc b/src/msw/makefile.sc
index 064e641394..b542f82213 100644
--- a/src/msw/makefile.sc
+++ b/src/msw/makefile.sc
@@ -1,4 +1,3 @@
-;    Last change:  JS   23 Mar 103    8:02 pm
 
 
 # This file was automatically generated by tmake 
@@ -156,6 +155,7 @@ COMMONOBJS = \
 		$(COMMDIR)\radiocmn.obj \
 		$(COMMDIR)\regex.obj \
 		$(COMMDIR)\resource.obj \
+		$(COMMDIR)\rgncmn.obj \
 		$(COMMDIR)\sckaddr.obj \
 		$(COMMDIR)\sckfile.obj \
 		$(COMMDIR)\sckipc.obj \
diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index b1d463e7db..a7235bb67f 100644
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -233,6 +233,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 \
diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat
index 9455addd71..c7b7a8ab00 100644
--- a/src/msw/makefile.wat
+++ b/src/msw/makefile.wat
@@ -178,6 +178,7 @@ COMMONOBJS = &
 	$(OUTPUTDIR)\radiocmn.obj &
 	$(OUTPUTDIR)\regex.obj &
 	$(OUTPUTDIR)\resource.obj &
+	$(OUTPUTDIR)\rgncmn.obj &
 	$(OUTPUTDIR)\sckaddr.obj &
 	$(OUTPUTDIR)\sckfile.obj &
 	$(OUTPUTDIR)\sckipc.obj &
@@ -1002,6 +1003,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) $<
 
diff --git a/src/os2/files.lst b/src/os2/files.lst
index 68b34276a0..c74d9323fc 100644
--- a/src/os2/files.lst
+++ b/src/os2/files.lst
@@ -139,6 +139,7 @@ ALL_SOURCES = \
 		common/radiocmn.cpp \
 		common/regex.cpp \
 		common/resource.cpp \
+		common/rgncmn.cpp \
 		common/sckaddr.cpp \
 		common/sckfile.cpp \
 		common/sckipc.cpp \
@@ -742,6 +743,7 @@ COMMONOBJS = \
 		radiocmn.o \
 		regex.o \
 		resource.o \
+		rgncmn.o \
 		sckaddr.o \
 		sckfile.o \
 		sckipc.o \
diff --git a/src/wxBase.dsp b/src/wxBase.dsp
index 31c005a171..fa1a58c7d2 100644
--- a/src/wxBase.dsp
+++ b/src/wxBase.dsp
@@ -692,10 +692,6 @@ SOURCE=..\include\wx\config.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\date.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\include\wx\datetime.h
 # End Source File
 # Begin Source File
@@ -952,10 +948,6 @@ SOURCE=..\include\wx\thread.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\time.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\include\wx\timer.h
 # End Source File
 # Begin Source File
diff --git a/src/wxUniv.dsp b/src/wxUniv.dsp
index 5b4c70bb67..e1183ca089 100644
--- a/src/wxUniv.dsp
+++ b/src/wxUniv.dsp
@@ -433,10 +433,6 @@ SOURCE=.\common\object.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\common\odbc.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=.\common\paper.cpp
 # End Source File
 # Begin Source File
@@ -473,6 +469,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
@@ -1475,10 +1475,6 @@ SOURCE=..\include\wx\dataobj.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\date.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\include\wx\datetime.h
 # End Source File
 # Begin Source File
@@ -1931,10 +1927,6 @@ SOURCE=..\include\wx\object.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\odbc.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\include\wx\ownerdrw.h
 # End Source File
 # Begin Source File
@@ -2167,10 +2159,6 @@ SOURCE=..\include\wx\thread.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\time.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\include\wx\timer.h
 # End Source File
 # Begin Source File
diff --git a/src/wxWindows.dsp b/src/wxWindows.dsp
index 1bd470c5c1..81eb3c1a8f 100644
--- a/src/wxWindows.dsp
+++ b/src/wxWindows.dsp
@@ -628,6 +628,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
-- 
2.45.2