From 13cb46e0b6fe6d404c6e28bec1744a5fc30356b9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sat, 2 Aug 2003 01:07:39 +0000 Subject: [PATCH] 1. added wxAdvanced 2. fixed setup.h creation in VC++ projects 3. temporarily disable GUI sockets code in non-msw ports so that they link git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22473 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- build/bakefiles/common.bkl | 3 + build/bakefiles/files.bkl | 103 ++++++++++++++++++++------------- build/bakefiles/monolithic.bkl | 5 +- build/bakefiles/multilib.bkl | 22 +++++++ build/bakefiles/wxwin.py | 4 +- 5 files changed, 94 insertions(+), 43 deletions(-) diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl index 0ef7e41c41..2b802a2508 100644 --- a/build/bakefiles/common.bkl +++ b/build/bakefiles/common.bkl @@ -122,6 +122,9 @@ $(mk.evalExpr(wxwin.mkLibName('core'))) + + $(mk.evalExpr(wxwin.mkLibName('adv'))) + $(mk.evalExpr(wxwin.mkLibName('html'))) diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index 7b5d220964..f9a8f52383 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -357,7 +357,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/common/ctrlcmn.cpp src/common/ctrlsub.cpp src/common/datacmn.cpp - src/common/dbgrid.cpp src/common/dcbase.cpp src/common/dlgcmn.cpp src/common/dndcmn.cpp @@ -416,36 +415,25 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/common/wincmn.cpp src/common/xpmdecod.cpp src/generic/busyinfo.cpp - src/generic/calctrl.cpp src/generic/choicdgg.cpp - src/generic/dcbuffer.cpp src/generic/dcpsg.cpp src/generic/dirctrlg.cpp src/generic/dragimgg.cpp - src/generic/grid.cpp - src/generic/gridctrl.cpp - src/generic/gridsel.cpp - src/generic/helpext.cpp - src/generic/laywin.cpp src/generic/logg.cpp src/generic/numdlgg.cpp src/generic/panelg.cpp src/generic/progdlgg.cpp src/generic/renderg.cpp - src/generic/sashwin.cpp src/generic/scrlwing.cpp src/generic/selstore.cpp src/generic/spinctlg.cpp - src/generic/splash.cpp src/generic/splitter.cpp src/generic/tbarsmpl.cpp src/generic/textdlgg.cpp - src/generic/tipdlg.cpp src/generic/tipwin.cpp src/generic/treectlg.cpp src/generic/vlbox.cpp src/generic/vscroll.cpp - src/generic/wizard.cpp wx/bmpbuttn.h @@ -467,39 +455,32 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/dcscreen.h wx/dialog.h wx/dirdlg.h + wx/dragimag.h wx/filedlg.h wx/frame.h wx/gauge.h wx/gdicmn.h wx/generic/accel.h - wx/generic/calctrl.h wx/generic/choicdgg.h wx/generic/colrdlgg.h wx/generic/dcpsg.h wx/generic/dirctrlg.h + wx/generic/dragimgg.h wx/generic/filedlgg.h wx/generic/fontdlgg.h - wx/generic/grid.h - wx/generic/grid.h - wx/generic/gridctrl.h - wx/generic/helpext.h wx/generic/imaglist.h - wx/generic/laywin.h wx/generic/logg.h wx/generic/msgdlgg.h wx/generic/notebook.h wx/generic/panelg.h wx/generic/prntdlgg.h wx/generic/progdlgg.h - wx/generic/sashwin.h wx/generic/scrolwin.h wx/generic/spinctlg.h - wx/generic/splash.h wx/generic/splitter.h wx/generic/textdlgg.h wx/generic/timer.h wx/generic/treectlg.h - wx/generic/wizard.h wx/helphtml.h wx/icon.h wx/layout.h @@ -538,7 +519,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/artprov.h wx/bitmap.h wx/busyinfo.h - wx/calctrl.h wx/caret.h wx/clipbrd.h wx/cmdproc.h @@ -546,8 +526,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/colour.h wx/cshelp.h wx/dataobj.h - wx/dbgrid.h - wx/dcbuffer.h wx/dcmirror.h wx/dcps.h wx/dialup.h @@ -556,7 +534,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/dnd.h wx/docmdi.h wx/docview.h - wx/dragimag.h wx/effects.h wx/evtloop.h wx/fdrepdlg.h @@ -569,7 +546,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/geometry.h wx/gifdecod.h wx/glcanvas.h - wx/grid.h wx/help.h wx/helpbase.h wx/helpwin.h @@ -586,7 +562,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/imagtiff.h wx/imagxpm.h wx/joystick.h - wx/laywin.h wx/listbase.h wx/listctrl.h wx/matrix.h @@ -605,11 +580,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/quantize.h wx/rawbmp.h wx/region.h - wx/sashwin.h wx/scopeguard.h wx/spinbutt.h wx/spinctrl.h - wx/splash.h wx/splitter.h wx/stack.h wx/statline.h @@ -619,7 +592,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/tbarbase.h wx/tbarsmpl.h wx/tglbtn.h - wx/tipdlg.h wx/tipwin.h wx/tooltip.h wx/toplevel.h @@ -630,13 +602,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/vms_x_fix.h wx/vscroll.h wx/wave.h - wx/wizard.h wx/xpmdecod.h wx/xpmhand.h - - wx/generic/dragimgg.h - wx/generic/gridsel.h - @@ -686,7 +653,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/gtk/evtloop.cpp src/gtk/font.cpp src/gtk/gdiobj.cpp - src/gtk/gsockgtk.c + src/gtk/icon.cpp src/gtk/main.cpp src/gtk/pen.cpp @@ -868,7 +835,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/motif/frame.cpp src/motif/gauge.cpp src/motif/gdiobj.cpp - src/motif/gsockmot.c + src/motif/icon.cpp src/motif/listbox.cpp src/motif/main.cpp @@ -997,7 +964,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/x11/evtloop.cpp src/x11/font.cpp src/x11/gdiobj.cpp - src/x11/gsockx11.c + src/x11/icon.cpp src/x11/joystick.cpp src/x11/main.cpp @@ -1404,7 +1371,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/os2/gdiimage.cpp src/os2/gdiobj.cpp src/os2/gsocket.c - src/os2/gsockpm.c + src/os2/helpwin.cpp src/os2/icon.cpp src/os2/iniconf.cpp @@ -1970,6 +1937,52 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! + + + + + + + + + + + + src/common/dbgrid.cpp + src/generic/calctrl.cpp + src/generic/dcbuffer.cpp + src/generic/grid.cpp + src/generic/gridctrl.cpp + src/generic/gridsel.cpp + src/generic/helpext.cpp + src/generic/laywin.cpp + src/generic/sashwin.cpp + src/generic/splash.cpp + src/generic/tipdlg.cpp + src/generic/wizard.cpp + + + + wx/calctrl.h + wx/dbgrid.h + wx/dcbuffer.h + wx/generic/calctrl.h + wx/generic/grid.h + wx/generic/gridctrl.h + wx/generic/gridsel.h + wx/generic/helpext.h + wx/generic/laywin.h + wx/generic/sashwin.h + wx/generic/splash.h + wx/generic/wizard.h + wx/grid.h + wx/laywin.h + wx/sashwin.h + wx/splash.h + wx/tipdlg.h + wx/wizard.h + + @@ -2122,6 +2135,16 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! $(NET_CMN_SRC) $(NET_PLATFORM_SRC) + + + + $(ADVANCED_MSW_SRC) + + + $(ADVANCED_MSW_HDR) + + $(ADVANCED_CMN_SRC) $(ADVANCED_PLATFORM_SRC) + $(ADVANCED_CMN_HDR) $(ADVANCED_PLATFORM_HDR) @@ -2186,7 +2209,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! $(BASE_CMN_HDR) $(BASE_PLATFORM_HDR) $(NET_CMN_HDR) $(NET_PLATFORM_HDR) - $(ALL_GUI_HEADERS) + $(ALL_GUI_HEADERS) $(ADVANCED_HDR) $(HTML_HDR) $(XML_HDR) $(OPENGL_HDR) diff --git a/build/bakefiles/monolithic.bkl b/build/bakefiles/monolithic.bkl index 5a04aa477a..188e518d5d 100644 --- a/build/bakefiles/monolithic.bkl +++ b/build/bakefiles/monolithic.bkl @@ -3,7 +3,9 @@ - $(CORE_SRC) $(HTML_SRC) + + $(CORE_SRC) $(ADVANCED_SRC) $(HTML_SRC) + $(BASE_SRC) $(BASE_AND_GUI_SRC) $(NET_SRC) $(MONOLIB_GUI_SRC) $(XML_SRC) @@ -24,6 +26,7 @@ wxUSE_BASE=1 $(MONOLIB_SRC) $(ALL_HEADERS) + diff --git a/build/bakefiles/multilib.bkl b/build/bakefiles/multilib.bkl index bc6d5a6b5a..d061d13ccc 100644 --- a/build/bakefiles/multilib.bkl +++ b/build/bakefiles/multilib.bkl @@ -23,6 +23,7 @@ wxUSE_GUI=0 $(BASE_SRC) $(BASE_AND_GUI_SRC) $(BASE_CMN_HDR) $(BASE_PLATFORM_HDR) + @@ -68,6 +69,27 @@ $(BASE_AND_GUI_SRC) $(CORE_SRC) $(ALL_GUI_HEADERS) + + + + + + + + WXUSINGDLL + WXMAKINGDLL_ADV + $(ADVANCED_SRC) + $(ADVANCED_HDR) + coredll + basedll + + + + $(ADVANCED_SRC) + $(ADVANCED_HDR) + diff --git a/build/bakefiles/wxwin.py b/build/bakefiles/wxwin.py index df23f4c9cf..688eb37cca 100644 --- a/build/bakefiles/wxwin.py +++ b/build/bakefiles/wxwin.py @@ -30,10 +30,10 @@ def mk_wxid(id): # All libs that are part of the main library (i.e. non-contrib): -MAIN_LIBS = ['mono', 'base', 'core', 'html', 'xml', 'net'] +MAIN_LIBS = ['mono', 'base', 'core', 'adv', 'html', 'xml', 'net'] # List of library names/ids for categories with different names: LIBS_NOGUI = ['xml', 'net'] -LIBS_GUI = ['core', 'html', 'gl'] +LIBS_GUI = ['core', 'adv', 'html', 'gl'] def mkLibName(wxid): """Returns string that can be used as library name, including name -- 2.45.2