Use glcanvas.cpp from wxX11 for wxMotif.

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

diff --git a/Makefile.in b/Makefile.in
index d7c65ce28cade62450ce3d8432102859123ed8d8..1d60878070046e703f6c8c609d2d4ad0ae16ee9a 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -996,6 +996,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
        wx/dialog.h \
        wx/dirdlg.h \
        wx/dragimag.h \
        wx/dialog.h \
        wx/dirdlg.h \
        wx/dragimag.h \

+       wx/encinfo.h \

        wx/filedlg.h \
        wx/frame.h \
        wx/gauge.h \
        wx/filedlg.h \
        wx/frame.h \
        wx/gauge.h \


@@ -1833,7 +1834,7 @@ COND_TOOLKIT_X11_LOWLEVEL_HDR =  \
 @COND_TOOLKIT_COCOA@NET_PLATFORM_HDR = wx/unix/gsockunx.h
 @COND_TOOLKIT_GTK@OPENGL_HDR = wx/gtk/glcanvas.h
 @COND_TOOLKIT_MAC@OPENGL_HDR = wx/mac/glcanvas.h
 @COND_TOOLKIT_COCOA@NET_PLATFORM_HDR = wx/unix/gsockunx.h
 @COND_TOOLKIT_GTK@OPENGL_HDR = wx/gtk/glcanvas.h
 @COND_TOOLKIT_MAC@OPENGL_HDR = wx/mac/glcanvas.h

-@COND_TOOLKIT_MOTIF@OPENGL_HDR = wx/motif/glcanvas.h
+@COND_TOOLKIT_MOTIF@OPENGL_HDR = wx/x11/glcanvas.h

 @COND_TOOLKIT_MSW@OPENGL_HDR = wx/msw/glcanvas.h
 @COND_TOOLKIT_PM@OPENGL_HDR = wx/os2/glcanvas.h
 @COND_TOOLKIT_X11@OPENGL_HDR = wx/x11/glcanvas.h
 @COND_TOOLKIT_MSW@OPENGL_HDR = wx/msw/glcanvas.h
 @COND_TOOLKIT_PM@OPENGL_HDR = wx/os2/glcanvas.h
 @COND_TOOLKIT_X11@OPENGL_HDR = wx/x11/glcanvas.h


@@ -3426,6 +3427,7 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS =  \
 @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS)
 COND_TOOLKIT_MSW___GUI_SRC_OBJECTS =  \
        monodll_statusbr.o \
 @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS)
 COND_TOOLKIT_MSW___GUI_SRC_OBJECTS =  \
        monodll_statusbr.o \

+       monodll_prntdlgg.o \

        monodll_accel.o \
        monodll_bmpbuttn.o \
        monodll_button.o \
        monodll_accel.o \
        monodll_bmpbuttn.o \
        monodll_button.o \


@@ -3505,6 +3507,7 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS =  \
        monodll_dcscreen.o \
        monodll_dialog.o \
        monodll_dnd.o \
        monodll_dcscreen.o \
        monodll_dialog.o \
        monodll_dnd.o \

+       monodll_evtloop.o \

        monodll_filedlg.o \
        monodll_font.o \
        monodll_fontdlg.o \
        monodll_filedlg.o \
        monodll_font.o \
        monodll_fontdlg.o \


@@ -3820,6 +3823,7 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_1 =  \
 @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_1)
 COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_1 =  \
        monolib_statusbr.o \
 @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_1)
 COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_1 =  \
        monolib_statusbr.o \

+       monolib_prntdlgg.o \

        monolib_accel.o \
        monolib_bmpbuttn.o \
        monolib_button.o \
        monolib_accel.o \
        monolib_bmpbuttn.o \
        monolib_button.o \


@@ -3899,6 +3903,7 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS_1 =  \
        monolib_dcscreen.o \
        monolib_dialog.o \
        monolib_dnd.o \
        monolib_dcscreen.o \
        monolib_dialog.o \
        monolib_dnd.o \

+       monolib_evtloop.o \

        monolib_filedlg.o \
        monolib_font.o \
        monolib_fontdlg.o \
        monolib_filedlg.o \
        monolib_font.o \
        monolib_fontdlg.o \


@@ -4214,6 +4219,7 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_2 =  \
 @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_2)
 COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_2 =  \
        coredll_statusbr.o \
 @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_2)
 COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_2 =  \
        coredll_statusbr.o \

+       coredll_prntdlgg.o \

        coredll_accel.o \
        coredll_bmpbuttn.o \
        coredll_button.o \
        coredll_accel.o \
        coredll_bmpbuttn.o \
        coredll_button.o \


@@ -4293,6 +4299,7 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS_2 =  \
        coredll_dcscreen.o \
        coredll_dialog.o \
        coredll_dnd.o \
        coredll_dcscreen.o \
        coredll_dialog.o \
        coredll_dnd.o \

+       coredll_evtloop.o \

        coredll_filedlg.o \
        coredll_font.o \
        coredll_fontdlg.o \
        coredll_filedlg.o \
        coredll_font.o \
        coredll_fontdlg.o \


@@ -4608,6 +4615,7 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_3 =  \
 @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_3)
 COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_3 =  \
        corelib_statusbr.o \
 @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_3)
 COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_3 =  \
        corelib_statusbr.o \

+       corelib_prntdlgg.o \

        corelib_accel.o \
        corelib_bmpbuttn.o \
        corelib_button.o \
        corelib_accel.o \
        corelib_bmpbuttn.o \
        corelib_button.o \


@@ -4687,6 +4695,7 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS_3 =  \
        corelib_dcscreen.o \
        corelib_dialog.o \
        corelib_dnd.o \
        corelib_dcscreen.o \
        corelib_dialog.o \
        corelib_dnd.o \

+       corelib_evtloop.o \

        corelib_filedlg.o \
        corelib_font.o \
        corelib_fontdlg.o \
        corelib_filedlg.o \
        corelib_font.o \
        corelib_fontdlg.o \


@@ -7759,6 +7768,12 @@ coredll_event.o: $(srcdir)/src/common/event.cpp
 @COND_TOOLKIT_GTK_USE_GUI_1@coredll_evtloop.o: $(srcdir)/src/gtk/evtloop.cpp
 @COND_TOOLKIT_GTK_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
 @COND_TOOLKIT_GTK_USE_GUI_1@coredll_evtloop.o: $(srcdir)/src/gtk/evtloop.cpp
 @COND_TOOLKIT_GTK_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 

+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_evtloop.o: $(srcdir)/src/os2/evtloop.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+
+@COND_TOOLKIT_MGL_USE_GUI_1@coredll_evtloop.o: $(srcdir)/src/mgl/evtloop.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+

 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_evtloop.o: $(srcdir)/src/motif/evtloop.cpp
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_evtloop.o: $(srcdir)/src/motif/evtloop.cpp
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 


@@ -7768,9 +7783,6 @@ coredll_event.o: $(srcdir)/src/common/event.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@coredll_evtloop.o: $(srcdir)/src/msw/evtloop.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
 @COND_TOOLKIT_MSW_USE_GUI_1@coredll_evtloop.o: $(srcdir)/src/msw/evtloop.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 

-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_evtloop.o: $(srcdir)/src/mgl/evtloop.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
-

 @COND_USE_GUI_1@coredll_fddlgcmn.o: $(srcdir)/src/common/fddlgcmn.cpp
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
 @COND_USE_GUI_1@coredll_fddlgcmn.o: $(srcdir)/src/common/fddlgcmn.cpp
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 


@@ -8476,6 +8488,9 @@ coredll_printmac.o: $(srcdir)/src/mac/printmac.cpp
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 

+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+

 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 


@@ -9843,6 +9858,12 @@ corelib_event.o: $(srcdir)/src/common/event.cpp
 @COND_TOOLKIT_GTK_USE_GUI_1@corelib_evtloop.o: $(srcdir)/src/gtk/evtloop.cpp
 @COND_TOOLKIT_GTK_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
 @COND_TOOLKIT_GTK_USE_GUI_1@corelib_evtloop.o: $(srcdir)/src/gtk/evtloop.cpp
 @COND_TOOLKIT_GTK_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 

+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_evtloop.o: $(srcdir)/src/os2/evtloop.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+
+@COND_TOOLKIT_MGL_USE_GUI_1@corelib_evtloop.o: $(srcdir)/src/mgl/evtloop.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+

 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_evtloop.o: $(srcdir)/src/motif/evtloop.cpp
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_evtloop.o: $(srcdir)/src/motif/evtloop.cpp
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 


@@ -9852,9 +9873,6 @@ corelib_event.o: $(srcdir)/src/common/event.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@corelib_evtloop.o: $(srcdir)/src/msw/evtloop.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
 @COND_TOOLKIT_MSW_USE_GUI_1@corelib_evtloop.o: $(srcdir)/src/msw/evtloop.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 

-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_evtloop.o: $(srcdir)/src/mgl/evtloop.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
-

 @COND_USE_GUI_1@corelib_fddlgcmn.o: $(srcdir)/src/common/fddlgcmn.cpp
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
 @COND_USE_GUI_1@corelib_fddlgcmn.o: $(srcdir)/src/common/fddlgcmn.cpp
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 


@@ -10560,6 +10578,9 @@ corelib_printmac.o: $(srcdir)/src/mac/printmac.cpp
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 

+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+

 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 


@@ -11214,47 +11235,47 @@ distclean: clean
 @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ 
 @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(__gldll___so_symlinks_cmd)
 
 @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ 
 @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(__gldll___so_symlinks_cmd)
 

+@COND_TOOLKIT_MOTIF@gldll_glcanvas.o: $(srcdir)/src/x11/glcanvas.cpp
+@COND_TOOLKIT_MOTIF@   $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $<
+

 @COND_TOOLKIT_X11@gldll_glcanvas.o: $(srcdir)/src/x11/glcanvas.cpp
 @COND_TOOLKIT_X11@     $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $<
 
 @COND_TOOLKIT_X11@gldll_glcanvas.o: $(srcdir)/src/x11/glcanvas.cpp
 @COND_TOOLKIT_X11@     $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $<
 

-@COND_TOOLKIT_PM@gldll_glcanvas.o: $(srcdir)/src/os2/glcanvas.cpp
-@COND_TOOLKIT_PM@      $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $<
-
-@COND_TOOLKIT_MOTIF@gldll_glcanvas.o: $(srcdir)/src/motif/glcanvas.cpp
-@COND_TOOLKIT_MOTIF@   $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $<
-

 @COND_TOOLKIT_MAC@gldll_glcanvas.o: $(srcdir)/src/mac/glcanvas.cpp
 @COND_TOOLKIT_MAC@     $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $<
 
 @COND_TOOLKIT_MAC@gldll_glcanvas.o: $(srcdir)/src/mac/glcanvas.cpp
 @COND_TOOLKIT_MAC@     $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $<
 

-@COND_TOOLKIT_MSW@gldll_glcanvas.o: $(srcdir)/src/msw/glcanvas.cpp
-@COND_TOOLKIT_MSW@     $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $<
+@COND_TOOLKIT_PM@gldll_glcanvas.o: $(srcdir)/src/os2/glcanvas.cpp
+@COND_TOOLKIT_PM@      $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $<

 
 @COND_TOOLKIT_GTK@gldll_glcanvas.o: $(srcdir)/src/gtk/glcanvas.cpp
 @COND_TOOLKIT_GTK@     $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $<
 
 
 @COND_TOOLKIT_GTK@gldll_glcanvas.o: $(srcdir)/src/gtk/glcanvas.cpp
 @COND_TOOLKIT_GTK@     $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $<
 

+@COND_TOOLKIT_MSW@gldll_glcanvas.o: $(srcdir)/src/msw/glcanvas.cpp
+@COND_TOOLKIT_MSW@     $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $<
+

 @COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-2.5$(HOST_SUFFIX).a: $(__gllib_PCH_DEP)  $(GLLIB_OBJECTS)
 @COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@ rm -f $@
 @COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@ $(AR) rcu $@ $(GLLIB_OBJECTS)
 @COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@ $(RANLIB) $@
 
 @COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-2.5$(HOST_SUFFIX).a: $(__gllib_PCH_DEP)  $(GLLIB_OBJECTS)
 @COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@ rm -f $@
 @COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@ $(AR) rcu $@ $(GLLIB_OBJECTS)
 @COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@ $(RANLIB) $@
 

+@COND_TOOLKIT_MOTIF@gllib_glcanvas.o: $(srcdir)/src/x11/glcanvas.cpp
+@COND_TOOLKIT_MOTIF@   $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $<
+

 @COND_TOOLKIT_X11@gllib_glcanvas.o: $(srcdir)/src/x11/glcanvas.cpp
 @COND_TOOLKIT_X11@     $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $<
 
 @COND_TOOLKIT_X11@gllib_glcanvas.o: $(srcdir)/src/x11/glcanvas.cpp
 @COND_TOOLKIT_X11@     $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $<
 

-@COND_TOOLKIT_PM@gllib_glcanvas.o: $(srcdir)/src/os2/glcanvas.cpp
-@COND_TOOLKIT_PM@      $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $<
-
-@COND_TOOLKIT_MOTIF@gllib_glcanvas.o: $(srcdir)/src/motif/glcanvas.cpp
-@COND_TOOLKIT_MOTIF@   $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $<
-

 @COND_TOOLKIT_MAC@gllib_glcanvas.o: $(srcdir)/src/mac/glcanvas.cpp
 @COND_TOOLKIT_MAC@     $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $<
 
 @COND_TOOLKIT_MAC@gllib_glcanvas.o: $(srcdir)/src/mac/glcanvas.cpp
 @COND_TOOLKIT_MAC@     $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $<
 

-@COND_TOOLKIT_MSW@gllib_glcanvas.o: $(srcdir)/src/msw/glcanvas.cpp
-@COND_TOOLKIT_MSW@     $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $<
+@COND_TOOLKIT_PM@gllib_glcanvas.o: $(srcdir)/src/os2/glcanvas.cpp
+@COND_TOOLKIT_PM@      $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $<

 
 @COND_TOOLKIT_GTK@gllib_glcanvas.o: $(srcdir)/src/gtk/glcanvas.cpp
 @COND_TOOLKIT_GTK@     $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $<
 
 
 @COND_TOOLKIT_GTK@gllib_glcanvas.o: $(srcdir)/src/gtk/glcanvas.cpp
 @COND_TOOLKIT_GTK@     $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $<
 

+@COND_TOOLKIT_MSW@gllib_glcanvas.o: $(srcdir)/src/msw/glcanvas.cpp
+@COND_TOOLKIT_MSW@     $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $<
+

 @COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(__htmldll_PCH_DEP)  $(HTMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__coredll___depname) $(__basedll___depname)
 @COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@        $(SHARED_LD_CXX) $@ $(HTMLDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__htmldll___macinstnamecmd) $(__htmldll___importlib) $(__htmldll___soname_flags) $(dll___macver)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
 @COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@        
 @COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(__htmldll_PCH_DEP)  $(HTMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__coredll___depname) $(__basedll___depname)
 @COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@        $(SHARED_LD_CXX) $@ $(HTMLDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__htmldll___macinstnamecmd) $(__htmldll___importlib) $(__htmldll___soname_flags) $(dll___macver)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
 @COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@        


@@ -12423,6 +12444,12 @@ monodll_event.o: $(srcdir)/src/common/event.cpp
 @COND_TOOLKIT_GTK_USE_GUI_1@monodll_evtloop.o: $(srcdir)/src/gtk/evtloop.cpp
 @COND_TOOLKIT_GTK_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 @COND_TOOLKIT_GTK_USE_GUI_1@monodll_evtloop.o: $(srcdir)/src/gtk/evtloop.cpp
 @COND_TOOLKIT_GTK_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 

+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_evtloop.o: $(srcdir)/src/os2/evtloop.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
+@COND_TOOLKIT_MGL_USE_GUI_1@monodll_evtloop.o: $(srcdir)/src/mgl/evtloop.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+

 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_evtloop.o: $(srcdir)/src/motif/evtloop.cpp
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_evtloop.o: $(srcdir)/src/motif/evtloop.cpp
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 


@@ -12432,9 +12459,6 @@ monodll_event.o: $(srcdir)/src/common/event.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@monodll_evtloop.o: $(srcdir)/src/msw/evtloop.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 @COND_TOOLKIT_MSW_USE_GUI_1@monodll_evtloop.o: $(srcdir)/src/msw/evtloop.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 

-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_evtloop.o: $(srcdir)/src/mgl/evtloop.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
-

 monodll_extended.o: $(srcdir)/src/common/extended.c
        $(CCC) -c -o $@ $(MONODLL_CFLAGS) $<
 
 monodll_extended.o: $(srcdir)/src/common/extended.c
        $(CCC) -c -o $@ $(MONODLL_CFLAGS) $<
 


@@ -13350,6 +13374,9 @@ monodll_printmac.o: $(srcdir)/src/mac/printmac.cpp
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 

+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+

 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 


@@ -14999,6 +15026,12 @@ monolib_event.o: $(srcdir)/src/common/event.cpp
 @COND_TOOLKIT_GTK_USE_GUI_1@monolib_evtloop.o: $(srcdir)/src/gtk/evtloop.cpp
 @COND_TOOLKIT_GTK_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 @COND_TOOLKIT_GTK_USE_GUI_1@monolib_evtloop.o: $(srcdir)/src/gtk/evtloop.cpp
 @COND_TOOLKIT_GTK_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 

+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_evtloop.o: $(srcdir)/src/os2/evtloop.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
+@COND_TOOLKIT_MGL_USE_GUI_1@monolib_evtloop.o: $(srcdir)/src/mgl/evtloop.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+

 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_evtloop.o: $(srcdir)/src/motif/evtloop.cpp
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_evtloop.o: $(srcdir)/src/motif/evtloop.cpp
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 


@@ -15008,9 +15041,6 @@ monolib_event.o: $(srcdir)/src/common/event.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@monolib_evtloop.o: $(srcdir)/src/msw/evtloop.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 @COND_TOOLKIT_MSW_USE_GUI_1@monolib_evtloop.o: $(srcdir)/src/msw/evtloop.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 

-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_evtloop.o: $(srcdir)/src/mgl/evtloop.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
-

 monolib_extended.o: $(srcdir)/src/common/extended.c
        $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $<
 
 monolib_extended.o: $(srcdir)/src/common/extended.c
        $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $<
 


@@ -15926,6 +15956,9 @@ monolib_printmac.o: $(srcdir)/src/mac/printmac.cpp
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 

+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+

 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 

diff --git a/autoconf_inc.m4 b/autoconf_inc.m4
index c7f4c82a9c784540a23964848b5b1f7c87833a90..5af0743974259809849d6a0c0084f6cbcd9f02f3 100644 (file)
--- a/autoconf_inc.m4
+++ b/autoconf_inc.m4
@@ -2,9 +2,6 @@ dnl This macro was generated by
 dnl Bakefile 0.1.1 (http://bakefile.sourceforge.net)
 dnl Do not modify, all changes will be overwritten!
 
 dnl Bakefile 0.1.1 (http://bakefile.sourceforge.net)
 dnl Do not modify, all changes will be overwritten!
 

-
-dnl Conditions:
-

 dnl ### begin block 0_AC_BAKEFILE_PRECOMP_HEADERS ###
 AC_BAKEFILE_PRECOMP_HEADERS
 
 dnl ### begin block 0_AC_BAKEFILE_PRECOMP_HEADERS ###
 AC_BAKEFILE_PRECOMP_HEADERS
 


@@ -442,6 +439,18 @@ dnl ### begin block 1_COND_UNICODE_1 ###
         COND_UNICODE_1=""
     fi
     AC_SUBST(COND_UNICODE_1)
         COND_UNICODE_1=""
     fi
     AC_SUBST(COND_UNICODE_1)

+dnl ### begin block 1_COND_USE_EXCEPTIONS_0 ###
+    COND_USE_EXCEPTIONS_0="#"
+    if test "x$USE_EXCEPTIONS" = "x0" ; then
+        COND_USE_EXCEPTIONS_0=""
+    fi
+    AC_SUBST(COND_USE_EXCEPTIONS_0)
+dnl ### begin block 1_COND_USE_EXCEPTIONS_1 ###
+    COND_USE_EXCEPTIONS_1="#"
+    if test "x$USE_EXCEPTIONS" = "x1" ; then
+        COND_USE_EXCEPTIONS_1=""
+    fi
+    AC_SUBST(COND_USE_EXCEPTIONS_1)

 dnl ### begin block 1_COND_USE_GUI_0 ###
     COND_USE_GUI_0="#"
     if test "x$USE_GUI" = "x0" ; then
 dnl ### begin block 1_COND_USE_GUI_0 ###
     COND_USE_GUI_0="#"
     if test "x$USE_GUI" = "x0" ; then

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index 622dc674a415c91d3d9a3c2398ce8599615960d6..48dcc1db56869fe10c1525885d22f5d683abd288 100644 (file)
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -2110,7 +2110,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     <if cond="TOOLKIT=='MAC'">src/mac/glcanvas.cpp</if>
     <if cond="TOOLKIT=='GTK'">src/gtk/glcanvas.cpp</if>
     <if cond="TOOLKIT=='MSW'">src/msw/glcanvas.cpp</if>
     <if cond="TOOLKIT=='MAC'">src/mac/glcanvas.cpp</if>
     <if cond="TOOLKIT=='GTK'">src/gtk/glcanvas.cpp</if>
     <if cond="TOOLKIT=='MSW'">src/msw/glcanvas.cpp</if>

-    <if cond="TOOLKIT=='MOTIF'">src/motif/glcanvas.cpp</if>
+    <if cond="TOOLKIT=='MOTIF'">src/x11/glcanvas.cpp</if>

     <if cond="TOOLKIT=='X11'">src/x11/glcanvas.cpp</if>
     <if cond="TOOLKIT=='PM'">src/os2/glcanvas.cpp</if>
 </set>
     <if cond="TOOLKIT=='X11'">src/x11/glcanvas.cpp</if>
     <if cond="TOOLKIT=='PM'">src/os2/glcanvas.cpp</if>
 </set>


@@ -2119,7 +2119,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     <if cond="TOOLKIT=='MAC'">wx/mac/glcanvas.h</if>
     <if cond="TOOLKIT=='GTK'">wx/gtk/glcanvas.h</if>
     <if cond="TOOLKIT=='MSW'">wx/msw/glcanvas.h</if>
     <if cond="TOOLKIT=='MAC'">wx/mac/glcanvas.h</if>
     <if cond="TOOLKIT=='GTK'">wx/gtk/glcanvas.h</if>
     <if cond="TOOLKIT=='MSW'">wx/msw/glcanvas.h</if>

-    <if cond="TOOLKIT=='MOTIF'">wx/motif/glcanvas.h</if>
+    <if cond="TOOLKIT=='MOTIF'">wx/x11/glcanvas.h</if>

     <if cond="TOOLKIT=='X11'">wx/x11/glcanvas.h</if>
     <if cond="TOOLKIT=='PM'">wx/os2/glcanvas.h</if>
 </set>
     <if cond="TOOLKIT=='X11'">wx/x11/glcanvas.h</if>
     <if cond="TOOLKIT=='PM'">wx/os2/glcanvas.h</if>
 </set>

diff --git a/include/wx/glcanvas.h b/include/wx/glcanvas.h
index d0cf6016b46cd0520d2a8a65f3d55a300e2cb9d7..5eb588c1173c81dbc00dbe4e542b1058972b4388 100644 (file)
--- a/include/wx/glcanvas.h
+++ b/include/wx/glcanvas.h
@@ -10,7 +10,7 @@
 #if defined(__WXMSW__)
 #include "wx/msw/glcanvas.h"
 #elif defined(__WXMOTIF__)
 #if defined(__WXMSW__)
 #include "wx/msw/glcanvas.h"
 #elif defined(__WXMOTIF__)

-#include "wx/motif/glcanvas.h"
+#include "wx/x11/glcanvas.h"

 #elif defined(__WXGTK__)
 #include "wx/gtk/glcanvas.h"
 #elif defined(__WXX11__)
 #elif defined(__WXGTK__)
 #include "wx/gtk/glcanvas.h"
 #elif defined(__WXX11__)

diff --git a/src/motif/descrip.mms b/src/motif/descrip.mms
index 6e86386049b0b8a751823c4b81d398758dcf046b..63594919fd4f9a872bca71d35f6b0f8e08fd0b43 100644 (file)
--- a/src/motif/descrip.mms
+++ b/src/motif/descrip.mms
@@ -2,7 +2,7 @@
 #                                                                            *
 # Make file for VMS                                                          *
 # Author : J.Jansen (joukj@hrem.stm.tudelft.nl)                              *
 #                                                                            *
 # Make file for VMS                                                          *
 # Author : J.Jansen (joukj@hrem.stm.tudelft.nl)                              *

-# Date : 10 November 1999                                                     *
+# Date : 10 November 1999                                                    *

 #                                                                            *
 #*****************************************************************************
 .first
 #                                                                            *
 #*****************************************************************************
 .first


@@ -51,7 +51,6 @@ OBJECTS = \
                frame.obj,\
                gauge.obj,\
                gdiobj.obj,\
                frame.obj,\
                gauge.obj,\
                gdiobj.obj,\

-               glcanvas.obj,\

                gsockmot.obj,\
                icon.obj,\
                listbox.obj,\
                gsockmot.obj,\
                icon.obj,\
                listbox.obj,\


@@ -105,7 +104,6 @@ SOURCES = \
                frame.cpp,\
                gauge.cpp,\
                gdiobj.cpp,\
                frame.cpp,\
                gauge.cpp,\
                gdiobj.cpp,\

-               glcanvas.cpp,\

                gsockmot.c,\
                icon.cpp,\
                listbox.cpp,\
                gsockmot.c,\
                icon.cpp,\
                listbox.cpp,\


@@ -168,7 +166,6 @@ font.obj : font.cpp
 frame.obj : frame.cpp
 gauge.obj : gauge.cpp
 gdiobj.obj : gdiobj.cpp
 frame.obj : frame.cpp
 gauge.obj : gauge.cpp
 gdiobj.obj : gdiobj.cpp

-glcanvas.obj : glcanvas.cpp

 gsockmot.obj : gsockmot.c
 icon.obj : icon.cpp
 listbox.obj : listbox.cpp
 gsockmot.obj : gsockmot.c
 icon.obj : icon.cpp
 listbox.obj : listbox.cpp

diff --git a/src/x11/descrip.mms b/src/x11/descrip.mms
index 8a19bc7e025b6ec41cae717bbe4e45292b98877e..477769d33fd9cdda7bfc19f9ce260332fe9b9cda 100644 (file)
--- a/src/x11/descrip.mms
+++ b/src/x11/descrip.mms
@@ -2,7 +2,7 @@
 #                                                                            *
 # Make file for VMS                                                          *
 # Author : J.Jansen (joukj@hrem.stm.tudelft.nl)                              *
 #                                                                            *
 # Make file for VMS                                                          *
 # Author : J.Jansen (joukj@hrem.stm.tudelft.nl)                              *

-# Date : 10 November 1999                                                     *
+# Date : 10 November 1999                                                    *

 #                                                                            *
 #*****************************************************************************
 .first
 #                                                                            *
 #*****************************************************************************
 .first


@@ -26,6 +26,7 @@ CXX_DEFINE =
 OBJECTS = \
                bitmap.obj,\
                brush.obj,\
 OBJECTS = \
                bitmap.obj,\
                brush.obj,\

+               glcanvas.obj,\

                pen.obj,\
                region.obj,\
                utilsx.obj
                pen.obj,\
                region.obj,\
                utilsx.obj


@@ -33,6 +34,7 @@ OBJECTS = \
 SOURCES = \
                bitmap.cpp,\
                brush.cpp,\
 SOURCES = \
                bitmap.cpp,\
                brush.cpp,\

+               glcanvas.cpp,\

                pen.cpp,\
                region.cpp,\
                utilsx.cpp
                pen.cpp,\
                region.cpp,\
                utilsx.cpp


@@ -45,6 +47,7 @@ all : $(SOURCES)
 
 bitmap.obj : bitmap.cpp
 brush.obj : brush.cpp
 
 bitmap.obj : bitmap.cpp
 brush.obj : brush.cpp

+glcanvas.obj : glcanvas.cpp

 pen.obj : pen.cpp
 region.obj : region.cpp
 utilsx.obj : utilsx.cpp
 pen.obj : pen.cpp
 region.obj : region.cpp
 utilsx.obj : utilsx.cpp