Updates For OpenVMS support and some extra includes to define wx(xxxx)DC types.

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

diff --git a/descrip.mms b/descrip.mms
index fc240c37085ba82eb5a963c5e7b8fbde80a15b4c..9293d075946061374b7c6630e4da0219422ae767 100644 (file)
--- a/descrip.mms
+++ b/descrip.mms
@@ -2,7 +2,7 @@
 #                                                                            *
 # Make file for VMS                                                          *
 # Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *
 #                                                                            *
 # Make file for VMS                                                          *
 # Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *

-# Date : 5 September 2007                                                    *
+# Date : 23 November 2007                                                    *

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


@@ -65,8 +65,6 @@ gtk : [.include.wx]setup.h
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
        set default [-.controls]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
        set default [-.controls]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)

-       set default [-.db]
-       $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)

        set default [-.dialogs]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
        set default [-.dialup]
        set default [-.dialogs]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
        set default [-.dialup]


@@ -127,8 +125,6 @@ gtk2 : [.include.wx]setup.h
        set default [-.config]
 #      $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)
        set default [-.controls]
        set default [-.config]
 #      $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)
        set default [-.controls]

-#      $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)
-       set default [-.db]

 #      $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)
        set default [-.dialogs]
 #      $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)
 #      $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)
        set default [-.dialogs]
 #      $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)


@@ -191,8 +187,6 @@ x11 : [.include.wx]setup.h
        set default [-.config]
 #      $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
        set default [-.controls]
        set default [-.config]
 #      $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
        set default [-.controls]

-#      $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
-       set default [-.db]

 #      $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
        set default [-.dialogs]
 #      $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
 #      $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
        set default [-.dialogs]
 #      $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)

diff --git a/include/wx/gtk1/dcmemory.h b/include/wx/gtk1/dcmemory.h
index e388097ff6bf3020a54c5f0b8a45be46a4453ae7..f3744dfdf9ceedecf58df5f91c95b89ba52299fc 100644 (file)
--- a/include/wx/gtk1/dcmemory.h
+++ b/include/wx/gtk1/dcmemory.h
@@ -10,6 +10,7 @@
 #ifndef __GTKDCMEMORYH__
 #define __GTKDCMEMORYH__
 
 #ifndef __GTKDCMEMORYH__
 #define __GTKDCMEMORYH__
 

+#include "wx/dcmemory.h"

 #include "wx/gtk1/dcclient.h"
 
 //-----------------------------------------------------------------------------
 #include "wx/gtk1/dcclient.h"
 
 //-----------------------------------------------------------------------------

diff --git a/lib/VMS_GTK2.OPT b/lib/VMS_GTK2.OPT
index 837b419f3b2ed494445f06036ff75264480f2ad3..1efb99b6ff974f2d604262ce03ee331addfcd0e7 100755 (executable)
--- a/lib/VMS_GTK2.OPT
+++ b/lib/VMS_GTK2.OPT
@@ -1,4 +1,6 @@
 wx_root:[wxwidgets.lib]libwx_gtk2.olb/lib
 wx_root:[wxwidgets.lib]libwx_gtk2.olb/lib

+sys$library:libcairo.olb/lib
+sys$library:libpixman.olb/lib

 sys$library:libjpeg.olb/lib
 sys$library:libpng.olb/lib
 sys$library:libz.olb/lib
 sys$library:libjpeg.olb/lib
 sys$library:libpng.olb/lib
 sys$library:libz.olb/lib


@@ -10,6 +12,7 @@ sys$share:libgdk-pixbuf.exe/share
 sys$share:libgdk2.exe/share
 sys$share:libpango.exe/share
 sys$share:libglib2.exe/share
 sys$share:libgdk2.exe/share
 sys$share:libpango.exe/share
 sys$share:libglib2.exe/share

-sys$share:iodbc.exe/share
+sys$share:freetype2shr/share
+sys$share:libfontconfig/share

 sys$share:pthread$rtl.exe/share
 sys$library:decw$xlibshr.exe/share
 sys$share:pthread$rtl.exe/share
 sys$library:decw$xlibshr.exe/share

diff --git a/lib/VMS_X11_UNIV.OPT b/lib/VMS_X11_UNIV.OPT
index 363b72142d1c3a1f4287a2a4b7cb2879ea89cbe7..dd9556e109565fa7a16ab8b23c34fe7b03d34ed5 100755 (executable)
--- a/lib/VMS_X11_UNIV.OPT
+++ b/lib/VMS_X11_UNIV.OPT
@@ -5,7 +5,6 @@ sys$library:libz.olb/lib
 sys$library:tiff.olb/lib
 sys$library:expat.olb/lib
 X11:libxpm.olb/lib
 sys$library:tiff.olb/lib
 sys$library:expat.olb/lib
 X11:libxpm.olb/lib

-sys$share:iodbc.exe/share

 sys$share:pthread$rtl.exe/share
 sys$library:decw$xextlibshr.exe/share
 sys$library:decw$xlibshr.exe/share
 sys$share:pthread$rtl.exe/share
 sys$library:decw$xextlibshr.exe/share
 sys$library:decw$xlibshr.exe/share

diff --git a/lib/vms_gtk.opt b/lib/vms_gtk.opt
index b2af93ead33fa65df5ce5f139dd70de5218aa570..5cc8077e0a44fe88c7c15007aad57331af11d083 100644 (file)
--- a/lib/vms_gtk.opt
+++ b/lib/vms_gtk.opt
@@ -6,7 +6,6 @@ sys$library:libz.olb/lib
 sys$library:tiff.olb/lib
 sys$library:expat.olb/lib
 X11:libxpm.olb/lib
 sys$library:tiff.olb/lib
 sys$library:expat.olb/lib
 X11:libxpm.olb/lib

-sys$share:iodbc.exe/share

 sys$share:libgtk.exe/share
 sys$share:libgdk.exe/share
 sys$share:libglib.exe/share
 sys$share:libgtk.exe/share
 sys$share:libgdk.exe/share
 sys$share:libglib.exe/share

diff --git a/setup.h_vms b/setup.h_vms
index 7ae26caae899eb6d798f2e3171bfe5598a08c016..7e67b3a9b206f419bd5070f1e9b466a98a2776ec 100644 (file)
--- a/setup.h_vms
+++ b/setup.h_vms
@@ -3,7 +3,7 @@
  * Template for the set.h file for VMS                                       *
  * Created from setup.h_in                                                   *
  * Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                            *
  * Template for the set.h file for VMS                                       *
  * Created from setup.h_in                                                   *
  * Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                            *

- * Date : 25 September 2007                                                   *
+ * Date : 10 December 2007                                                   *

  *                                                                           *
  *****************************************************************************/
 
  *                                                                           *
  *****************************************************************************/
 


@@ -82,9 +82,6 @@
 #ifdef VMS_GTK2
 #define __WXGTK20__ 1
 
 #ifdef VMS_GTK2
 #define __WXGTK20__ 1
 

-/* Define this if your version of GTK+ is greater than 2.4 */
-#define __WXGTK24__ 1
-

 /* Define this if your version of GTK+ is greater than 2.6 */
 #define __WXGTK26__ 1
 
 /* Define this if your version of GTK+ is greater than 2.6 */
 #define __WXGTK26__ 1
 


@@ -191,7 +188,7 @@ typedef pid_t GPid;
 
 
 #ifndef wxUSE_UNICODE
 
 
 #ifndef wxUSE_UNICODE

-#if defined( __WXX11__ )
+#if defined( __WXX11__ ) || defined ( __WXMOTIF__ )

     #define wxUSE_UNICODE 0
 #else
     #define wxUSE_UNICODE 1
     #define wxUSE_UNICODE 0
 #else
     #define wxUSE_UNICODE 1


@@ -271,6 +268,8 @@ typedef pid_t GPid;
 #define wxUSE_SOCKETS       1
 #include <socket.h>
 
 #define wxUSE_SOCKETS       1
 #include <socket.h>
 

+#define wxUSE_IPV6          0
+

 #define wxUSE_FILESYSTEM    1
 
 #define wxUSE_FS_ZIP        1
 #define wxUSE_FILESYSTEM    1
 
 #define wxUSE_FS_ZIP        1


@@ -426,6 +425,8 @@ typedef pid_t GPid;
 
 #define wxUSE_MENUS         1
 
 
 #define wxUSE_MENUS         1
 

+#define wxUSE_NOTIFICATION_MESSAGE 1
+

 #define wxUSE_SASH          1
 
 #define wxUSE_SPLITTER      1
 #define wxUSE_SASH          1
 
 #define wxUSE_SPLITTER      1


@@ -608,6 +609,8 @@ typedef pid_t GPid;
 
 #define wxUSE_OWNER_DRAWN 0
 
 
 #define wxUSE_OWNER_DRAWN 0
 

+#define wxUSE_TASKBARICON_BALLOONS 0
+

 #define wxUSE_UXTHEME           0
 
 #define wxUSE_INKEDIT  0
 #define wxUSE_UXTHEME           0
 
 #define wxUSE_INKEDIT  0


@@ -620,10 +623,6 @@ typedef pid_t GPid;
 
 #define wxUSE_CRASHREPORT 0
 
 
 #define wxUSE_CRASHREPORT 0
 

-
-
-#define wxUSE_BITMAP_MESSAGE         0
-

 /* --- end MSW options --- */
 
 /*
 /* --- end MSW options --- */
 
 /*


@@ -1180,9 +1179,6 @@ typedef pid_t GPid;
 /* Define if you have pango_font_family_is_monospace() (Pango >= 1.3.3) */
 #undef HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE
 
 /* Define if you have pango_font_family_is_monospace() (Pango >= 1.3.3) */
 #undef HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE
 

-/* Define if gtk_icon_size_lookup is missing from the GTK+ headers */
-#undef NEED_GTK_ICON_SIZE_LOOKUP
-

 /* Define if you have Pango xft support */
 #undef HAVE_PANGO_XFT
 
 /* Define if you have Pango xft support */
 #undef HAVE_PANGO_XFT
 

diff --git a/src/common/descrip.mms b/src/common/descrip.mms
index 003a5584046d50c1465ac58975531fb6b87f149e..22a6075b3cfa657a653da57e8de6b5173090d358 100644 (file)
--- a/src/common/descrip.mms
+++ b/src/common/descrip.mms
@@ -2,7 +2,7 @@
 #                                                                            *
 # Make file for VMS                                                          *
 # Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *
 #                                                                            *
 # Make file for VMS                                                          *
 # Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *

-# Date : 29 September 2007                                                   *
+# Date : 26 November 2007                                                    *

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


@@ -78,9 +78,6 @@ OBJECTS = \
                datacmn.obj,\
                datetime.obj,\
                datstrm.obj,\
                datacmn.obj,\
                datetime.obj,\
                datstrm.obj,\

-               db.obj,\
-               dbgrid.obj,\
-               dbtable.obj,\

                dcbase.obj,\
                dcbufcmn.obj,\
                dircmn.obj,\
                dcbase.obj,\
                dcbufcmn.obj,\
                dircmn.obj,\


@@ -223,7 +220,7 @@ OBJECTS_X11=accesscmn.obj,dndcmn.obj,dpycmn.obj,dseldlg.obj,\
 OBJECTS_X11_2=gsocketiohandler.obj,fdiodispatcher.obj,selectdispatcher.obj
 
 
 OBJECTS_X11_2=gsocketiohandler.obj,fdiodispatcher.obj,selectdispatcher.obj
 
 

-OBJECTS_GTK2=fontutilcmn.obj
+OBJECTS_GTK2=fontutilcmn.obj,cairo.obj

 
 SOURCES = \
                accelcmn.cpp,\
 
 SOURCES = \
                accelcmn.cpp,\


@@ -238,6 +235,7 @@ SOURCES = \
                bmpbase.cpp,\
                btncmn.cpp,\
                bookctrl.cpp,\
                bmpbase.cpp,\
                btncmn.cpp,\
                bookctrl.cpp,\

+               cairo.cpp,\

                choiccmn.cpp,\
                clipcmn.cpp,\
                clntdata.cpp,\
                choiccmn.cpp,\
                clipcmn.cpp,\
                clntdata.cpp,\


@@ -254,9 +252,6 @@ SOURCES = \
                datacmn.cpp,\
                datetime.cpp,\
                datstrm.cpp,\
                datacmn.cpp,\
                datetime.cpp,\
                datstrm.cpp,\

-               db.cpp,\
-               dbgrid.cpp,\
-               dbtable.cpp,\

                dcbase.cpp,\
                dcbufcmn.cpp,\
                dircmn.cpp,\
                dcbase.cpp,\
                dcbufcmn.cpp,\
                dircmn.cpp,\


@@ -476,9 +471,6 @@ ctrlsub.obj : ctrlsub.cpp
 datacmn.obj : datacmn.cpp
 datetime.obj : datetime.cpp
 datstrm.obj : datstrm.cpp
 datacmn.obj : datacmn.cpp
 datetime.obj : datetime.cpp
 datstrm.obj : datstrm.cpp

-db.obj : db.cpp
-dbgrid.obj : dbgrid.cpp
-dbtable.obj : dbtable.cpp

 dcbase.obj : dcbase.cpp
 dcbufcmn.obj : dcbufcmn.cpp
 dircmn.obj : dircmn.cpp
 dcbase.obj : dcbase.cpp
 dcbufcmn.obj : dcbufcmn.cpp
 dircmn.obj : dircmn.cpp


@@ -630,3 +622,4 @@ listctrlcmn.obj : listctrlcmn.cpp
 srchcmn.obj : srchcmn.cpp
 textentrycmn.obj : textentrycmn.cpp
 filectrlcmn.obj : filectrlcmn.cpp
 srchcmn.obj : srchcmn.cpp
 textentrycmn.obj : textentrycmn.cpp
 filectrlcmn.obj : filectrlcmn.cpp

+cairo.obj : cairo.cpp

diff --git a/src/generic/descrip.mms b/src/generic/descrip.mms
index c8eac2b8873d55fea4ee27eb3125212aef797bd9..c5b445355783b19efcc9950ece9cec07b873dbb9 100644 (file)
--- a/src/generic/descrip.mms
+++ b/src/generic/descrip.mms
@@ -2,7 +2,7 @@
 #                                                                            *
 # Make file for VMS                                                          *
 # Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *
 #                                                                            *
 # Make file for VMS                                                          *
 # Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *

-# Date : 30 September 2007                                                   *
+# Date : 20 December 2007                                                    *

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


@@ -46,21 +46,17 @@ CC_DEFINE =
 
 OBJECTS = \
                aboutdlgg.obj,\
 
 OBJECTS = \
                aboutdlgg.obj,\

-               animateg.obj,\

                busyinfo.obj,\
                calctrl.obj,\
                caret.obj,\
                choicbkg.obj,\
                choicdgg.obj,\
                busyinfo.obj,\
                calctrl.obj,\
                caret.obj,\
                choicbkg.obj,\
                choicdgg.obj,\

-               colrdlgg.obj,\
-               clrpickerg.obj,\

                datectlg.obj,\
                dcpsg.obj,\
                dirctrlg.obj,\
                dirdlgg.obj,\
                fdrepdlg.obj,\
                fontdlgg.obj,\
                datectlg.obj,\
                dcpsg.obj,\
                dirctrlg.obj,\
                dirdlgg.obj,\
                fdrepdlg.obj,\
                fontdlgg.obj,\

-               fontpickerg.obj,\

                grid.obj,\
                gridctrl.obj,\
                gridsel.obj,\
                grid.obj,\
                gridctrl.obj,\
                gridsel.obj,\


@@ -95,7 +91,7 @@ OBJECTS = \
                hyperlinkg.obj,\
                filepickerg.obj,\
                bmpcboxg.obj,\
                hyperlinkg.obj,\
                filepickerg.obj,\
                bmpcboxg.obj,\

-               filectrlg.obj,srchctlg.obj
+               filectrlg.obj,srchctlg.obj,notifmsgg.obj

 
 SOURCES = \
                aboutdlgg.cpp,\
 
 SOURCES = \
                aboutdlgg.cpp,\


@@ -164,45 +160,51 @@ SOURCES = \
                hyperlinkg.cpp,\
                filepickerg.cpp,\
                vscroll.cpp,\
                hyperlinkg.cpp,\
                filepickerg.cpp,\
                vscroll.cpp,\

-               icon.cpp,bmpcboxg.cpp,filectrlg.cpp,srchctlg.cpp
+               icon.cpp,bmpcboxg.cpp,filectrlg.cpp,srchctlg.cpp,notifmsgg.cpp

 
 .ifdef __WXMOTIF__
 
 .ifdef __WXMOTIF__

-OBJECTS0=,statusbr.obj,statline.obj,notebook.obj,spinctlg.obj,collpaneg.obj,\
-       combog.obj
+OBJECTS0=statusbr.obj,statline.obj,notebook.obj,spinctlg.obj,collpaneg.obj,\
+       combog.obj,animateg.obj,colrdlgg.obj,clrpickerg.obj,fontpickerg.obj,\
+       paletteg.obj

 .else
 .ifdef __WXX11__
 .else
 .ifdef __WXX11__

-OBJECTS0=,accel.obj,filedlgg.obj,dragimgg.obj,fdrepdlg.obj,htmllbox.obj,\
+OBJECTS0=accel.obj,filedlgg.obj,dragimgg.obj,fdrepdlg.obj,htmllbox.obj,\

        listbkg.obj,mdig.obj,spinctlg.obj,splash.obj,timer.obj,\
        listbkg.obj,mdig.obj,spinctlg.obj,splash.obj,timer.obj,\

-       vlbox.obj,vscroll.obj,combog.obj,icon.obj,collpaneg.obj
+       vlbox.obj,vscroll.obj,combog.obj,icon.obj,collpaneg.obj,animateg.obj,\
+       colrdlgg.obj,clrpickerg.obj,fontpickerg.obj

 .else
 .ifdef __WXGTK__
 .else
 .ifdef __WXGTK__

-OBJECTS0=,accel.obj,statusbr.obj,filedlgg.obj,paletteg.obj,vlbox.obj,\
-       vscroll.obj,combog.obj,icon.obj,collpaneg.obj
+OBJECTS0=accel.obj,statusbr.obj,filedlgg.obj,paletteg.obj,vlbox.obj,\
+       vscroll.obj,combog.obj,icon.obj,collpaneg.obj,animateg.obj,\
+       colrdlgg.obj,clrpickerg.obj,fontpickerg.obj

 .else
 .else

-OBJECTS0=,accel.obj,statusbr.obj,filedlgg.obj,paletteg.obj,vlbox.obj,\
+OBJECTS0=accel.obj,statusbr.obj,filedlgg.obj,paletteg.obj,vlbox.obj,\

        vscroll.obj,combog.obj,icon.obj
 .endif
 .endif
 .endif
 
 all : $(SOURCES)
        vscroll.obj,combog.obj,icon.obj
 .endif
 .endif
 .endif
 
 all : $(SOURCES)

-       $(MMS)$(MMSQUALIFIERS) $(OBJECTS)$(OBJECTS0)
+       $(MMS)$(MMSQUALIFIERS) $(OBJECTS),$(OBJECTS0)

 .ifdef __WXMOTIF__
 .ifdef __WXMOTIF__

-       library/crea [--.lib]libwx_motif.olb $(OBJECTS)$(OBJECTS0)
+       library/crea [--.lib]libwx_motif.olb $(OBJECTS),$(OBJECTS0)

 .else
 .ifdef __WXGTK__
 .else
 .ifdef __WXGTK__

-       library/crea [--.lib]libwx_gtk.olb $(OBJECTS)$(OBJECTS0)
+       library/crea [--.lib]libwx_gtk.olb $(OBJECTS),$(OBJECTS0)

 .else
 .ifdef __WXGTK2__
 .else
 .ifdef __WXGTK2__

-       library/crea [--.lib]libwx_gtk2.olb $(OBJECTS)$(OBJECTS0)
+       library/crea [--.lib]libwx_gtk2.olb $(OBJECTS),$(OBJECTS0)

 .else
 .ifdef __WXX11__
 .else
 .ifdef __WXX11__

-       library/crea [--.lib]libwx_x11_univ.olb $(OBJECTS)$(OBJECTS0)
+       library/crea [--.lib]libwx_x11_univ.olb $(OBJECTS),$(OBJECTS0)

 .endif
 .endif
 .endif
 .endif
 
 .endif
 .endif
 .endif
 .endif
 

+$(OBJECTS) : [--.include.wx]setup.h
+$(OBJECTS0) : [--.include.wx]setup.h
+

 aboutdlgg.obj : aboutdlgg.cpp
 accel.obj : accel.cpp
 animateg.obj : animateg.cpp
 aboutdlgg.obj : aboutdlgg.cpp
 accel.obj : accel.cpp
 animateg.obj : animateg.cpp


@@ -277,3 +279,4 @@ filepickerg.obj : filepickerg.cpp
 bmpcboxg.obj : bmpcboxg.cpp
 filectrlg.obj : filectrlg.cpp
 srchctlg.obj : srchctlg.cpp
 bmpcboxg.obj : bmpcboxg.cpp
 filectrlg.obj : filectrlg.cpp
 srchctlg.obj : srchctlg.cpp

+notifmsgg.obj : notifmsgg.cpp

diff --git a/src/gtk/descrip.mms b/src/gtk/descrip.mms
index caa2a35ae31b16e6cdd7b3dda1004d2629a2e507..b20f4e63c71f671c1da704e4ab82c94b3d1500ce 100644 (file)
--- a/src/gtk/descrip.mms
+++ b/src/gtk/descrip.mms
@@ -2,7 +2,7 @@
 #                                                                            *
 # Make file for VMS                                                          *
 # Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *
 #                                                                            *
 # Make file for VMS                                                          *
 # Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *

-# Date : 5 October 2007                                                      *
+# Date : 26 November 2007                                                    *

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


@@ -34,6 +34,7 @@ CC_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/iee=denorm
        cc $(CFLAGS)$(CC_DEFINE) $(MMS$TARGET_NAME).c
 
 OBJECTS = \
        cc $(CFLAGS)$(CC_DEFINE) $(MMS$TARGET_NAME).c
 
 OBJECTS = \

+       animate.obj,\

        app.obj,\
        artgtk.obj,\
        bitmap.obj,\
        app.obj,\
        artgtk.obj,\
        bitmap.obj,\


@@ -43,7 +44,6 @@ OBJECTS = \
        colour.obj,\
        collpane.obj,\
        cursor.obj,\
        colour.obj,\
        collpane.obj,\
        cursor.obj,\

-       data.obj,\

        dataobj.obj,\
        dc.obj,\
        dcclient.obj,\
        dataobj.obj,\
        dc.obj,\
        dcclient.obj,\


@@ -66,7 +66,6 @@ OBJECTS = \
        toplevel.obj,\
        utilsgtk.obj,\
        utilsres.obj,\
        toplevel.obj,\
        utilsgtk.obj,\
        utilsres.obj,\

-        win_gtk.obj,\

        window.obj
 
 OBJECTS0= \
        window.obj
 
 OBJECTS0= \


@@ -100,9 +99,11 @@ OBJECTS0= \
        textctrl.obj,\
        tglbtn.obj,\
        msgdlg.obj,\
        textctrl.obj,\
        tglbtn.obj,\
        msgdlg.obj,\

-       treeentry_gtk.obj,textentry.obj,filectrl.obj,print.obj
+       treeentry_gtk.obj,textentry.obj,filectrl.obj,print.obj,win_gtk.obj,\
+       mnemonics.obj

 
 SOURCES =\
 
 SOURCES =\

+       animate.cpp,\

        app.cpp,\
        artgtk.cpp, \
        bitmap.cpp,\
        app.cpp,\
        artgtk.cpp, \
        bitmap.cpp,\


@@ -119,7 +120,6 @@ SOURCES =\
         combobox.cpp,\
        control.cpp,\
        cursor.cpp,\
         combobox.cpp,\
        control.cpp,\
        cursor.cpp,\

-       data.cpp,\

        dataobj.cpp,\
        dc.cpp,\
        dcclient.cpp,\
        dataobj.cpp,\
        dc.cpp,\
        dcclient.cpp,\


@@ -165,9 +165,9 @@ SOURCES =\
        toplevel.cpp,\
        utilsgtk.cpp,\
        utilsres.cpp,\
        toplevel.cpp,\
        utilsgtk.cpp,\
        utilsres.cpp,\

-        win_gtk.c,\

        window.cpp,\
        window.cpp,\

-       treeentry_gtk.c,textentry.cpp,filectrl.cpp,print.cpp
+       treeentry_gtk.c,textentry.cpp,filectrl.cpp,print.cpp,win_gtk.cpp,\
+       mnemonics.cpp

    
 all : $(SOURCES)
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS)
    
 all : $(SOURCES)
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS)


@@ -188,6 +188,10 @@ all : $(SOURCES)
 .endif
 .endif
 
 .endif
 .endif
 

+$(OBJECTS) : [--.include.wx]setup.h
+$(OBJECTS0) : [--.include.wx]setup.h
+
+animate.obj : animate.cpp

 app.obj : app.cpp
 artgtk.obj : artgtk.cpp
 bitmap.obj : bitmap.cpp
 app.obj : app.cpp
 artgtk.obj : artgtk.cpp
 bitmap.obj : bitmap.cpp


@@ -204,7 +208,6 @@ collpane.obj : collpane.cpp
 combobox.obj : combobox.cpp
 control.obj : control.cpp
 cursor.obj : cursor.cpp
 combobox.obj : combobox.cpp
 control.obj : control.cpp
 cursor.obj : cursor.cpp

-data.obj : data.cpp

 dataobj.obj : dataobj.cpp
 dc.obj : dc.cpp
 dcclient.obj : dcclient.cpp
 dataobj.obj : dataobj.cpp
 dc.obj : dc.cpp
 dcclient.obj : dcclient.cpp


@@ -250,9 +253,10 @@ tooltip.obj : tooltip.cpp
 toplevel.obj : toplevel.cpp
 utilsgtk.obj : utilsgtk.cpp
 utilsres.obj : utilsres.cpp
 toplevel.obj : toplevel.cpp
 utilsgtk.obj : utilsgtk.cpp
 utilsres.obj : utilsres.cpp

-win_gtk.obj : win_gtk.c

 window.obj : window.cpp
 treeentry_gtk.obj : treeentry_gtk.c
 textentry.obj : textentry.cpp
 filectrl.obj : filectrl.cpp
 print.obj : print.cpp
 window.obj : window.cpp
 treeentry_gtk.obj : treeentry_gtk.c
 textentry.obj : textentry.cpp
 filectrl.obj : filectrl.cpp
 print.obj : print.cpp

+win_gtk.obj : win_gtk.cpp
+mnemonics.obj : mnemonics.cpp

diff --git a/src/gtk/treeentry_gtk.c b/src/gtk/treeentry_gtk.c
index c0f8b87c510de7e4a6f646c4987b33624bf0d066..610772cb0e6de1566b15e8c3d2b4584f844f68f8 100644 (file)
--- a/src/gtk/treeentry_gtk.c
+++ b/src/gtk/treeentry_gtk.c
@@ -7,6 +7,12 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////// */
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////// */
 

+#ifdef __VMS
+#include <types.h>
+typedef pid_t GPid;
+#define G_GNUC_INTERNAL 
+#endif
+

 #include "wx/gtk/treeentry_gtk.h"
 
 /*
 #include "wx/gtk/treeentry_gtk.h"
 
 /*

diff --git a/src/gtk1/dcscreen.cpp b/src/gtk1/dcscreen.cpp
index 1cac9707258cc65f67ff596dbc69dfdb50f86682..0bb3de0009ce038d11864ecced13c29c05a02dca 100644 (file)
--- a/src/gtk1/dcscreen.cpp
+++ b/src/gtk1/dcscreen.cpp
@@ -18,6 +18,7 @@
 #include <gdk/gdkx.h>
 #include <gtk/gtk.h>
 
 #include <gdk/gdkx.h>
 #include <gtk/gtk.h>
 

+#include "wx/dcscreen.h"

 #include "wx/gtk1/dcscreen.h"
 
 //-----------------------------------------------------------------------------
 #include "wx/gtk1/dcscreen.h"
 
 //-----------------------------------------------------------------------------

diff --git a/src/gtk1/minifram.cpp b/src/gtk1/minifram.cpp
index f0ad104feaaa404c0975827a8fc4cb8f4c655c87..568e6436ad7db5132f7e1fba286674d91763c0e9 100644 (file)
--- a/src/gtk1/minifram.cpp
+++ b/src/gtk1/minifram.cpp
@@ -19,6 +19,7 @@
 #endif
 
 #include "gtk/gtk.h"
 #endif
 
 #include "gtk/gtk.h"

+#include "wx/dcclient.h"

 #include "wx/gtk1/win_gtk.h"
 #include "wx/gtk1/private.h"
 #include "wx/gtk1/dcclient.h"
 #include "wx/gtk1/win_gtk.h"
 #include "wx/gtk1/private.h"
 #include "wx/gtk1/dcclient.h"

diff --git a/src/motif/combobox.cpp b/src/motif/combobox.cpp
index 099cc58604a8f0db4071ba8041705c2eef785835..f7326ad98c0ce0926b79d7561915a7f21424c4ae 100644 (file)
--- a/src/motif/combobox.cpp
+++ b/src/motif/combobox.cpp
@@ -121,6 +121,8 @@ void wxComboBox::DoSetSize(int x, int y,
     wxWindow::DoSetSize(x, y, width, DoGetBestSize().y, sizeFlags);
 }
 
     wxWindow::DoSetSize(x, y, width, DoGetBestSize().y, sizeFlags);
 }
 

+#if 0
+// Already defined in include/motif/combobox.h

 wxString wxComboBox::GetValue() const
 {
     char *s = XmComboBoxGetString ((Widget) m_mainWidget);
 wxString wxComboBox::GetValue() const
 {
     char *s = XmComboBoxGetString ((Widget) m_mainWidget);


@@ -133,6 +135,7 @@ wxString wxComboBox::GetValue() const
     else
         return wxEmptyString;
 }
     else
         return wxEmptyString;
 }

+#endif

 
 void wxComboBox::SetValue(const wxString& value)
 {
 
 void wxComboBox::SetValue(const wxString& value)
 {


@@ -184,7 +187,7 @@ void wxComboBox::DoDeleteOneItem(unsigned int n)
     m_noStrings--;
 }
 
     m_noStrings--;
 }
 

-void wxComboBox::DoClear()
+void wxComboBox::Clear()

 {
     XmComboBoxDeleteAllItems((Widget) m_mainWidget);
     m_stringList.Clear();
 {
     XmComboBoxDeleteAllItems((Widget) m_mainWidget);
     m_stringList.Clear();

diff --git a/src/motif/dc.cpp b/src/motif/dc.cpp
index 0a7d137aca3df382b2b7de79017b13b176094aad..6ce44a8df1ca059e657f6fbd2913c87ff656329e 100644 (file)
--- a/src/motif/dc.cpp
+++ b/src/motif/dc.cpp
@@ -14,6 +14,7 @@
 
 #ifndef WX_PRECOMP
     #include "wx/dcmemory.h"
 
 #ifndef WX_PRECOMP
     #include "wx/dcmemory.h"

+    #include "wx/icon.h"

 #endif
 
 #include "wx/motif/dc.h"
 #endif
 
 #include "wx/motif/dc.h"

diff --git a/src/motif/dcclient.cpp b/src/motif/dcclient.cpp
index ee4e22a33adde4bb9882e4783143160fd636b7a4..2176913c624c387ab36d4ec3ebbefc786f7a5f7f 100644 (file)
--- a/src/motif/dcclient.cpp
+++ b/src/motif/dcclient.cpp
@@ -46,6 +46,7 @@
     #include "wx/dcmemory.h"
     #include "wx/math.h"
     #include "wx/image.h"
     #include "wx/dcmemory.h"
     #include "wx/math.h"
     #include "wx/image.h"

+    #include "wx/dcclient.h"

 #endif
 
 #ifdef __VMS__
 #endif
 
 #ifdef __VMS__

diff --git a/src/motif/dcmemory.cpp b/src/motif/dcmemory.cpp
index 7e3fa862da068121f1f60fa25c8954b9e7c909ff..79b11e38e6b34ca7bc082f5ca5a08bb5dd18cc9b 100644 (file)
--- a/src/motif/dcmemory.cpp
+++ b/src/motif/dcmemory.cpp
@@ -15,6 +15,8 @@
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/settings.h"
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/settings.h"

+    #include "wx/dcmemory.h"
+    #include "wx/dcclient.h"

 #endif
 
 #ifdef __VMS__
 #endif
 
 #ifdef __VMS__

diff --git a/src/motif/dcscreen.cpp b/src/motif/dcscreen.cpp
index bca02b0b5e6e4c1dd9ac0b7baa39c2ab573f81e1..31101b5dc8299fa42b7bf4629f10f5665047241f 100644 (file)
--- a/src/motif/dcscreen.cpp
+++ b/src/motif/dcscreen.cpp
@@ -16,6 +16,7 @@
     #include "wx/utils.h"
     #include "wx/window.h"
     #include "wx/frame.h"
     #include "wx/utils.h"
     #include "wx/window.h"
     #include "wx/frame.h"

+    #include "wx/dcscreen.h"

 #endif
 
 #ifdef __VMS__
 #endif
 
 #ifdef __VMS__

diff --git a/src/motif/descrip.mms b/src/motif/descrip.mms
index cf50c0359601ff6faa2beeb7a19e56012403f958..cc16d1ce44b9fcdf4a0f1d96a6454a48befcf032 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.nano.tudelft.nl)                             *
 #                                                                            *
 # Make file for VMS                                                          *
 # Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *

-# Date : 21 September 2006                                                   *
+# Date : 19 december 2007                                                    *

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


@@ -59,7 +59,6 @@ OBJECTS = \
                menuitem.obj,\
                minifram.obj,\
                msgdlg.obj,\
                menuitem.obj,\
                minifram.obj,\
                msgdlg.obj,\

-               palette.obj,\

                radiobox.obj,\
                radiobut.obj,\
                scrolbar.obj,\
                radiobox.obj,\
                radiobut.obj,\
                scrolbar.obj,\


@@ -70,6 +69,7 @@ OBJECTS = \
                statbox.obj,\
                stattext.obj,\
                textctrl.obj,\
                statbox.obj,\
                stattext.obj,\
                textctrl.obj,\

+               textentry.obj,\

                toplevel.obj,\
                timer.obj,\
                toolbar.obj,\
                toplevel.obj,\
                timer.obj,\
                toolbar.obj,\


@@ -111,7 +111,6 @@ SOURCES = \
                menuitem.cpp,\
                minifram.cpp,\
                msgdlg.cpp,\
                menuitem.cpp,\
                minifram.cpp,\
                msgdlg.cpp,\

-               palette.cpp,\

                radiobox.cpp,\
                radiobut.cpp,\
                scrolbar.cpp,\
                radiobox.cpp,\
                radiobut.cpp,\
                scrolbar.cpp,\


@@ -122,6 +121,7 @@ SOURCES = \
                statbox.cpp,\
                stattext.cpp,\
                textctrl.cpp,\
                statbox.cpp,\
                stattext.cpp,\
                textctrl.cpp,\

+               textentry.cpp,\

                toplevel.cpp,\
                timer.cpp,\
                toolbar.cpp,\
                toplevel.cpp,\
                timer.cpp,\
                toolbar.cpp,\


@@ -135,6 +135,8 @@ all : $(SOURCES)
        library [--.lib]libwx_motif.olb $(OBJECTS)
 .endif
 
        library [--.lib]libwx_motif.olb $(OBJECTS)
 .endif
 

+$(OBJECTS) : [--.include.wx]setup.h
+

 xmcombo.obj : [.xmcombo]xmcombo.c
        cc $(CFLAGS)$(CC_DEFINE) [.xmcombo]xmcombo.c
 
 xmcombo.obj : [.xmcombo]xmcombo.c
        cc $(CFLAGS)$(CC_DEFINE) [.xmcombo]xmcombo.c
 


@@ -172,7 +174,6 @@ menu.obj : menu.cpp
 menuitem.obj : menuitem.cpp
 minifram.obj : minifram.cpp
 msgdlg.obj : msgdlg.cpp
 menuitem.obj : menuitem.cpp
 minifram.obj : minifram.cpp
 msgdlg.obj : msgdlg.cpp

-palette.obj : palette.cpp

 radiobox.obj : radiobox.cpp
 radiobut.obj : radiobut.cpp
 scrolbar.obj : scrolbar.cpp
 radiobox.obj : radiobox.cpp
 radiobut.obj : radiobut.cpp
 scrolbar.obj : scrolbar.cpp


@@ -183,6 +184,7 @@ statbmp.obj : statbmp.cpp
 statbox.obj : statbox.cpp
 stattext.obj : stattext.cpp
 textctrl.obj : textctrl.cpp
 statbox.obj : statbox.cpp
 stattext.obj : stattext.cpp
 textctrl.obj : textctrl.cpp

+textentry.obj : textentry.cpp

 toplevel.obj : toplevel.cpp
 timer.obj : timer.cpp
 toolbar.obj : toolbar.cpp
 toplevel.obj : toplevel.cpp
 timer.obj : timer.cpp
 toolbar.obj : toolbar.cpp