Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Committing in .

Browse Source 
Enabling wxX11 for OpenVMS (phase 1)

 Modified Files:
 	wxWidgets/descrip.mms wxWidgets/setup.h_vms
 	wxWidgets/include/wx/display.h
 	wxWidgets/samples/minimal/descrip.mms
 	wxWidgets/src/common/descrip.mms
 	wxWidgets/src/common/dpycmn.cpp
 	wxWidgets/src/generic/descrip.mms
 	wxWidgets/src/html/descrip.mms wxWidgets/src/univ/descrip.mms
 	wxWidgets/src/unix/descrip.mms wxWidgets/src/x11/descrip.mms
 Added Files:
 	wxWidgets/lib/VMS_X11_UNIV.OPT
 Removed Files:
 	wxWidgets/lib/vms_gtk_univ.opt
 ----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26268 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jouk Jansen
2004-03-19 08:04:29 +00:00
parent 2a92d7e50f
commit 1aebc20057
12 changed files with 299 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
descrip.mms
View File

@@ -23,7 +23,7 @@ all :
make motif make motif
purge [...] purge [...]
delete [...]*.obj; delete [...]*.obj;
make univ make x11
purge [...] purge [...]
delete [...]*.obj; delete [...]*.obj;
@@ -78,57 +78,57 @@ gtk : [.include.wx]setup.h
$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1) $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
set default [--] set default [--]
univ : [.include.wx]setup.h x11 : [.include.wx]setup.h
set default [.src.generic] set default [.src.generic]
$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1) $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
set default [-.common] set default [-.common]
$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1) $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
set default [-.html] set default [-.html]
$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1) $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
set default [-.unix] set default [-.unix]
$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1) $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
set default [-.gtk] set default [-.x11]
$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1) $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
set default [-.univ] set default [-.univ]
$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1) $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
set default [--.contrib.src.deprecated] set default [--.contrib.src.deprecated]
$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1) # $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
# set default [---.demos.bombs] set default [---.demos.bombs]
# $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1) # $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
# set default [--.samples.calendar] set default [--.samples.calendar]
# $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1) # $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
# set default [-.caret] set default [-.caret]
# $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1) # $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
# set default [-.checklst] set default [-.checklst]
# $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1) # $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
# set default [-.config] set default [-.config]
# $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1) # $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
# set default [-.controls] set default [-.controls]
# $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1) # $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
# set default [-.db] set default [-.db]
# $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1) # $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
# set default [-.dialogs] set default [-.dialogs]
# $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1) # $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
# set default [-.dialup] set default [-.dialup]
# $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1) # $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
# set default [-.dnd] set default [-.dnd]
# $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1) # $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
# set default [-.docview] set default [-.docview]
# $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1) # $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
# set default [-.drawing] set default [-.drawing]
# $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1) # $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
# set default [-.font] set default [-.font]
# $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1) # $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
# set default [-.image] set default [-.image]
# $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1) # $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
# set default [-.mdi] set default [-.mdi]
# $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1) # $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
# set default [-.menu] set default [-.menu]
# $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1) # $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
# set default [-.minimal] set default [-.minimal]
# $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1) # $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
# set default [-.richedit] set default [-.richedit]
# $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1) # $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
set default [--] set default [--]
motif : [.include.wx]setup.h motif : [.include.wx]setup.h

2
include/wx/display.h
View File

@@ -12,7 +12,7 @@
#ifndef _WX_DISPLAY_H_BASE_ #ifndef _WX_DISPLAY_H_BASE_
#define _WX_DISPLAY_H_BASE_ #define _WX_DISPLAY_H_BASE_
#if wxUSE_DISPLAY #ifdef wxUSE_DISPLAY
#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma interface "displaybase.h" #pragma interface "displaybase.h"

6
lib/vms_gtk_univ.opt → lib/VMS_X11_UNIV.OPT Normal file → Executable file
View File

@@ -1,14 +1,10 @@
wx_root:[wxwidgets.lib]libwx_gtk_univ.olb/lib wx_root:[wxwidgets.lib]libwx_x11_univ.olb/lib
sys$library:gthread.obj
sys$library:libjpeg.olb/lib sys$library:libjpeg.olb/lib
sys$library:libpng.olb/lib sys$library:libpng.olb/lib
sys$library:libz.olb/lib sys$library:libz.olb/lib
sys$library:tiff.olb/lib sys$library:tiff.olb/lib
X11:libxpm.olb/lib X11:libxpm.olb/lib
sys$share:iodbc.exe/share sys$share:iodbc.exe/share
sys$share:libgtk.exe/share
sys$share:libgdk.exe/share
sys$share:libglib.exe/share
sys$share:vms_jackets.exe/share sys$share:vms_jackets.exe/share
sys$share:pthread$rtl.exe/share sys$share:pthread$rtl.exe/share
sys$library:decw$xlibshr.exe/share sys$library:decw$xlibshr.exe/share

13
samples/minimal/descrip.mms
View File

@@ -16,9 +16,13 @@ CXX_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)\
CXX_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm\ CXX_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm\
/assume=(nostdnew,noglobal_array_new) /assume=(nostdnew,noglobal_array_new)
.else .else
.ifdef __WXX11__
CXX_DEFINE = /define=(__WXX11__=1,__WXUNIVERSAL__==1)/float=ieee\
/name=(as_is,short)/assume=(nostdnew,noglobal_array_new)
CXX_DEFINE = CXX_DEFINE =
.endif .endif
.endif .endif
.endif
.suffixes : .cpp .suffixes : .cpp
@@ -31,6 +35,10 @@ all :
.else .else
.ifdef __WXGTK__ .ifdef __WXGTK__
$(MMS)$(MMSQUALIFIERS) minimal_gtk.exe $(MMS)$(MMSQUALIFIERS) minimal_gtk.exe
.else
.ifdef __WXX11__
$(MMS)$(MMSQUALIFIERS) minimal_x11.exe
.endif
.endif .endif
.endif .endif
@@ -41,6 +49,11 @@ minimal.exe : minimal.obj
.ifdef __WXGTK__ .ifdef __WXGTK__
minimal_gtk.exe : minimal.obj minimal_gtk.exe : minimal.obj
cxxlink/exec=minimal_gtk.exe minimal,[--.lib]vms_gtk/opt cxxlink/exec=minimal_gtk.exe minimal,[--.lib]vms_gtk/opt
.else
.ifdef __WXX11__
minimal_x11.exe : minimal.obj
cxxlink/exec=minimal_x11.exe minimal,[--.lib]vms_x11_univ/opt
.endif
.endif .endif
.endif .endif

2
setup.h_vms
View File

@@ -767,7 +767,7 @@
/* /*
* Use tooltips * Use tooltips
*/ */
#ifdef __WXMOTIF__ #if defined (__WXMOTIF__) || defined( __WXX11__ )
#define wxUSE_TOOLTIPS 0 #define wxUSE_TOOLTIPS 0
#else #else
#define wxUSE_TOOLTIPS 1 #define wxUSE_TOOLTIPS 1

71
src/common/descrip.mms
View File

@@ -14,21 +14,21 @@ CXX_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)\
CC_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short) CC_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)
.else .else
.ifdef __WXGTK__ .ifdef __WXGTK__
.ifdef __WXUNIVERSAL__
CXX_DEFINE = /define=(__WXGTK__=1,__WXUNIVERSAL__==1)/float=ieee\
/name=(as_is,short)/ieee=denorm/assume=(nostdnew,noglobal_array_new)
CC_DEFINE = /define=(__WXGTK__=1,__WXUNIVERSAL__==1)/float=ieee\
/name=(as_is,short)/ieee=denorm
.else
CXX_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm\ CXX_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm\
/assume=(nostdnew,noglobal_array_new) /assume=(nostdnew,noglobal_array_new)
CC_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm CC_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm
.endif .else
.ifdef __WXX11__
CXX_DEFINE = /define=(__WXX11__=1,__WXUNIVERSAL__==1)/float=ieee\
/name=(as_is,short)/assume=(nostdnew,noglobal_array_new)
CC_DEFINE = /define=(__WXX11__=1,__WXUNIVERSAL__==1)/float=ieee\
/name=(as_is,short)
.else .else
CXX_DEFINE = CXX_DEFINE =
CC_DEFINE = CC_DEFINE =
.endif .endif
.endif .endif
.endif
YACC=bison/yacc YACC=bison/yacc
@@ -166,14 +166,19 @@ OBJECTS2=utilscmn.obj,\
valtext.obj,\ valtext.obj,\
variant.obj,\ variant.obj,\
wfstream.obj,\ wfstream.obj,\
wincmn.obj,\
wxchar.obj,\ wxchar.obj,\
wincmn.obj,\
xpmdecod.obj,\ xpmdecod.obj,\
zipstrm.obj,\ zipstrm.obj,\
zstream.obj zstream.obj
OBJECTS_MOTIF=bmpbase.obj,gaugecmn.obj OBJECTS_MOTIF=bmpbase.obj,gaugecmn.obj
OBJECTS_X11=accesscmn.obj,bmpbase.obj,dndcmn.obj,dpycmn.obj,dseldlg.obj,\
dynload.obj,effects.obj,fddlgcmn.obj,fs_mem.obj,gaugecmn.obj,\
gbsizer.obj,geometry.obj,gzstream.obj,matrix.obj,radiocmn.obj,\
regex.obj,taskbarcmn.obj,xti.obj,xtistrm.obj,xtixml.obj
SOURCES = \ SOURCES = \
appbase.cpp,\ appbase.cpp,\
appcmn.cpp,\ appcmn.cpp,\
@@ -301,7 +306,25 @@ SOURCES = \
wxchar.cpp,\ wxchar.cpp,\
xpmdecod.cpp,\ xpmdecod.cpp,\
zipstrm.cpp,\ zipstrm.cpp,\
zstream.cpp zstream.cpp,\
accesscmn.cpp,\
dndcmn.cpp,\
dpycmn.cpp,\
dseldlg.cpp,\
dynload.cpp,\
effects.cpp,\
fddlgcmn.cpp,\
fs_mem.cpp,\
gbsizer.cpp,\
geometry.cpp,\
gzstream.cpp,\
matrix.cpp,\
radiocmn.cpp,\
regex.cpp,\
taskbarcmn.cpp,\
xti.cpp,\
xtistrm.cpp,\
xtixml.cpp
all : $(SOURCES) all : $(SOURCES)
$(MMS)$(MMSQUALIFIERS) $(OBJECTS) $(MMS)$(MMSQUALIFIERS) $(OBJECTS)
@@ -315,14 +338,16 @@ all : $(SOURCES)
library [--.lib]libwx_motif.olb $(OBJECTS_MOTIF) library [--.lib]libwx_motif.olb $(OBJECTS_MOTIF)
.else .else
.ifdef __WXGTK__ .ifdef __WXGTK__
.ifdef __WXUNIVERSAL__
library [--.lib]libwx_gtk_univ.olb $(OBJECTS)
library [--.lib]libwx_gtk_univ.olb $(OBJECTS1)
library [--.lib]libwx_gtk_univ.olb $(OBJECTS2)
.else
library [--.lib]libwx_gtk.olb $(OBJECTS) library [--.lib]libwx_gtk.olb $(OBJECTS)
library [--.lib]libwx_gtk.olb $(OBJECTS1) library [--.lib]libwx_gtk.olb $(OBJECTS1)
library [--.lib]libwx_gtk.olb $(OBJECTS2) library [--.lib]libwx_gtk.olb $(OBJECTS2)
.else
.ifdef __WXX11__
$(MMS)$(MMSQUALIFIERS) $(OBJECTS_X11)
library [--.lib]libwx_x11_univ.olb $(OBJECTS)
library [--.lib]libwx_x11_univ.olb $(OBJECTS1)
library [--.lib]libwx_x11_univ.olb $(OBJECTS2)
library [--.lib]libwx_x11_univ.olb $(OBJECTS_X11)
.endif .endif
.endif .endif
.endif .endif
@@ -454,3 +479,21 @@ wxchar.obj : wxchar.cpp
xpmdecod.obj : xpmdecod.cpp xpmdecod.obj : xpmdecod.cpp
zipstrm.obj : zipstrm.cpp zipstrm.obj : zipstrm.cpp
zstream.obj : zstream.cpp zstream.obj : zstream.cpp
accesscmn.obj : accesscmn.cpp
dndcmn.obj : dndcmn.cpp
dpycmn.obj : dpycmn.cpp
dseldlg.obj : dseldlg.cpp
dynload.obj : dynload.cpp
effects.obj : effects.cpp
fddlgcmn.obj : fddlgcmn.cpp
fs_mem.obj : fs_mem.cpp
gbsizer.obj : gbsizer.cpp
geometry.obj : geometry.cpp
gzstream.obj : gzstream.cpp
matrix.obj : matrix.cpp
radiocmn.obj : radiocmn.cpp
regex.obj : regex.cpp
taskbarcmn.obj : taskbarcmn.cpp
xti.obj : xti.cpp
xtistrm.obj : xtistrm.cpp
xtixml.obj : xtixml.cpp

2
src/common/dpycmn.cpp
View File

@@ -30,7 +30,7 @@
#include "wx/display.h" #include "wx/display.h"
#if wxUSE_DISPLAY #ifdef wxUSE_DISPLAY
#include "wx/arrimpl.cpp" #include "wx/arrimpl.cpp"
WX_DEFINE_OBJARRAY(wxArrayVideoModes); WX_DEFINE_OBJARRAY(wxArrayVideoModes);

50
src/generic/descrip.mms
View File

@@ -14,21 +14,21 @@ CXX_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)\
CC_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short) CC_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)
.else .else
.ifdef __WXGTK__ .ifdef __WXGTK__
.ifdef __WXUNIVERSAL__
CXX_DEFINE = /define=(__WXGTK__=1,__WXUNIVERSAL__==1)/float=ieee\
/name=(as_is,short)/ieee=denorm/assume=(nostdnew,noglobal_array_new)
CC_DEFINE = /define=(__WXGTK__=1,__WXUNIVERSAL__==1)/float=ieee\
/name=(as_is,short)/ieee=denorm
.else
CXX_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm\ CXX_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm\
/assume=(nostdnew,noglobal_array_new) /assume=(nostdnew,noglobal_array_new)
CC_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm CC_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm
.endif .else
.ifdef __WXX11__
CXX_DEFINE = /define=(__WXX11__=1,__WXUNIVERSAL__==1)/float=ieee\
/name=(as_is,short)/assume=(nostdnew,noglobal_array_new)
CC_DEFINE = /define=(__WXX11__=1,__WXUNIVERSAL__==1)/float=ieee\
/name=(as_is,short)
.else .else
CXX_DEFINE = CXX_DEFINE =
CC_DEFINE = CC_DEFINE =
.endif .endif
.endif .endif
.endif
.suffixes : .cpp .suffixes : .cpp
@@ -111,13 +111,26 @@ SOURCES = \
tipdlg.cpp,\ tipdlg.cpp,\
tipwin.cpp,\ tipwin.cpp,\
treectlg.cpp,\ treectlg.cpp,\
wizard.cpp wizard.cpp,\
dragimgg.cpp,\
fdrepdlg.cpp,\
htmllbox.cpp,\
listbkg.cpp,\
mdig.cpp,\
scrlwing.cpp,\
spinctlg.cpp,\
splash.cpp,\
timer.cpp,\
vlbox.cpp,\
vscroll.cpp
.ifdef __WXMOTIF__ .ifdef __WXMOTIF__
OBJECTS0=,statusbr.obj,statline.obj,notebook.obj,scrlwing.obj,spinctlg.obj OBJECTS0=,statusbr.obj,statline.obj,notebook.obj,scrlwing.obj,spinctlg.obj
.else .else
.ifdef __WXUNIVERSAL__ .ifdef __WXX11__
OBJECTS0=,accel.obj,filedlgg.obj,paletteg.obj OBJECTS0=,accel.obj,filedlgg.obj,dragimgg.obj,fdrepdlg.obj,htmllbox.obj,\
listbkg.obj,mdig.obj,scrlwing.obj,spinctlg.obj,splash.obj,timer.obj,\
vlbox.obj,vscroll.obj
.else .else
OBJECTS0=,accel.obj,statusbr.obj,filedlgg.obj,paletteg.obj OBJECTS0=,accel.obj,statusbr.obj,filedlgg.obj,paletteg.obj
.endif .endif
@@ -129,10 +142,10 @@ all : $(SOURCES)
library/crea [--.lib]libwx_motif.olb $(OBJECTS)$(OBJECTS0) library/crea [--.lib]libwx_motif.olb $(OBJECTS)$(OBJECTS0)
.else .else
.ifdef __WXGTK__ .ifdef __WXGTK__
.ifdef __WXUNIVERSAL__
library/crea [--.lib]libwx_gtk_univ.olb $(OBJECTS)$(OBJECTS0)
.else
library/crea [--.lib]libwx_gtk.olb $(OBJECTS)$(OBJECTS0) library/crea [--.lib]libwx_gtk.olb $(OBJECTS)$(OBJECTS0)
.else
.ifdef __WXX11__
library/crea [--.lib]libwx_x11_univ.olb $(OBJECTS)$(OBJECTS0)
.endif .endif
.endif .endif
.endif .endif
@@ -178,3 +191,14 @@ tipdlg.obj : tipdlg.cpp
tipwin.obj : tipwin.cpp tipwin.obj : tipwin.cpp
treectlg.obj : treectlg.cpp treectlg.obj : treectlg.cpp
wizard.obj : wizard.cpp wizard.obj : wizard.cpp
dragimgg.obj : dragimgg.cpp
fdrepdlg.obj : fdrepdlg.cpp
htmllbox.obj : htmllbox.cpp
listbkg.obj : listbkg.cpp
mdig.obj : mdig.cpp
scrlwing.obj : scrlwing.cpp
spinctlg.obj : spinctlg.cpp
splash.obj : splash.cpp
timer.obj : timer.cpp
vlbox.obj : vlbox.cpp
vscroll.obj : vscroll.cpp

26
src/html/descrip.mms
View File

@@ -14,21 +14,21 @@ CXX_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)\
CC_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short) CC_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)
.else .else
.ifdef __WXGTK__ .ifdef __WXGTK__
.ifdef __WXUNIVERSAL__
CXX_DEFINE = /define=(__WXGTK__=1,__WXUNIVERSAL__==1)/float=ieee\
/name=(as_is,short)/ieee=denorm/assume=(nostdnew,noglobal_array_new)
CC_DEFINE = /define=(__WXGTK__=1,__WXUNIVERSAL__==1)/float=ieee\
/name=(as_is,short)/ieee=denorm
.else
CXX_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm\ CXX_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm\
/assume=(nostdnew,noglobal_array_new) /assume=(nostdnew,noglobal_array_new)
CC_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm CC_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm
.endif .else
.ifdef __WXX11__
CXX_DEFINE = /define=(__WXX11__=1,__WXUNIVERSAL__==1)/float=ieee\
/name=(as_is,short)/assume=(nostdnew,noglobal_array_new)
CC_DEFINE = /define=(__WXX11__=1,__WXUNIVERSAL__==1)/float=ieee\
/name=(as_is,short)
.else .else
CXX_DEFINE = CXX_DEFINE =
CC_DEFINE = CC_DEFINE =
.endif .endif
.endif .endif
.endif
.suffixes : .cpp .suffixes : .cpp
@@ -41,13 +41,13 @@ OBJECTS = \
helpctrl.obj,helpdata.obj,helpfrm.obj,htmlcell.obj,htmlfilt.obj,\ helpctrl.obj,helpdata.obj,helpfrm.obj,htmlcell.obj,htmlfilt.obj,\
htmlpars.obj,htmltag.obj,htmlwin.obj,htmprint.obj,m_dflist.obj,\ htmlpars.obj,htmltag.obj,htmlwin.obj,htmprint.obj,m_dflist.obj,\
m_fonts.obj,m_hline.obj,m_image.obj,m_layout.obj,m_links.obj,\ m_fonts.obj,m_hline.obj,m_image.obj,m_layout.obj,m_links.obj,\
m_list.obj,m_pre.obj,m_tables.obj,winpars.obj m_list.obj,m_pre.obj,m_tables.obj,winpars.obj,chm.obj,m_style.obj
SOURCES = \ SOURCES = \
helpctrl.cpp,helpdata.cpp,helpfrm.cpp,htmlcell.cpp,htmlfilt.cpp,\ helpctrl.cpp,helpdata.cpp,helpfrm.cpp,htmlcell.cpp,htmlfilt.cpp,\
htmlpars.cpp,htmltag.cpp,htmlwin.cpp,htmprint.cpp,m_dflist.cpp,\ htmlpars.cpp,htmltag.cpp,htmlwin.cpp,htmprint.cpp,m_dflist.cpp,\
m_fonts.cpp,m_hline.cpp,m_image.cpp,m_layout.cpp,m_links.cpp,\ m_fonts.cpp,m_hline.cpp,m_image.cpp,m_layout.cpp,m_links.cpp,\
m_list.cpp,m_pre.cpp,m_tables.cpp,winpars.cpp m_list.cpp,m_pre.cpp,m_tables.cpp,winpars.cpp,chm.cpp,m_style.cpp
all : $(SOURCES) all : $(SOURCES)
$(MMS)$(MMSQUALIFIERS) $(OBJECTS) $(MMS)$(MMSQUALIFIERS) $(OBJECTS)
@@ -55,10 +55,10 @@ all : $(SOURCES)
library [--.lib]libwx_motif.olb $(OBJECTS) library [--.lib]libwx_motif.olb $(OBJECTS)
.else .else
.ifdef __WXGTK__ .ifdef __WXGTK__
.ifdef __WXUNIVERSAL__
library [--.lib]libwx_gtk_univ.olb $(OBJECTS)
.else
library [--.lib]libwx_gtk.olb $(OBJECTS) library [--.lib]libwx_gtk.olb $(OBJECTS)
.else
.ifdef __WXX11__
library [--.lib]libwx_x11_univ.olb $(OBJECTS)
.endif .endif
.endif .endif
.endif .endif
@@ -82,3 +82,5 @@ m_list.obj : m_list.cpp
m_pre.obj : m_pre.cpp m_pre.obj : m_pre.cpp
m_tables.obj : m_tables.cpp m_tables.obj : m_tables.cpp
winpars.obj : winpars.cpp winpars.obj : winpars.cpp
chm.obj : chm.cpp
m_style.obj : m_style.cpp

45
src/univ/descrip.mms
View File

@@ -8,10 +8,10 @@
.first .first
define wx [--.include.wx] define wx [--.include.wx]
CXX_DEFINE = /define=(__WXGTK__=1,__WXUNIVERSAL__==1)/float=ieee\ CXX_DEFINE = /define=(__WXX11__=1,__WXUNIVERSAL__==1)/float=ieee\
/name=(as_is,short)/ieee=denorm/assume=(nostdnew,noglobal_array_new) /name=(as_is,short)/assume=(nostdnew,noglobal_array_new)
CC_DEFINE = /define=(__WXGTK__=1,__WXUNIVERSAL__==1)/float=ieee\ CC_DEFINE = /define=(__WXX11__=1,__WXUNIVERSAL__==1)/float=ieee\
/name=(as_is,short)/ieee=denorm /name=(as_is,short)
.suffixes : .cpp .suffixes : .cpp
@@ -27,18 +27,15 @@ OBJECTS = \
checklst.obj,\ checklst.obj,\
choice.obj,\ choice.obj,\
colschem.obj,\ colschem.obj,\
combobox.obj,\
control.obj,\ control.obj,\
dialog.obj,\ dialog.obj,\
framuniv.obj,\ framuniv.obj,\
gauge.obj,\ gauge.obj,\
gtk.obj,\
inpcons.obj,\ inpcons.obj,\
inphand.obj,\ inphand.obj,\
listbox.obj,\ listbox.obj,\
menu.obj,\ menu.obj,\
notebook.obj,\ notebook.obj,\
radiobox.obj,\
radiobut.obj,\ radiobut.obj,\
scrarrow.obj,\ scrarrow.obj,\
scrolbar.obj,\ scrolbar.obj,\
@@ -54,7 +51,14 @@ OBJECTS = \
theme.obj,\ theme.obj,\
toolbar.obj,\ toolbar.obj,\
topluniv.obj,\ topluniv.obj,\
winuniv.obj winuniv.obj,\
combobox.obj,\
ctrlrend.obj,\
gtk.obj,\
metal.obj,\
radiobox.obj,\
scrthumb.obj,\
win32.obj
SOURCES =\ SOURCES =\
bmpbuttn.cpp \ bmpbuttn.cpp \
@@ -63,18 +67,15 @@ SOURCES =\
checklst.cpp \ checklst.cpp \
choice.cpp \ choice.cpp \
colschem.cpp \ colschem.cpp \
combobox.cpp \
control.cpp \ control.cpp \
dialog.cpp \ dialog.cpp \
framuniv.cpp \ framuniv.cpp \
gauge.cpp \ gauge.cpp \
[.themes]gtk.cpp \
inpcons.cpp \ inpcons.cpp \
inphand.cpp \ inphand.cpp \
listbox.cpp \ listbox.cpp \
menu.cpp \ menu.cpp \
notebook.cpp \ notebook.cpp \
radiobox.cpp \
radiobut.cpp \ radiobut.cpp \
scrarrow.cpp \ scrarrow.cpp \
scrolbar.cpp \ scrolbar.cpp \
@@ -90,11 +91,18 @@ SOURCES =\
theme.cpp \ theme.cpp \
toolbar.cpp \ toolbar.cpp \
topluniv.cpp \ topluniv.cpp \
winuniv.cpp winuniv.cpp \
combobox.cpp \
ctrlrend.cpp \
gtk.cpp \
metal.cpp \
radiobox.cpp \
scrthumb.cpp \
win32.cpp
all : $(SOURCES) all : $(SOURCES)
$(MMS)$(MMSQUALIFIERS) $(OBJECTS) $(MMS)$(MMSQUALIFIERS) $(OBJECTS)
library [--.lib]libwx_gtk_univ.olb $(OBJECTS) library [--.lib]libwx_x11_univ.olb $(OBJECTS)
bmpbuttn.obj : bmpbuttn.cpp bmpbuttn.obj : bmpbuttn.cpp
button.obj : button.cpp button.obj : button.cpp
@@ -102,19 +110,15 @@ checkbox.obj : checkbox.cpp
checklst.obj : checklst.cpp checklst.obj : checklst.cpp
choice.obj : choice.cpp choice.obj : choice.cpp
colschem.obj : colschem.cpp colschem.obj : colschem.cpp
combobox.obj : combobox.cpp
control.obj : control.cpp control.obj : control.cpp
dialog.obj : dialog.cpp dialog.obj : dialog.cpp
framuniv.obj : framuniv.cpp framuniv.obj : framuniv.cpp
gauge.obj : gauge.cpp gauge.obj : gauge.cpp
gtk.obj : [.themes]gtk.cpp
cxx/obj=[]gtk.obj$(CXXFLAGS)$(CXX_DEFINE) [.themes]gtk.cpp
inpcons.obj : inpcons.cpp inpcons.obj : inpcons.cpp
inphand.obj : inphand.cpp inphand.obj : inphand.cpp
listbox.obj : listbox.cpp listbox.obj : listbox.cpp
menu.obj : menu.cpp menu.obj : menu.cpp
notebook.obj : notebook.cpp notebook.obj : notebook.cpp
radiobox.obj : radiobox.cpp
radiobut.obj : radiobut.cpp radiobut.obj : radiobut.cpp
scrarrow.obj : scrarrow.cpp scrarrow.obj : scrarrow.cpp
scrolbar.obj : scrolbar.cpp scrolbar.obj : scrolbar.cpp
@@ -131,3 +135,10 @@ theme.obj : theme.cpp
toolbar.obj : toolbar.cpp toolbar.obj : toolbar.cpp
topluniv.obj : topluniv.cpp topluniv.obj : topluniv.cpp
winuniv.obj : winuniv.cpp winuniv.obj : winuniv.cpp
combobox.obj : combobox.cpp
ctrlrend.obj : ctrlrend.cpp
gtk.obj : gtk.cpp
metal.obj : metal.cpp
radiobox.obj : radiobox.cpp
scrthumb.obj : scrthumb.cpp
win32.obj : win32.cpp

39
src/unix/descrip.mms
View File

@@ -14,21 +14,21 @@ CXX_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)\
CC_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short) CC_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)
.else .else
.ifdef __WXGTK__ .ifdef __WXGTK__
.ifdef __WXUNIVERSAL__
CXX_DEFINE = /define=(__WXGTK__=1,__WXUNIVERSAL__==1)/float=ieee\
/name=(as_is,short)/ieee=denorm/assume=(nostdnew,noglobal_array_new)
CC_DEFINE = /define=(__WXGTK__=1,__WXUNIVERSAL__==1)/float=ieee\
/name=(as_is,short)/ieee=denorm
.else
CXX_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm\ CXX_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm\
/assume=(nostdnew,noglobal_array_new) /assume=(nostdnew,noglobal_array_new)
CC_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm CC_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm
.endif .else
.ifdef __WXX11__
CXX_DEFINE = /define=(__WXX11__=1,__WXUNIVERSAL__==1)/float=ieee\
/name=(as_is,short)/assume=(nostdnew,noglobal_array_new)
CC_DEFINE = /define=(__WXX11__=1,__WXUNIVERSAL__==1)/float=ieee\
/name=(as_is,short)
.else .else
CXX_DEFINE = CXX_DEFINE =
CC_DEFINE = CC_DEFINE =
.endif .endif
.endif .endif
.endif
.suffixes : .cpp .suffixes : .cpp
@@ -46,7 +46,12 @@ OBJECTS = baseunix.obj,\
mimetype.obj,\ mimetype.obj,\
threadpsx.obj,\ threadpsx.obj,\
utilsunx.obj,\ utilsunx.obj,\
utilsx11.obj utilsx11.obj,\
joystick.obj,\
snglinst.obj,\
sound.obj,\
sound_sdl.obj,\
taskbarx11.obj
SOURCES = baseunix.cpp,\ SOURCES = baseunix.cpp,\
dialup.cpp,\ dialup.cpp,\
@@ -57,7 +62,12 @@ SOURCES = baseunix.cpp,\
mimetype.cpp,\ mimetype.cpp,\
threadpsx.cpp,\ threadpsx.cpp,\
utilsunx.cpp,\ utilsunx.cpp,\
utilsx11.cpp utilsx11.cpp,\
joystick.cpp,\
snglinst.cpp,\
sound.cpp,\
sound_sdl.cpp,\
taskbarx11.cpp
all : $(SOURCES) all : $(SOURCES)
$(MMS)$(MMSQUALIFIERS) $(OBJECTS) $(MMS)$(MMSQUALIFIERS) $(OBJECTS)
@@ -65,10 +75,10 @@ all : $(SOURCES)
library [--.lib]libwx_motif.olb $(OBJECTS) library [--.lib]libwx_motif.olb $(OBJECTS)
.else .else
.ifdef __WXGTK__ .ifdef __WXGTK__
.ifdef __WXUNIVERSAL__
library [--.lib]libwx_gtk_univ.olb $(OBJECTS)
.else
library [--.lib]libwx_gtk.olb $(OBJECTS) library [--.lib]libwx_gtk.olb $(OBJECTS)
.else
.ifdef __WXX11__
library [--.lib]libwx_x11_univ.olb $(OBJECTS)
.endif .endif
.endif .endif
.endif .endif
@@ -83,3 +93,8 @@ mimetype.obj : mimetype.cpp
threadpsx.obj : threadpsx.cpp threadpsx.obj : threadpsx.cpp
utilsunx.obj : utilsunx.cpp utilsunx.obj : utilsunx.cpp
utilsx11.obj : utilsx11.cpp utilsx11.obj : utilsx11.cpp
joystick.obj : joystick.cpp
snglinst.obj : snglinst.cpp
sound.obj : sound.cpp
sound_sdl.obj : sound_sdl.cpp
taskbarx11.obj : taskbarx11.cpp

74
src/x11/descrip.mms
View File

@@ -13,8 +13,15 @@ CXX_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)\
/assume=(nostdnew,noglobal_array_new) /assume=(nostdnew,noglobal_array_new)
CC_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short) CC_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)
.else .else
.ifdef __WXX11__
CXX_DEFINE = /define=(__WXX11__=1,__WXUNIVERSAL__==1)/float=ieee\
/name=(as_is,short)/assume=(nostdnew,noglobal_array_new)
CC_DEFINE = /define=(__WXX11__=1,__WXUNIVERSAL__==1)/float=ieee\
/name=(as_is,short)
.else
CXX_DEFINE = CXX_DEFINE =
.endif .endif
.endif
.suffixes : .cpp .suffixes : .cpp
@@ -31,18 +38,64 @@ OBJECTS = \
region.obj,\ region.obj,\
utilsx.obj utilsx.obj
OBJECTS_X11=dc.obj,\
dcclient.obj,\
dcmemory.obj,\
dcscreen.obj,\
evtloop.obj,\
font.obj,\
gdiobj.obj,\
gsockx11.obj,\
icon.obj,\
main.obj,\
minifram.obj,\
nanox.obj,\
palette.obj,\
popupwin.obj,\
reparent.obj,\
settings.obj,\
toplevel.obj,\
utils.obj,\
window.obj
SOURCES = \ SOURCES = \
bitmap.cpp,\ bitmap.cpp,\
brush.cpp,\ brush.cpp,\
glcanvas.cpp,\ glcanvas.cpp,\
pen.cpp,\ pen.cpp,\
region.cpp,\ region.cpp,\
utilsx.cpp utilsx.cpp,\
dc.cpp,\
dcclient.cpp,\
dcmemory.cpp,\
dcscreen.cpp,\
evtloop.cpp,\
font.cpp,\
gdiobj.cpp,\
gsockx11.cpp,\
icon.cpp,\
main.cpp,\
minifram.cpp,\
nanox.cpp,\
palette.cpp,\
popupwin.cpp,\
reparent.cpp,\
settings.cpp,\
toplevel.cpp,\
utils.cpp,\
window.cpp
all : $(SOURCES) all : $(SOURCES)
$(MMS)$(MMSQUALIFIERS) $(OBJECTS) $(MMS)$(MMSQUALIFIERS) $(OBJECTS)
.ifdef __WXMOTIF__ .ifdef __WXMOTIF__
library [--.lib]libwx_motif.olb $(OBJECTS) library [--.lib]libwx_motif.olb $(OBJECTS)
.else
.ifdef __WXX11__
library [--.lib]libwx_x11_univ.olb $(OBJECTS)
$(MMS)$(MMSQUALIFIERS) $(OBJECTS_X11)
library [--.lib]libwx_x11_univ.olb $(OBJECTS_X11)
.endif
.endif .endif
bitmap.obj : bitmap.cpp bitmap.obj : bitmap.cpp
@@ -51,3 +104,22 @@ glcanvas.obj : glcanvas.cpp
pen.obj : pen.cpp pen.obj : pen.cpp
region.obj : region.cpp region.obj : region.cpp
utilsx.obj : utilsx.cpp utilsx.obj : utilsx.cpp
dc.obj : dc.cpp
dcclient.obj : dcclient.cpp
dcmemory.obj : dcmemory.cpp
dcscreen.obj : dcscreen.cpp
evtloop.obj : evtloop.cpp
font.obj : font.cpp
gdiobj.obj : gdiobj.cpp
gsockx11.obj : gsockx11.cpp
icon.obj : icon.cpp
main.obj : main.cpp
minifram.obj : minifram.cpp
nanox.obj : nanox.cpp
palette.obj : palette.cpp
popupwin.obj : popupwin.cpp
reparent.obj : reparent.cpp
settings.obj : settings.cpp
toplevel.obj : toplevel.cpp
utils.obj : utils.cpp
window.obj : window.cpp