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

descrip.mms

@@ -2,7 +2,7 @@
 #                                                                            *
 # Make file for VMS                                                          *
 # Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *
-# Date : 5 September 2007                                                    *
+# Date : 23 November 2007                                                    *
 #                                                                            *
 #*****************************************************************************
 .first
@@ -65,8 +65,6 @@ gtk : [.include.wx]setup.h
 	$(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]
@@ -127,8 +125,6 @@ gtk2 : [.include.wx]setup.h
 	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)
@@ -191,8 +187,6 @@ x11 : [.include.wx]setup.h
 	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)

include/wx/gtk1/dcmemory.h

@@ -10,6 +10,7 @@
 #ifndef __GTKDCMEMORYH__
 #define __GTKDCMEMORYH__
 
+#include "wx/dcmemory.h"
 #include "wx/gtk1/dcclient.h"
 
 //-----------------------------------------------------------------------------

lib/VMS_GTK2.OPT

@@ -1,4 +1,6 @@
 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
@@ -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:iodbc.exe/share
+sys$share:freetype2shr/share
+sys$share:libfontconfig/share
 sys$share:pthread$rtl.exe/share
 sys$library:decw$xlibshr.exe/share

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$share:iodbc.exe/share
 sys$share:pthread$rtl.exe/share
 sys$library:decw$xextlibshr.exe/share
 sys$library:decw$xlibshr.exe/share

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$share:iodbc.exe/share
 sys$share:libgtk.exe/share
 sys$share:libgdk.exe/share
 sys$share:libglib.exe/share

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)                            *
- * Date : 25 September 2007                                                   *
+ * Date : 10 December 2007                                                   *
  *                                                                           *
  *****************************************************************************/
 
@@ -82,9 +82,6 @@
 #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
 
@@ -191,7 +188,7 @@ typedef pid_t GPid;
 
 
 #ifndef wxUSE_UNICODE
-#if defined( __WXX11__ )
+#if defined( __WXX11__ ) || defined ( __WXMOTIF__ )
     #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_IPV6          0
+
 #define wxUSE_FILESYSTEM    1
 
 #define wxUSE_FS_ZIP        1
@@ -426,6 +425,8 @@ typedef pid_t GPid;
 
 #define wxUSE_MENUS         1
 
+#define wxUSE_NOTIFICATION_MESSAGE 1
+
 #define wxUSE_SASH          1
 
 #define wxUSE_SPLITTER      1
@@ -608,6 +609,8 @@ typedef pid_t GPid;
 
 #define wxUSE_OWNER_DRAWN 0
 
+#define wxUSE_TASKBARICON_BALLOONS 0
+
 #define wxUSE_UXTHEME           0
 
 #define wxUSE_INKEDIT  0
@@ -620,10 +623,6 @@ typedef pid_t GPid;
 
 #define wxUSE_CRASHREPORT 0
 
-
-
-#define wxUSE_BITMAP_MESSAGE         0
-
 /* --- 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 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
 

src/common/descrip.mms

@@ -2,7 +2,7 @@
 #                                                                            *
 # Make file for VMS                                                          *
 # Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *
-# Date : 29 September 2007                                                   *
+# Date : 26 November 2007                                                    *
 #                                                                            *
 #*****************************************************************************
 .first
@@ -78,9 +78,6 @@ OBJECTS = \
 		datacmn.obj,\
 		datetime.obj,\
 		datstrm.obj,\
-		db.obj,\
-		dbgrid.obj,\
-		dbtable.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_GTK2=fontutilcmn.obj
+OBJECTS_GTK2=fontutilcmn.obj,cairo.obj
 
 SOURCES = \
 		accelcmn.cpp,\
@@ -238,6 +235,7 @@ SOURCES = \
 		bmpbase.cpp,\
 		btncmn.cpp,\
 		bookctrl.cpp,\
+		cairo.cpp,\
 		choiccmn.cpp,\
 		clipcmn.cpp,\
 		clntdata.cpp,\
@@ -254,9 +252,6 @@ SOURCES = \
 		datacmn.cpp,\
 		datetime.cpp,\
 		datstrm.cpp,\
-		db.cpp,\
-		dbgrid.cpp,\
-		dbtable.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
-db.obj : db.cpp
-dbgrid.obj : dbgrid.cpp
-dbtable.obj : dbtable.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
+cairo.obj : cairo.cpp

src/generic/descrip.mms

@@ -2,7 +2,7 @@
 #                                                                            *
 # Make file for VMS                                                          *
 # Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *
-# Date : 30 September 2007                                                   *
+# Date : 20 December 2007                                                    *
 #                                                                            *
 #*****************************************************************************
 .first
@@ -46,21 +46,17 @@ CC_DEFINE =
 
 OBJECTS = \
 		aboutdlgg.obj,\
-		animateg.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,\
-		fontpickerg.obj,\
 		grid.obj,\
 		gridctrl.obj,\
 		gridsel.obj,\
@@ -95,7 +91,7 @@ OBJECTS = \
 		hyperlinkg.obj,\
 		filepickerg.obj,\
 		bmpcboxg.obj,\
-		filectrlg.obj,srchctlg.obj
+		filectrlg.obj,srchctlg.obj,notifmsgg.obj
 
 SOURCES = \
 		aboutdlgg.cpp,\
@@ -164,45 +160,51 @@ SOURCES = \
 		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__
-OBJECTS0=,statusbr.obj,statline.obj,notebook.obj,spinctlg.obj,collpaneg.obj,\
+OBJECTS0=statusbr.obj,statline.obj,notebook.obj,spinctlg.obj,collpaneg.obj,\
-	combog.obj
+	combog.obj,animateg.obj,colrdlgg.obj,clrpickerg.obj,fontpickerg.obj,\
+	paletteg.obj
 .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,\
-	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__
-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,collpaneg.obj
+	vscroll.obj,combog.obj,icon.obj,collpaneg.obj,animateg.obj,\
+	colrdlgg.obj,clrpickerg.obj,fontpickerg.obj
 .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)
-	$(MMS)$(MMSQUALIFIERS) $(OBJECTS)$(OBJECTS0)
+	$(MMS)$(MMSQUALIFIERS) $(OBJECTS),$(OBJECTS0)
 .ifdef __WXMOTIF__
-	library/crea [--.lib]libwx_motif.olb $(OBJECTS)$(OBJECTS0)
+	library/crea [--.lib]libwx_motif.olb $(OBJECTS),$(OBJECTS0)
 .else
 .ifdef __WXGTK__
-	library/crea [--.lib]libwx_gtk.olb $(OBJECTS)$(OBJECTS0)
+	library/crea [--.lib]libwx_gtk.olb $(OBJECTS),$(OBJECTS0)
 .else
 .ifdef __WXGTK2__
-	library/crea [--.lib]libwx_gtk2.olb $(OBJECTS)$(OBJECTS0)
+	library/crea [--.lib]libwx_gtk2.olb $(OBJECTS),$(OBJECTS0)
 .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
 
+$(OBJECTS) : [--.include.wx]setup.h
+$(OBJECTS0) : [--.include.wx]setup.h
+
 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
+notifmsgg.obj : notifmsgg.cpp

src/gtk/descrip.mms

@@ -2,7 +2,7 @@
 #                                                                            *
 # Make file for VMS                                                          *
 # Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *
-# Date : 5 October 2007                                                      *
+# Date : 26 November 2007                                                    *
 #                                                                            *
 #*****************************************************************************
 .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 = \
+	animate.obj,\
 	app.obj,\
 	artgtk.obj,\
 	bitmap.obj,\
@@ -43,7 +44,6 @@ OBJECTS = \
 	colour.obj,\
 	collpane.obj,\
 	cursor.obj,\
-	data.obj,\
 	dataobj.obj,\
 	dc.obj,\
 	dcclient.obj,\
@@ -66,7 +66,6 @@ OBJECTS = \
 	toplevel.obj,\
 	utilsgtk.obj,\
 	utilsres.obj,\
-        win_gtk.obj,\
 	window.obj
 
 OBJECTS0= \
@@ -100,9 +99,11 @@ OBJECTS0= \
 	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 =\
+	animate.cpp,\
 	app.cpp,\
 	artgtk.cpp, \
 	bitmap.cpp,\
@@ -119,7 +120,6 @@ SOURCES =\
         combobox.cpp,\
 	control.cpp,\
 	cursor.cpp,\
-	data.cpp,\
 	dataobj.cpp,\
 	dc.cpp,\
 	dcclient.cpp,\
@@ -165,9 +165,9 @@ SOURCES =\
 	toplevel.cpp,\
 	utilsgtk.cpp,\
 	utilsres.cpp,\
-        win_gtk.c,\
 	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)
@@ -188,6 +188,10 @@ all : $(SOURCES)
 .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
@@ -204,7 +208,6 @@ collpane.obj : collpane.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
@@ -250,9 +253,10 @@ tooltip.obj : tooltip.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
+win_gtk.obj : win_gtk.cpp
+mnemonics.obj : mnemonics.cpp

src/gtk/treeentry_gtk.c

@@ -7,6 +7,12 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////// */
 
+#ifdef __VMS
+#include <types.h>
+typedef pid_t GPid;
+#define G_GNUC_INTERNAL 
+#endif
+
 #include "wx/gtk/treeentry_gtk.h"
 
 /*

src/gtk1/dcscreen.cpp

@@ -18,6 +18,7 @@
 #include <gdk/gdkx.h>
 #include <gtk/gtk.h>
 
+#include "wx/dcscreen.h"
 #include "wx/gtk1/dcscreen.h"
 
 //-----------------------------------------------------------------------------

src/gtk1/minifram.cpp

@@ -19,6 +19,7 @@
 #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"

src/motif/combobox.cpp

@@ -121,6 +121,8 @@ void wxComboBox::DoSetSize(int x, int y,
     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);
@@ -133,6 +135,7 @@ wxString wxComboBox::GetValue() const
     else
         return wxEmptyString;
 }
+#endif
 
 void wxComboBox::SetValue(const wxString& value)
 {
@@ -184,7 +187,7 @@ void wxComboBox::DoDeleteOneItem(unsigned int n)
     m_noStrings--;
 }
 
-void wxComboBox::DoClear()
+void wxComboBox::Clear()
 {
     XmComboBoxDeleteAllItems((Widget) m_mainWidget);
     m_stringList.Clear();

src/motif/dc.cpp

@@ -14,6 +14,7 @@
 
 #ifndef WX_PRECOMP
     #include "wx/dcmemory.h"
+    #include "wx/icon.h"
 #endif
 
 #include "wx/motif/dc.h"

src/motif/dcclient.cpp

@@ -46,6 +46,7 @@
     #include "wx/dcmemory.h"
     #include "wx/math.h"
     #include "wx/image.h"
+    #include "wx/dcclient.h"
 #endif
 
 #ifdef __VMS__

src/motif/dcmemory.cpp

@@ -15,6 +15,8 @@
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/settings.h"
+    #include "wx/dcmemory.h"
+    #include "wx/dcclient.h"
 #endif
 
 #ifdef __VMS__

src/motif/dcscreen.cpp

@@ -16,6 +16,7 @@
     #include "wx/utils.h"
     #include "wx/window.h"
     #include "wx/frame.h"
+    #include "wx/dcscreen.h"
 #endif
 
 #ifdef __VMS__

src/motif/descrip.mms

@@ -2,7 +2,7 @@
 #                                                                            *
 # Make file for VMS                                                          *
 # Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *
-# Date : 21 September 2006                                                   *
+# Date : 19 december 2007                                                    *
 #                                                                            *
 #*****************************************************************************
 .first
@@ -59,7 +59,6 @@ OBJECTS = \
 		menuitem.obj,\
 		minifram.obj,\
 		msgdlg.obj,\
-		palette.obj,\
 		radiobox.obj,\
 		radiobut.obj,\
 		scrolbar.obj,\
@@ -70,6 +69,7 @@ OBJECTS = \
 		statbox.obj,\
 		stattext.obj,\
 		textctrl.obj,\
+		textentry.obj,\
 		toplevel.obj,\
 		timer.obj,\
 		toolbar.obj,\
@@ -111,7 +111,6 @@ SOURCES = \
 		menuitem.cpp,\
 		minifram.cpp,\
 		msgdlg.cpp,\
-		palette.cpp,\
 		radiobox.cpp,\
 		radiobut.cpp,\
 		scrolbar.cpp,\
@@ -122,6 +121,7 @@ SOURCES = \
 		statbox.cpp,\
 		stattext.cpp,\
 		textctrl.cpp,\
+		textentry.cpp,\
 		toplevel.cpp,\
 		timer.cpp,\
 		toolbar.cpp,\
@@ -135,6 +135,8 @@ all : $(SOURCES)
 	library [--.lib]libwx_motif.olb $(OBJECTS)
 .endif
 
+$(OBJECTS) : [--.include.wx]setup.h
+
 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
-palette.obj : palette.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
+textentry.obj : textentry.cpp
 toplevel.obj : toplevel.cpp
 timer.obj : timer.cpp
 toolbar.obj : toolbar.cpp