regenerated

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

diff --git a/Makefile.in b/Makefile.in
index c2a61a1b6e31d68a632edb851cb68622b724a344..89d83863d6d748663d2048ea779b9b070ad158c4 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -277,6 +277,7 @@ ALL_BASE_SOURCES =  \
        src/os2/dir.cpp \
        src/os2/utils.cpp \
        src/os2/utilsexc.cpp \
+       src/common/bookctrl.cpp \
        src/common/event.cpp \
        src/common/fs_mem.cpp \
        src/common/msgout.cpp \
@@ -368,6 +369,7 @@ BASEDLL_OBJECTS =  \
        basedll_zipstrm.o \
        basedll_zstream.o \
        $(__BASE_PLATFORM_SRC_OBJECTS_2) \
+       basedll_bookctrl.o \
        basedll_event.o \
        basedll_fs_mem.o \
        basedll_msgout.o \
@@ -434,6 +436,7 @@ BASELIB_OBJECTS =  \
        baselib_zipstrm.o \
        baselib_zstream.o \
        $(__BASE_PLATFORM_SRC_OBJECTS_3) \
+       baselib_bookctrl.o \
        baselib_event.o \
        baselib_fs_mem.o \
        baselib_msgout.o \
@@ -451,6 +454,7 @@ COREDLL_CXXFLAGS = $(__coredll_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
        $(__INC_REGEX_p) $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_CORE \
        -DwxUSE_BASE=0 $(CXXFLAGS) $(PIC_FLAG)
 COREDLL_OBJECTS =  \
+       coredll_bookctrl.o \
        coredll_event.o \
        coredll_fs_mem.o \
        coredll_msgout.o \
@@ -467,6 +471,7 @@ CORELIB_CXXFLAGS = $(__corelib_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
        $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \
        $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_BASE=0 $(CXXFLAGS)
 CORELIB_OBJECTS =  \
+       corelib_bookctrl.o \
        corelib_event.o \
        corelib_fs_mem.o \
        corelib_msgout.o \
@@ -619,6 +624,7 @@ MONODLL_OBJECTS =  \
        monodll_zipstrm.o \
        monodll_zstream.o \
        $(__BASE_PLATFORM_SRC_OBJECTS) \
+       monodll_bookctrl.o \
        monodll_event.o \
        monodll_fs_mem.o \
        monodll_msgout.o \
@@ -698,6 +704,7 @@ MONOLIB_OBJECTS =  \
        monolib_zipstrm.o \
        monolib_zstream.o \
        $(__BASE_PLATFORM_SRC_OBJECTS_1) \
+       monolib_bookctrl.o \
        monolib_event.o \
        monolib_fs_mem.o \
        monolib_msgout.o \
@@ -1676,7 +1683,6 @@ COND_TOOLKIT_PM_GUI_HDR =  \
        wx/os2/gauge.h \
        wx/os2/gdiimage.h \
        wx/os2/gdiobj.h \
-       wx/os2/gsockos2.h \
        wx/os2/helpwin.h \
        wx/os2/icon.h \
        wx/os2/iniconf.h \
@@ -1787,7 +1793,7 @@ COND_TOOLKIT_X11_LOWLEVEL_HDR =  \
 @COND_TOOLKIT_X11@LOWLEVEL_HDR = $(COND_TOOLKIT_X11_LOWLEVEL_HDR)
 @COND_PLATFORM_UNIX_1@NET_PLATFORM_HDR = wx/unix/gsockunx.h
 @COND_PLATFORM_WIN32_1@NET_PLATFORM_HDR = wx/msw/gsockmsw.h
-@COND_PLATFORM_OS2_1@NET_PLATFORM_HDR = 
+@COND_PLATFORM_OS2_1@NET_PLATFORM_HDR = wx/unix/gsockunx.h
 @COND_TOOLKIT_MAC@NET_PLATFORM_HDR = wx/mac/gsockmac.h
 @COND_TOOLKIT_COCOA@NET_PLATFORM_HDR = wx/unix/gsockunx.h
 @COND_TOOLKIT_GTK@OPENGL_HDR = wx/gtk/glcanvas.h
@@ -3401,7 +3407,6 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS =  \
        monodll_gauge.o \
        monodll_gdiimage.o \
        monodll_gdiobj.o \
-       monodll_gsocket.o \
        monodll_gsockpm.o \
        monodll_helpwin.o \
        monodll_icon.o \
@@ -3438,6 +3443,7 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS =  \
        monodll_toolbar.o \
        monodll_tooltip.o \
        monodll_toplevel.o \
+       monodll_utilsgui.o \
        monodll_window.o
 @COND_TOOLKIT_PM@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_PM___GUI_SRC_OBJECTS)
 COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_1 =  \
@@ -3789,7 +3795,6 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS_1 =  \
        monolib_gauge.o \
        monolib_gdiimage.o \
        monolib_gdiobj.o \
-       monolib_gsocket.o \
        monolib_gsockpm.o \
        monolib_helpwin.o \
        monolib_icon.o \
@@ -3826,6 +3831,7 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS_1 =  \
        monolib_toolbar.o \
        monolib_tooltip.o \
        monolib_toplevel.o \
+       monolib_utilsgui.o \
        monolib_window.o
 @COND_TOOLKIT_PM@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_PM___GUI_SRC_OBJECTS_1)
 COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_2 =  \
@@ -4177,7 +4183,6 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS_2 =  \
        coredll_gauge.o \
        coredll_gdiimage.o \
        coredll_gdiobj.o \
-       coredll_gsocket.o \
        coredll_gsockpm.o \
        coredll_helpwin.o \
        coredll_icon.o \
@@ -4214,6 +4219,7 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS_2 =  \
        coredll_toolbar.o \
        coredll_tooltip.o \
        coredll_toplevel.o \
+       coredll_utilsgui.o \
        coredll_window.o
 @COND_TOOLKIT_PM@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_PM___GUI_SRC_OBJECTS_2)
 COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_3 =  \
@@ -4565,7 +4571,6 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS_3 =  \
        corelib_gauge.o \
        corelib_gdiimage.o \
        corelib_gdiobj.o \
-       corelib_gsocket.o \
        corelib_gsockpm.o \
        corelib_helpwin.o \
        corelib_icon.o \
@@ -4602,6 +4607,7 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS_3 =  \
        corelib_toolbar.o \
        corelib_tooltip.o \
        corelib_toplevel.o \
+       corelib_utilsgui.o \
        corelib_window.o
 @COND_TOOLKIT_PM@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_PM___GUI_SRC_OBJECTS_3)
 @COND_TOOLKIT_MSW@__HTML_SRC_PLATFORM_OBJECTS = monodll_helpbest.o
@@ -5410,22 +5416,22 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1 =  \
 @COND_TOOLKIT_MAC@__NET_MACOSX_SRC_OBJECTS_3 = netlib_gsocket.o
 @COND_PLATFORM_MACOSX_1@__NET_PLATFORM_SRC_OBJECTS \
 @COND_PLATFORM_MACOSX_1@       = $(__NET_MACOSX_SRC_OBJECTS)
-@COND_PLATFORM_OS2_1@__NET_PLATFORM_SRC_OBJECTS = 
+@COND_PLATFORM_OS2_1@__NET_PLATFORM_SRC_OBJECTS = monodll_gsocket.o
 @COND_PLATFORM_UNIX_1@__NET_PLATFORM_SRC_OBJECTS = monodll_gsocket.o
 @COND_PLATFORM_WIN32_1@__NET_PLATFORM_SRC_OBJECTS = monodll_gsocket.o
 @COND_PLATFORM_MACOSX_1@__NET_PLATFORM_SRC_OBJECTS_1 \
 @COND_PLATFORM_MACOSX_1@       = $(__NET_MACOSX_SRC_OBJECTS_1)
-@COND_PLATFORM_OS2_1@__NET_PLATFORM_SRC_OBJECTS_1 = 
+@COND_PLATFORM_OS2_1@__NET_PLATFORM_SRC_OBJECTS_1 = monolib_gsocket.o
 @COND_PLATFORM_UNIX_1@__NET_PLATFORM_SRC_OBJECTS_1 = monolib_gsocket.o
 @COND_PLATFORM_WIN32_1@__NET_PLATFORM_SRC_OBJECTS_1 = monolib_gsocket.o
 @COND_PLATFORM_MACOSX_1@__NET_PLATFORM_SRC_OBJECTS_2 \
 @COND_PLATFORM_MACOSX_1@       = $(__NET_MACOSX_SRC_OBJECTS_2)
-@COND_PLATFORM_OS2_1@__NET_PLATFORM_SRC_OBJECTS_2 = 
+@COND_PLATFORM_OS2_1@__NET_PLATFORM_SRC_OBJECTS_2 = netdll_gsocket.o
 @COND_PLATFORM_UNIX_1@__NET_PLATFORM_SRC_OBJECTS_2 = netdll_gsocket.o
 @COND_PLATFORM_WIN32_1@__NET_PLATFORM_SRC_OBJECTS_2 = netdll_gsocket.o
 @COND_PLATFORM_MACOSX_1@__NET_PLATFORM_SRC_OBJECTS_3 \
 @COND_PLATFORM_MACOSX_1@       = $(__NET_MACOSX_SRC_OBJECTS_3)
-@COND_PLATFORM_OS2_1@__NET_PLATFORM_SRC_OBJECTS_3 = 
+@COND_PLATFORM_OS2_1@__NET_PLATFORM_SRC_OBJECTS_3 = netlib_gsocket.o
 @COND_PLATFORM_UNIX_1@__NET_PLATFORM_SRC_OBJECTS_3 = netlib_gsocket.o
 @COND_PLATFORM_WIN32_1@__NET_PLATFORM_SRC_OBJECTS_3 = netlib_gsocket.o
 @COND_TOOLKIT_GTK@__OPENGL_SRC_OBJECTS = gldll_glcanvas.o
@@ -6234,6 +6240,9 @@ basedll_basemsw.o: $(srcdir)/src/msw/basemsw.cpp
 @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@basedll_baseunix.o: $(srcdir)/src/unix/baseunix.cpp
 @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@   $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 
+basedll_bookctrl.o: $(srcdir)/src/common/bookctrl.cpp
+       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
+
 basedll_clntdata.o: $(srcdir)/src/common/clntdata.cpp
        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 
@@ -6518,6 +6527,9 @@ baselib_basemsw.o: $(srcdir)/src/msw/basemsw.cpp
 @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@baselib_baseunix.o: $(srcdir)/src/unix/baseunix.cpp
 @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@   $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 
+baselib_bookctrl.o: $(srcdir)/src/common/bookctrl.cpp
+       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
+
 baselib_clntdata.o: $(srcdir)/src/common/clntdata.cpp
        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 
@@ -6992,6 +7004,9 @@ coredll_aga.o: $(srcdir)/src/mac/aga.cpp
 coredll_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp
        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
+coredll_bookctrl.o: $(srcdir)/src/common/bookctrl.cpp
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_brush.o: $(srcdir)/src/os2/brush.cpp
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
@@ -7820,9 +7835,6 @@ coredll_gauge95.o: $(srcdir)/src/msw/gauge95.cpp
 @COND_USE_GUI_1@coredll_gifdecod.o: $(srcdir)/src/common/gifdecod.cpp
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
-coredll_gsocket.o: $(srcdir)/src/os2/gsocket.c
-       $(CCC) -c -o $@ $(COREDLL_CFLAGS) $<
-
 @COND_TOOLKIT_GTK_USE_GUI_1@coredll_gsockgtk.o: $(srcdir)/src/gtk/gsockgtk.c
 @COND_TOOLKIT_GTK_USE_GUI_1@   $(CCC) -c -o $@ $(COREDLL_CFLAGS) $<
 
@@ -8810,6 +8822,9 @@ coredll_utilsexc.o: $(srcdir)/src/cocoa/utilsexc.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@coredll_utilsgui.o: $(srcdir)/src/msw/utilsgui.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_utilsgui.o: $(srcdir)/src/os2/utilsgui.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+
 coredll_utilsres.o: $(srcdir)/src/gtk/utilsres.cpp
        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
@@ -9049,6 +9064,9 @@ corelib_aga.o: $(srcdir)/src/mac/aga.cpp
 corelib_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp
        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
+corelib_bookctrl.o: $(srcdir)/src/common/bookctrl.cpp
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_brush.o: $(srcdir)/src/os2/brush.cpp
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
@@ -9877,9 +9895,6 @@ corelib_gauge95.o: $(srcdir)/src/msw/gauge95.cpp
 @COND_USE_GUI_1@corelib_gifdecod.o: $(srcdir)/src/common/gifdecod.cpp
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
-corelib_gsocket.o: $(srcdir)/src/os2/gsocket.c
-       $(CCC) -c -o $@ $(CORELIB_CFLAGS) $<
-
 @COND_TOOLKIT_GTK_USE_GUI_1@corelib_gsockgtk.o: $(srcdir)/src/gtk/gsockgtk.c
 @COND_TOOLKIT_GTK_USE_GUI_1@   $(CCC) -c -o $@ $(CORELIB_CFLAGS) $<
 
@@ -10867,6 +10882,9 @@ corelib_utilsexc.o: $(srcdir)/src/cocoa/utilsexc.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@corelib_utilsgui.o: $(srcdir)/src/msw/utilsgui.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_utilsgui.o: $(srcdir)/src/os2/utilsgui.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+
 corelib_utilsres.o: $(srcdir)/src/gtk/utilsres.cpp
        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
@@ -11526,6 +11544,9 @@ monodll_basemsw.o: $(srcdir)/src/msw/basemsw.cpp
 monodll_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
+monodll_bookctrl.o: $(srcdir)/src/common/bookctrl.cpp
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_brush.o: $(srcdir)/src/os2/brush.cpp
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
@@ -12477,8 +12498,8 @@ monodll_gridsel.o: $(srcdir)/src/generic/gridsel.cpp
 @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@monodll_gsocket.o: $(srcdir)/src/unix/gsocket.c
 @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@   $(CCC) -c -o $@ $(MONODLL_CFLAGS) $<
 
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_gsocket.o: $(srcdir)/src/os2/gsocket.c
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CCC) -c -o $@ $(MONODLL_CFLAGS) $<
+@COND_PLATFORM_OS2_1@monodll_gsocket.o: $(srcdir)/src/os2/gsocket.c
+@COND_PLATFORM_OS2_1@  $(CCC) -c -o $@ $(MONODLL_CFLAGS) $<
 
 @COND_PLATFORM_WIN32_1@monodll_gsocket.o: $(srcdir)/src/msw/gsocket.c
 @COND_PLATFORM_WIN32_1@        $(CCC) -c -o $@ $(MONODLL_CFLAGS) $<
@@ -13749,6 +13770,9 @@ monodll_utilscmn.o: $(srcdir)/src/common/utilscmn.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@monodll_utilsgui.o: $(srcdir)/src/msw/utilsgui.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_utilsgui.o: $(srcdir)/src/os2/utilsgui.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
 monodll_utilsres.o: $(srcdir)/src/gtk/utilsres.cpp
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
@@ -14048,6 +14072,9 @@ monolib_basemsw.o: $(srcdir)/src/msw/basemsw.cpp
 monolib_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp
        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
+monolib_bookctrl.o: $(srcdir)/src/common/bookctrl.cpp
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_brush.o: $(srcdir)/src/os2/brush.cpp
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
@@ -14999,8 +15026,8 @@ monolib_gridsel.o: $(srcdir)/src/generic/gridsel.cpp
 @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@monolib_gsocket.o: $(srcdir)/src/unix/gsocket.c
 @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@   $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $<
 
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_gsocket.o: $(srcdir)/src/os2/gsocket.c
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $<
+@COND_PLATFORM_OS2_1@monolib_gsocket.o: $(srcdir)/src/os2/gsocket.c
+@COND_PLATFORM_OS2_1@  $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $<
 
 @COND_PLATFORM_WIN32_1@monolib_gsocket.o: $(srcdir)/src/msw/gsocket.c
 @COND_PLATFORM_WIN32_1@        $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $<
@@ -16271,6 +16298,9 @@ monolib_utilscmn.o: $(srcdir)/src/common/utilscmn.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@monolib_utilsgui.o: $(srcdir)/src/msw/utilsgui.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_utilsgui.o: $(srcdir)/src/os2/utilsgui.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
 monolib_utilsres.o: $(srcdir)/src/gtk/utilsres.cpp
        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
@@ -16422,6 +16452,9 @@ netdll_ftp.o: $(srcdir)/src/common/ftp.cpp
 @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@netdll_gsocket.o: $(srcdir)/src/unix/gsocket.c
 @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@   $(CCC) -c -o $@ $(NETDLL_CFLAGS) $<
 
+@COND_PLATFORM_OS2_1@netdll_gsocket.o: $(srcdir)/src/os2/gsocket.c
+@COND_PLATFORM_OS2_1@  $(CCC) -c -o $@ $(NETDLL_CFLAGS) $<
+
 @COND_PLATFORM_WIN32_1@netdll_gsocket.o: $(srcdir)/src/msw/gsocket.c
 @COND_PLATFORM_WIN32_1@        $(CCC) -c -o $@ $(NETDLL_CFLAGS) $<
 
@@ -16472,6 +16505,9 @@ netlib_ftp.o: $(srcdir)/src/common/ftp.cpp
 @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@netlib_gsocket.o: $(srcdir)/src/unix/gsocket.c
 @COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@   $(CCC) -c -o $@ $(NETLIB_CFLAGS) $<
 
+@COND_PLATFORM_OS2_1@netlib_gsocket.o: $(srcdir)/src/os2/gsocket.c
+@COND_PLATFORM_OS2_1@  $(CCC) -c -o $@ $(NETLIB_CFLAGS) $<
+
 @COND_PLATFORM_WIN32_1@netlib_gsocket.o: $(srcdir)/src/msw/gsocket.c
 @COND_PLATFORM_WIN32_1@        $(CCC) -c -o $@ $(NETLIB_CFLAGS) $<
 

diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc
index f75eec36a3ddb5ca11d3c00e130f58a9137e3a07..703dc48e90e015bbecf43fcf4549eb41e49eba38 100644 (file)
--- a/build/msw/makefile.bcc
+++ b/build/msw/makefile.bcc
@@ -140,6 +140,7 @@ BASEDLL_OBJECTS =  \
        $(OBJS)\basedll_thread.obj \
        $(OBJS)\basedll_utils.obj \
        $(OBJS)\basedll_utilsexc.obj \
+       $(OBJS)\basedll_bookctrl.obj \
        $(OBJS)\basedll_event.obj \
        $(OBJS)\basedll_fs_mem.obj \
        $(OBJS)\basedll_msgout.obj \
@@ -221,6 +222,7 @@ BASELIB_OBJECTS =  \
        $(OBJS)\baselib_thread.obj \
        $(OBJS)\baselib_utils.obj \
        $(OBJS)\baselib_utilsexc.obj \
+       $(OBJS)\baselib_bookctrl.obj \
        $(OBJS)\baselib_event.obj \
        $(OBJS)\baselib_fs_mem.obj \
        $(OBJS)\baselib_msgout.obj \
@@ -242,6 +244,7 @@ COREDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
        $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_coredll.csm
 COREDLL_OBJECTS =  \
        $(OBJS)\coredll_dummy.obj \
+       $(OBJS)\coredll_bookctrl.obj \
        $(OBJS)\coredll_event.obj \
        $(OBJS)\coredll_fs_mem.obj \
        $(OBJS)\coredll_msgout.obj \
@@ -263,6 +266,7 @@ CORELIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
        -H=$(OBJS)\wxprec_corelib.csm
 CORELIB_OBJECTS =  \
        $(OBJS)\corelib_dummy.obj \
+       $(OBJS)\corelib_bookctrl.obj \
        $(OBJS)\corelib_event.obj \
        $(OBJS)\corelib_fs_mem.obj \
        $(OBJS)\corelib_msgout.obj \
@@ -447,6 +451,7 @@ MONODLL_OBJECTS =  \
        $(OBJS)\monodll_thread.obj \
        $(OBJS)\monodll_utils.obj \
        $(OBJS)\monodll_utilsexc.obj \
+       $(OBJS)\monodll_bookctrl.obj \
        $(OBJS)\monodll_event.obj \
        $(OBJS)\monodll_fs_mem.obj \
        $(OBJS)\monodll_msgout.obj \
@@ -541,6 +546,7 @@ MONOLIB_OBJECTS =  \
        $(OBJS)\monolib_thread.obj \
        $(OBJS)\monolib_utils.obj \
        $(OBJS)\monolib_utilsexc.obj \
+       $(OBJS)\monolib_bookctrl.obj \
        $(OBJS)\monolib_event.obj \
        $(OBJS)\monolib_fs_mem.obj \
        $(OBJS)\monolib_msgout.obj \
@@ -2713,6 +2719,9 @@ $(OBJS)\basedll_appbase.obj: ..\..\src\common\appbase.cpp
 $(OBJS)\basedll_basemsw.obj: ..\..\src\msw\basemsw.cpp
        $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
 
+$(OBJS)\basedll_bookctrl.obj: ..\..\src\common\bookctrl.cpp
+       $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
+
 $(OBJS)\basedll_clntdata.obj: ..\..\src\common\clntdata.cpp
        $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
 
@@ -2920,6 +2929,9 @@ $(OBJS)\baselib_appbase.obj: ..\..\src\common\appbase.cpp
 $(OBJS)\baselib_basemsw.obj: ..\..\src\msw\basemsw.cpp
        $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**
 
+$(OBJS)\baselib_bookctrl.obj: ..\..\src\common\bookctrl.cpp
+       $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**
+
 $(OBJS)\baselib_clntdata.obj: ..\..\src\common\clntdata.cpp
        $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**
 
@@ -3184,6 +3196,9 @@ $(OBJS)\coredll_bmpbuttn.obj: ..\..\src\msw\bmpbuttn.cpp
        $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
 !endif
 
+$(OBJS)\coredll_bookctrl.obj: ..\..\src\common\bookctrl.cpp
+       $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_brush.obj: ..\..\src\msw\brush.cpp
        $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
@@ -4293,6 +4308,9 @@ $(OBJS)\corelib_bmpbuttn.obj: ..\..\src\msw\bmpbuttn.cpp
        $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
 !endif
 
+$(OBJS)\corelib_bookctrl.obj: ..\..\src\common\bookctrl.cpp
+       $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_brush.obj: ..\..\src\msw\brush.cpp
        $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
@@ -5570,6 +5588,9 @@ $(OBJS)\monodll_bmpbuttn.obj: ..\..\src\msw\bmpbuttn.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 !endif
 
+$(OBJS)\monodll_bookctrl.obj: ..\..\src\common\bookctrl.cpp
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_brush.obj: ..\..\src\msw\brush.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
@@ -7018,6 +7039,9 @@ $(OBJS)\monolib_bmpbuttn.obj: ..\..\src\msw\bmpbuttn.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 !endif
 
+$(OBJS)\monolib_bookctrl.obj: ..\..\src\common\bookctrl.cpp
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_brush.obj: ..\..\src\msw\brush.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**

diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc
index 7577ec2bf4b9be9c6f6e49332fffc25b0121bbf7..82c87ddb37bc276c3845f28191ac6a55bd0d6ff4 100644 (file)
--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@@ -131,6 +131,7 @@ BASEDLL_OBJECTS =  \
        $(OBJS)\basedll_thread.o \
        $(OBJS)\basedll_utils.o \
        $(OBJS)\basedll_utilsexc.o \
+       $(OBJS)\basedll_bookctrl.o \
        $(OBJS)\basedll_event.o \
        $(OBJS)\basedll_fs_mem.o \
        $(OBJS)\basedll_msgout.o \
@@ -211,6 +212,7 @@ BASELIB_OBJECTS =  \
        $(OBJS)\baselib_thread.o \
        $(OBJS)\baselib_utils.o \
        $(OBJS)\baselib_utilsexc.o \
+       $(OBJS)\baselib_bookctrl.o \
        $(OBJS)\baselib_event.o \
        $(OBJS)\baselib_fs_mem.o \
        $(OBJS)\baselib_msgout.o \
@@ -232,6 +234,7 @@ COREDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
        $(CXXFLAGS)
 COREDLL_OBJECTS =  \
        $(OBJS)\coredll_dummy.o \
+       $(OBJS)\coredll_bookctrl.o \
        $(OBJS)\coredll_event.o \
        $(OBJS)\coredll_fs_mem.o \
        $(OBJS)\coredll_msgout.o \
@@ -252,6 +255,7 @@ CORELIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
        -I..\..\src\expat\lib -DwxUSE_BASE=0 $(CXXFLAGS)
 CORELIB_OBJECTS =  \
        $(OBJS)\corelib_dummy.o \
+       $(OBJS)\corelib_bookctrl.o \
        $(OBJS)\corelib_event.o \
        $(OBJS)\corelib_fs_mem.o \
        $(OBJS)\corelib_msgout.o \
@@ -431,6 +435,7 @@ MONODLL_OBJECTS =  \
        $(OBJS)\monodll_thread.o \
        $(OBJS)\monodll_utils.o \
        $(OBJS)\monodll_utilsexc.o \
+       $(OBJS)\monodll_bookctrl.o \
        $(OBJS)\monodll_event.o \
        $(OBJS)\monodll_fs_mem.o \
        $(OBJS)\monodll_msgout.o \
@@ -524,6 +529,7 @@ MONOLIB_OBJECTS =  \
        $(OBJS)\monolib_thread.o \
        $(OBJS)\monolib_utils.o \
        $(OBJS)\monolib_utilsexc.o \
+       $(OBJS)\monolib_bookctrl.o \
        $(OBJS)\monolib_event.o \
        $(OBJS)\monolib_fs_mem.o \
        $(OBJS)\monolib_msgout.o \
@@ -2776,6 +2782,9 @@ $(OBJS)\basedll_appbase.o: ..\..\src\common\appbase.cpp
 $(OBJS)\basedll_basemsw.o: ..\..\src\msw\basemsw.cpp
        $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 
+$(OBJS)\basedll_bookctrl.o: ..\..\src\common\bookctrl.cpp
+       $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $<
+
 $(OBJS)\basedll_clntdata.o: ..\..\src\common\clntdata.cpp
        $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 
@@ -2983,6 +2992,9 @@ $(OBJS)\baselib_appbase.o: ..\..\src\common\appbase.cpp
 $(OBJS)\baselib_basemsw.o: ..\..\src\msw\basemsw.cpp
        $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $<
 
+$(OBJS)\baselib_bookctrl.o: ..\..\src\common\bookctrl.cpp
+       $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $<
+
 $(OBJS)\baselib_clntdata.o: ..\..\src\common\clntdata.cpp
        $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $<
 
@@ -3255,6 +3267,9 @@ $(OBJS)\coredll_bmpbuttn.o: ..\..\src\msw\bmpbuttn.cpp
 endif
 endif
 
+$(OBJS)\coredll_bookctrl.o: ..\..\src\common\bookctrl.cpp
+       $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $<
+
 ifeq ($(USE_GUI),1)
 $(OBJS)\coredll_brush.o: ..\..\src\msw\brush.cpp
        $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $<
@@ -4464,6 +4479,9 @@ $(OBJS)\corelib_bmpbuttn.o: ..\..\src\msw\bmpbuttn.cpp
 endif
 endif
 
+$(OBJS)\corelib_bookctrl.o: ..\..\src\common\bookctrl.cpp
+       $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $<
+
 ifeq ($(USE_GUI),1)
 $(OBJS)\corelib_brush.o: ..\..\src\msw\brush.cpp
        $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $<
@@ -5841,6 +5859,9 @@ $(OBJS)\monodll_bmpbuttn.o: ..\..\src\msw\bmpbuttn.cpp
 endif
 endif
 
+$(OBJS)\monodll_bookctrl.o: ..\..\src\common\bookctrl.cpp
+       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
 ifeq ($(USE_GUI),1)
 $(OBJS)\monodll_brush.o: ..\..\src\msw\brush.cpp
        $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
@@ -7389,6 +7410,9 @@ $(OBJS)\monolib_bmpbuttn.o: ..\..\src\msw\bmpbuttn.cpp
 endif
 endif
 
+$(OBJS)\monolib_bookctrl.o: ..\..\src\common\bookctrl.cpp
+       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
 ifeq ($(USE_GUI),1)
 $(OBJS)\monolib_brush.o: ..\..\src\msw\brush.cpp
        $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<

diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc
index e698255050f610fcba771ce6c752be5600a0f263..f3222103d9da27cdb5a4aa13e0c4d65c74d211ce 100644 (file)
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -142,6 +142,7 @@ BASEDLL_OBJECTS =  \
        $(OBJS)\basedll_thread.obj \
        $(OBJS)\basedll_utils.obj \
        $(OBJS)\basedll_utilsexc.obj \
+       $(OBJS)\basedll_bookctrl.obj \
        $(OBJS)\basedll_event.obj \
        $(OBJS)\basedll_fs_mem.obj \
        $(OBJS)\basedll_msgout.obj \
@@ -228,6 +229,7 @@ BASELIB_OBJECTS =  \
        $(OBJS)\baselib_thread.obj \
        $(OBJS)\baselib_utils.obj \
        $(OBJS)\baselib_utilsexc.obj \
+       $(OBJS)\baselib_bookctrl.obj \
        $(OBJS)\baselib_event.obj \
        $(OBJS)\baselib_fs_mem.obj \
        $(OBJS)\baselib_msgout.obj \
@@ -254,6 +256,7 @@ COREDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_105) \
        /Fp"$(OBJS)\wxprec_coredll.pch"
 COREDLL_OBJECTS =  \
        $(OBJS)\coredll_dummy.obj \
+       $(OBJS)\coredll_bookctrl.obj \
        $(OBJS)\coredll_event.obj \
        $(OBJS)\coredll_fs_mem.obj \
        $(OBJS)\coredll_msgout.obj \
@@ -280,6 +283,7 @@ CORELIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_114) \
        /DwxUSE_BASE=0 $(CXXFLAGS) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_corelib.pch"
 CORELIB_OBJECTS =  \
        $(OBJS)\corelib_dummy.obj \
+       $(OBJS)\corelib_bookctrl.obj \
        $(OBJS)\corelib_event.obj \
        $(OBJS)\corelib_fs_mem.obj \
        $(OBJS)\corelib_msgout.obj \
@@ -486,6 +490,7 @@ MONODLL_OBJECTS =  \
        $(OBJS)\monodll_thread.obj \
        $(OBJS)\monodll_utils.obj \
        $(OBJS)\monodll_utilsexc.obj \
+       $(OBJS)\monodll_bookctrl.obj \
        $(OBJS)\monodll_event.obj \
        $(OBJS)\monodll_fs_mem.obj \
        $(OBJS)\monodll_msgout.obj \
@@ -584,6 +589,7 @@ MONOLIB_OBJECTS =  \
        $(OBJS)\monolib_thread.obj \
        $(OBJS)\monolib_utils.obj \
        $(OBJS)\monolib_utilsexc.obj \
+       $(OBJS)\monolib_bookctrl.obj \
        $(OBJS)\monolib_event.obj \
        $(OBJS)\monolib_fs_mem.obj \
        $(OBJS)\monolib_msgout.obj \
@@ -3280,6 +3286,9 @@ $(OBJS)\basedll_appbase.obj: ..\..\src\common\appbase.cpp
 $(OBJS)\basedll_basemsw.obj: ..\..\src\msw\basemsw.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
 
+$(OBJS)\basedll_bookctrl.obj: ..\..\src\common\bookctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+
 $(OBJS)\basedll_clntdata.obj: ..\..\src\common\clntdata.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
 
@@ -3487,6 +3496,9 @@ $(OBJS)\baselib_appbase.obj: ..\..\src\common\appbase.cpp
 $(OBJS)\baselib_basemsw.obj: ..\..\src\msw\basemsw.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
 
+$(OBJS)\baselib_bookctrl.obj: ..\..\src\common\bookctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+
 $(OBJS)\baselib_clntdata.obj: ..\..\src\common\clntdata.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
 
@@ -3751,6 +3763,9 @@ $(OBJS)\coredll_bmpbuttn.obj: ..\..\src\msw\bmpbuttn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
 !endif
 
+$(OBJS)\coredll_bookctrl.obj: ..\..\src\common\bookctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_brush.obj: ..\..\src\msw\brush.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@@ -4860,6 +4875,9 @@ $(OBJS)\corelib_bmpbuttn.obj: ..\..\src\msw\bmpbuttn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
 !endif
 
+$(OBJS)\corelib_bookctrl.obj: ..\..\src\common\bookctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_brush.obj: ..\..\src\msw\brush.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
@@ -6137,6 +6155,9 @@ $(OBJS)\monodll_bmpbuttn.obj: ..\..\src\msw\bmpbuttn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
 !endif
 
+$(OBJS)\monodll_bookctrl.obj: ..\..\src\common\bookctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_brush.obj: ..\..\src\msw\brush.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -7585,6 +7606,9 @@ $(OBJS)\monolib_bmpbuttn.obj: ..\..\src\msw\bmpbuttn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
 !endif
 
+$(OBJS)\monolib_bookctrl.obj: ..\..\src\common\bookctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_brush.obj: ..\..\src\msw\brush.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**

diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat
index 0d004a520ec54a86b128079ca34923ce25fc2f97..f9b7541a3771fbccd372f9ea2f65a577973c7953 100644 (file)
--- a/build/msw/makefile.wat
+++ b/build/msw/makefile.wat
@@ -2111,6 +2111,7 @@ BASEDLL_OBJECTS =  &
        $(OBJS)\basedll_thread.obj &
        $(OBJS)\basedll_utils.obj &
        $(OBJS)\basedll_utilsexc.obj &
+       $(OBJS)\basedll_bookctrl.obj &
        $(OBJS)\basedll_event.obj &
        $(OBJS)\basedll_fs_mem.obj &
        $(OBJS)\basedll_msgout.obj &
@@ -2192,6 +2193,7 @@ BASELIB_OBJECTS =  &
        $(OBJS)\baselib_thread.obj &
        $(OBJS)\baselib_utils.obj &
        $(OBJS)\baselib_utilsexc.obj &
+       $(OBJS)\baselib_bookctrl.obj &
        $(OBJS)\baselib_event.obj &
        $(OBJS)\baselib_fs_mem.obj &
        $(OBJS)\baselib_msgout.obj &
@@ -2213,6 +2215,7 @@ COREDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
        $(CXXFLAGS) /fh=$(OBJS)\wxprec_coredll.pch
 COREDLL_OBJECTS =  &
        $(OBJS)\coredll_dummy.obj &
+       $(OBJS)\coredll_bookctrl.obj &
        $(OBJS)\coredll_event.obj &
        $(OBJS)\coredll_fs_mem.obj &
        $(OBJS)\coredll_msgout.obj &
@@ -2234,6 +2237,7 @@ CORELIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
        /fh=$(OBJS)\wxprec_corelib.pch
 CORELIB_OBJECTS =  &
        $(OBJS)\corelib_dummy.obj &
+       $(OBJS)\corelib_bookctrl.obj &
        $(OBJS)\corelib_event.obj &
        $(OBJS)\corelib_fs_mem.obj &
        $(OBJS)\corelib_msgout.obj &
@@ -2416,6 +2420,7 @@ MONODLL_OBJECTS =  &
        $(OBJS)\monodll_thread.obj &
        $(OBJS)\monodll_utils.obj &
        $(OBJS)\monodll_utilsexc.obj &
+       $(OBJS)\monodll_bookctrl.obj &
        $(OBJS)\monodll_event.obj &
        $(OBJS)\monodll_fs_mem.obj &
        $(OBJS)\monodll_msgout.obj &
@@ -2510,6 +2515,7 @@ MONOLIB_OBJECTS =  &
        $(OBJS)\monolib_thread.obj &
        $(OBJS)\monolib_utils.obj &
        $(OBJS)\monolib_utilsexc.obj &
+       $(OBJS)\monolib_bookctrl.obj &
        $(OBJS)\monolib_event.obj &
        $(OBJS)\monolib_fs_mem.obj &
        $(OBJS)\monolib_msgout.obj &
@@ -2869,6 +2875,9 @@ $(OBJS)\basedll_appbase.obj :  .AUTODEPEND ..\..\src\common\appbase.cpp
 $(OBJS)\basedll_basemsw.obj :  .AUTODEPEND ..\..\src\msw\basemsw.cpp
        $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
 
+$(OBJS)\basedll_bookctrl.obj :  .AUTODEPEND ..\..\src\common\bookctrl.cpp
+       $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
+
 $(OBJS)\basedll_clntdata.obj :  .AUTODEPEND ..\..\src\common\clntdata.cpp
        $(CXX) -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
 
@@ -3076,6 +3085,9 @@ $(OBJS)\baselib_appbase.obj :  .AUTODEPEND ..\..\src\common\appbase.cpp
 $(OBJS)\baselib_basemsw.obj :  .AUTODEPEND ..\..\src\msw\basemsw.cpp
        $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
 
+$(OBJS)\baselib_bookctrl.obj :  .AUTODEPEND ..\..\src\common\bookctrl.cpp
+       $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
+
 $(OBJS)\baselib_clntdata.obj :  .AUTODEPEND ..\..\src\common\clntdata.cpp
        $(CXX) -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
 
@@ -3348,6 +3360,9 @@ $(OBJS)\coredll_bmpbuttn.obj :  .AUTODEPEND ..\..\src\msw\bmpbuttn.cpp
 !endif
 !endif
 
+$(OBJS)\coredll_bookctrl.obj :  .AUTODEPEND ..\..\src\common\bookctrl.cpp
+       $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
+
 !ifeq USE_GUI 1
 $(OBJS)\coredll_brush.obj :  .AUTODEPEND ..\..\src\msw\brush.cpp
        $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
@@ -4557,6 +4572,9 @@ $(OBJS)\corelib_bmpbuttn.obj :  .AUTODEPEND ..\..\src\msw\bmpbuttn.cpp
 !endif
 !endif
 
+$(OBJS)\corelib_bookctrl.obj :  .AUTODEPEND ..\..\src\common\bookctrl.cpp
+       $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
+
 !ifeq USE_GUI 1
 $(OBJS)\corelib_brush.obj :  .AUTODEPEND ..\..\src\msw\brush.cpp
        $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
@@ -5934,6 +5952,9 @@ $(OBJS)\monodll_bmpbuttn.obj :  .AUTODEPEND ..\..\src\msw\bmpbuttn.cpp
 !endif
 !endif
 
+$(OBJS)\monodll_bookctrl.obj :  .AUTODEPEND ..\..\src\common\bookctrl.cpp
+       $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
 !ifeq USE_GUI 1
 $(OBJS)\monodll_brush.obj :  .AUTODEPEND ..\..\src\msw\brush.cpp
        $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -7482,6 +7503,9 @@ $(OBJS)\monolib_bmpbuttn.obj :  .AUTODEPEND ..\..\src\msw\bmpbuttn.cpp
 !endif
 !endif
 
+$(OBJS)\monolib_bookctrl.obj :  .AUTODEPEND ..\..\src\common\bookctrl.cpp
+       $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
 !ifeq USE_GUI 1
 $(OBJS)\monolib_brush.obj :  .AUTODEPEND ..\..\src\msw\brush.cpp
        $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<

diff --git a/build/msw/wx_base.dsp b/build/msw/wx_base.dsp
index adc9f46078211cb471b286c135342bce43e92ed3..455748d66d5bf8167bb14c3dbe6b80cea1f43970 100644 (file)
--- a/build/msw/wx_base.dsp
+++ b/build/msw/wx_base.dsp
@@ -456,6 +456,10 @@ SOURCE=..\..\src\common\appbase.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\common\bookctrl.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\common\clntdata.cpp
 # End Source File
 # Begin Source File

diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp
index 493b1d71e3945fde44c2368a0bf9376689a3a702..04daf57b4b646e5d89bc5494301e056aa39cf813 100644 (file)
--- a/build/msw/wx_core.dsp
+++ b/build/msw/wx_core.dsp
@@ -472,6 +472,10 @@ SOURCE=..\..\src\common\bmpbase.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\common\bookctrl.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\common\choiccmn.cpp
 # End Source File
 # Begin Source File