wxMotif now uses src/x11/region.cpp, change makefiles accordingly.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20722 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/Makefile.in b/Makefile.in
index 95f384e6c47d83892472632351265d42b1fefb93..a223a861c10165fb6e8b50d3af3a5849b4f9e09a 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -740,9 +740,10 @@ MOTIF_DIST: ALL_GUI_DIST
        mkdir $(DISTDIR)/src/x11
        mkdir $(DISTDIR)/include/wx/x11
        cp $(X11DIR)/pen.cpp $(X11DIR)/brush.cpp $(X11DIR)/utilsx.cpp \
-               $(X11DIR)/bitmap.cpp $(DISTDIR)/src/x11
+               $(X11DIR)/bitmap.cpp $(X11DIR)/region.cpp \
+               $(DISTDIR)/src/x11
        cp $(X11INC)/pen.h $(X11INC)/brush.h $(X11INC)/privx.h \
-               $(X11INC)/bitmap.h $(X11INC)/private.h \
+               $(X11INC)/bitmap.h $(X11INC)/private.h $(X11INC)/region.h \
                $(DISTDIR)/include/wx/x11
 
 MACX_DIST: ALL_GUI_DIST

diff --git a/src/motif/descrip.mms b/src/motif/descrip.mms
index c2274f118fdabb8c7d5bc8a6a1aa7629a8a1ddc8..ef77353e2757fb30772369dff390ea8299f3746b 100644 (file)
--- a/src/motif/descrip.mms
+++ b/src/motif/descrip.mms
@@ -64,7 +64,6 @@ OBJECTS = \
                palette.obj,\
                radiobox.obj,\
                radiobut.obj,\
-               region.obj,\
                scrolbar.obj,\
                settings.obj,\
                slider.obj,\
@@ -119,7 +118,6 @@ SOURCES = \
                palette.cpp,\
                radiobox.cpp,\
                radiobut.cpp,\
-               region.cpp,\
                scrolbar.cpp,\
                settings.cpp,\
                slider.cpp,\
@@ -183,7 +181,6 @@ msgdlg.obj : msgdlg.cpp
 palette.obj : palette.cpp
 radiobox.obj : radiobox.cpp
 radiobut.obj : radiobut.cpp
-region.obj : region.cpp
 scrolbar.obj : scrolbar.cpp
 settings.obj : settings.cpp
 slider.obj : slider.cpp

diff --git a/src/x11/descrip.mms b/src/x11/descrip.mms
index d29ccd7e4cd9f217c26efecca419984d2c03d4e3..b6d13ba8427a5ae0bad92a87357c3a16f12596b9 100644 (file)
--- a/src/x11/descrip.mms
+++ b/src/x11/descrip.mms
@@ -27,12 +27,14 @@ OBJECTS = \
                bitmap.obj,\
                brush.obj,\
                pen.obj,\
+               region.obj,\
                utilsx.obj
 
 SOURCES = \
                bitmap.cpp,\
                brush.cpp,\
                pen.cpp,\
+               region.cpp,\
                utilsx.cpp
 
 all : $(SOURCES)
@@ -44,4 +46,5 @@ all : $(SOURCES)
 bitmap.obj : bitmap.cpp
 brush.obj : brush.cpp
 pen.obj : pen.cpp
+region.obj: region.cpp
 utilsx.obj : utilsx.cpp