merging back XTI branch part 2
authorStefan Csomor <csomor@advancedconcepts.ch>
Tue, 4 Jan 2011 08:31:53 +0000 (08:31 +0000)
committerStefan Csomor <csomor@advancedconcepts.ch>
Tue, 4 Jan 2011 08:31:53 +0000 (08:31 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66555 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

244 files changed:
build/bakefiles/files.bkl
build/msw/makefile.bcc
build/msw/makefile.gcc
build/msw/makefile.vc
build/msw/makefile.wat
build/msw/wx_base.dsp
build/msw/wx_core.dsp
build/msw/wx_vc7_base.vcproj
build/msw/wx_vc7_core.vcproj
build/msw/wx_vc8_base.vcproj
build/msw/wx_vc8_core.vcproj
build/msw/wx_vc9_base.vcproj
build/msw/wx_vc9_core.vcproj
include/wx/defs.h
include/wx/flags.h
include/wx/menu.h
include/wx/notebook.h
include/wx/object.h
include/wx/xti.h
include/wx/xtistrm.h
include/wx/xtixml.h
src/cocoa/bmpbuttn.mm
src/cocoa/checkbox.mm
src/cocoa/choice.mm
src/cocoa/colour.mm
src/cocoa/combobox.mm
src/cocoa/frame.mm
src/cocoa/gauge.mm
src/cocoa/listbox.mm
src/cocoa/radiobut.mm
src/cocoa/scrolbar.mm
src/cocoa/slider.mm
src/cocoa/spinbutt.mm
src/cocoa/statbmp.mm
src/cocoa/statbox.mm
src/cocoa/statline2.mm
src/cocoa/stattext.mm
src/cocoa/textctrl.mm
src/cocoa/window.mm
src/common/btncmn.cpp
src/common/calctrlcmn.cpp
src/common/choiccmn.cpp
src/common/colourcmn.cpp
src/common/combocmn.cpp
src/common/dlgcmn.cpp
src/common/fontcmn.cpp
src/common/fontmap.cpp
src/common/framecmn.cpp
src/common/gaugecmn.cpp
src/common/lboxcmn.cpp
src/common/listctrlcmn.cpp
src/common/menucmn.cpp
src/common/nbkbase.cpp
src/common/radiocmn.cpp
src/common/spinctrlcmn.cpp
src/common/stattextcmn.cpp
src/common/textcmn.cpp
src/common/treebase.cpp
src/common/wincmn.cpp
src/generic/calctrlg.cpp
src/generic/colour.cpp
src/generic/commandlinkbuttong.cpp
src/generic/dirctrlg.cpp
src/generic/grid.cpp
src/generic/listctrl.cpp
src/generic/odcombo.cpp
src/generic/panelg.cpp
src/generic/spinctlg.cpp
src/generic/statbmpg.cpp
src/generic/statline.cpp
src/generic/treectlg.cpp
src/gtk/bmpbuttn.cpp
src/gtk/checkbox.cpp
src/gtk/choice.cpp
src/gtk/colour.cpp
src/gtk/combobox.cpp
src/gtk/frame.cpp
src/gtk/gauge.cpp
src/gtk/listbox.cpp
src/gtk/radiobut.cpp
src/gtk/scrolbar.cpp
src/gtk/slider.cpp
src/gtk/spinbutt.cpp
src/gtk/spinctrl.cpp
src/gtk/statbmp.cpp
src/gtk/statbox.cpp
src/gtk/statline.cpp
src/gtk/stattext.cpp
src/gtk/textctrl.cpp
src/gtk/window.cpp
src/gtk1/bmpbuttn.cpp
src/gtk1/button.cpp
src/gtk1/checkbox.cpp
src/gtk1/choice.cpp
src/gtk1/colour.cpp
src/gtk1/combobox.cpp
src/gtk1/dialog.cpp
src/gtk1/frame.cpp
src/gtk1/gauge.cpp
src/gtk1/listbox.cpp
src/gtk1/radiobut.cpp
src/gtk1/scrolbar.cpp
src/gtk1/slider.cpp
src/gtk1/spinbutt.cpp
src/gtk1/spinctrl.cpp
src/gtk1/statbmp.cpp
src/gtk1/statbox.cpp
src/gtk1/statline.cpp
src/gtk1/stattext.cpp
src/gtk1/textctrl.cpp
src/gtk1/window.cpp
src/html/htmlwin.cpp
src/motif/bmpbuttn.cpp
src/motif/button.cpp
src/motif/checkbox.cpp
src/motif/choice.cpp
src/motif/colour.cpp
src/motif/dialog.cpp
src/motif/frame.cpp
src/motif/gauge.cpp
src/motif/listbox.cpp
src/motif/radiobut.cpp
src/motif/scrolbar.cpp
src/motif/slider.cpp
src/motif/spinbutt.cpp
src/motif/statbmp.cpp
src/motif/statbox.cpp
src/motif/stattext.cpp
src/motif/textctrl.cpp
src/motif/window.cpp
src/msw/bmpbuttn.cpp
src/msw/button.cpp
src/msw/checkbox.cpp
src/msw/choice.cpp
src/msw/colour.cpp
src/msw/combobox.cpp
src/msw/dialog.cpp
src/msw/frame.cpp
src/msw/gauge.cpp
src/msw/listbox.cpp
src/msw/listctrl.cpp
src/msw/radiobut.cpp
src/msw/scrolbar.cpp
src/msw/slider.cpp
src/msw/spinbutt.cpp
src/msw/spinctrl.cpp
src/msw/statbmp.cpp
src/msw/statbox.cpp
src/msw/statline.cpp
src/msw/stattext.cpp
src/msw/textctrl.cpp
src/msw/treectrl.cpp
src/msw/wince/choicece.cpp
src/msw/wince/textctrlce.cpp
src/msw/window.cpp
src/os2/bmpbuttn.cpp
src/os2/button.cpp
src/os2/checkbox.cpp
src/os2/choice.cpp
src/os2/colour.cpp
src/os2/combobox.cpp
src/os2/dialog.cpp
src/os2/frame.cpp
src/os2/gauge.cpp
src/os2/listbox.cpp
src/os2/listctrl.cpp
src/os2/radiobut.cpp
src/os2/scrolbar.cpp
src/os2/slider.cpp
src/os2/spinbutt.cpp
src/os2/spinctrl.cpp
src/os2/statbmp.cpp
src/os2/statbox.cpp
src/os2/statline.cpp
src/os2/stattext.cpp
src/os2/textctrl.cpp
src/os2/treectrl.cpp
src/os2/window.cpp
src/osx/bmpbuttn_osx.cpp
src/osx/button_osx.cpp
src/osx/carbon/combobox.cpp
src/osx/carbon/combobxc.cpp
src/osx/carbon/frame.cpp
src/osx/carbon/listctrl_mac.cpp
src/osx/carbon/statbmp.cpp
src/osx/carbon/statline.cpp
src/osx/checkbox_osx.cpp
src/osx/choice_osx.cpp
src/osx/cocoa/combobox.mm
src/osx/combobox_osx.cpp
src/osx/core/colour.cpp
src/osx/dialog_osx.cpp
src/osx/gauge_osx.cpp
src/osx/listbox_osx.cpp
src/osx/radiobut_osx.cpp
src/osx/scrolbar_osx.cpp
src/osx/slider_osx.cpp
src/osx/spinbutt_osx.cpp
src/osx/spinctrl_osx.cpp
src/osx/statbox_osx.cpp
src/osx/statline_osx.cpp
src/osx/stattext_osx.cpp
src/osx/textctrl_osx.cpp
src/osx/window_osx.cpp
src/palmos/bmpbuttn.cpp
src/palmos/button.cpp
src/palmos/checkbox.cpp
src/palmos/choice.cpp
src/palmos/combobox.cpp
src/palmos/dialog.cpp
src/palmos/frame.cpp
src/palmos/gauge.cpp
src/palmos/listbox.cpp
src/palmos/listctrl.cpp
src/palmos/radiobut.cpp
src/palmos/scrolbar.cpp
src/palmos/slider.cpp
src/palmos/spinbutt.cpp
src/palmos/spinctrl.cpp
src/palmos/statbmp.cpp
src/palmos/statbox.cpp
src/palmos/statline.cpp
src/palmos/stattext.cpp
src/palmos/textctrl.cpp
src/palmos/treectrl.cpp
src/palmos/window.cpp
src/univ/bmpbuttn.cpp
src/univ/button.cpp
src/univ/checkbox.cpp
src/univ/choice.cpp
src/univ/dialog.cpp
src/univ/framuniv.cpp
src/univ/gauge.cpp
src/univ/listbox.cpp
src/univ/radiobut.cpp
src/univ/scrolbar.cpp
src/univ/slider.cpp
src/univ/spinbutt.cpp
src/univ/statbmp.cpp
src/univ/statbox.cpp
src/univ/statline.cpp
src/univ/textctrl.cpp
src/x11/colour.cpp
src/x11/textctrl.cpp

index 05c8696fb897862a942c030541761b5bb1ce3b30..8495d506817272fbf1337796abd8660beb004b9a 100644 (file)
@@ -499,6 +499,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/ptr_shrd.h
     wx/recguard.h
     wx/regex.h
+    wx/rtti.h
     wx/scopedarray.h
     wx/scopedptr.h
     wx/scopeguard.h
@@ -551,6 +552,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/xlocale.h
     wx/xti.h
     wx/xtistrm.h
+    wx/xtictor.h
+    wx/xtihandler.h
+    wx/xtiprop.h
+    wx/xtitypes.h
     wx/zipstrm.h
     wx/zstream.h
     wx/meta/convertible.h
@@ -648,9 +653,13 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/artstd.cpp
     src/common/arttango.cpp
     src/common/bmpbase.cpp
+    src/common/bmpbtncmn.cpp
     src/common/bookctrl.cpp
     src/common/btncmn.cpp
     src/common/cairo.cpp
+    src/common/calctrlcmn.cpp
+    src/common/checkboxcmn.cpp
+    src/common/checklstcmn.cpp
     src/common/choiccmn.cpp
     src/common/clipcmn.cpp
     src/common/clrpickercmn.cpp
@@ -667,6 +676,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/dcbufcmn.cpp
     src/common/dcgraph.cpp
     src/common/dcsvg.cpp
+    src/common/dirctrlcmn.cpp
     src/common/dlgcmn.cpp
     src/common/dndcmn.cpp
     src/common/dobjcmn.cpp
@@ -693,6 +703,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/geometry.cpp
     src/common/gifdecod.cpp
     src/common/graphcmn.cpp
+    src/common/gridcmn.cpp
     src/common/headercolcmn.cpp
     src/common/headerctrlcmn.cpp
     src/common/helpbase.cpp
@@ -717,23 +728,32 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/menucmn.cpp
     src/common/mousemanager.cpp
     src/common/nbkbase.cpp
+    src/common/odcombocmn.cpp
     src/common/overlaycmn.cpp
     src/common/ownerdrwcmn.cpp
     src/common/paper.cpp
+    src/common/panelcmn.cpp
     src/common/persist.cpp
     src/common/pickerbase.cpp
     src/common/popupcmn.cpp
     src/common/prntbase.cpp
     src/common/quantize.cpp
+    src/common/radiobtncmn.cpp
     src/common/radiocmn.cpp
     src/common/rearrangectrl.cpp
     src/common/rendcmn.cpp
     src/common/rgncmn.cpp
+    src/common/scrolbarcmn.cpp
     src/common/settcmn.cpp
     src/common/sizer.cpp
+    src/common/slidercmn.cpp
+    src/common/spinbtncmn.cpp
     src/common/spinctrlcmn.cpp
     src/common/srchcmn.cpp
     src/common/statbar.cpp
+    src/common/statbmpcmn.cpp
+    src/common/statboxcmn.cpp
+    src/common/statlinecmn.cpp
     src/common/stattextcmn.cpp
     src/common/stockitem.cpp
     src/common/tbarbase.cpp
index fc026cc228e510188143d6c005d6260eb693874e..db5598ac7535fe76979f6422593494ffff6ae2df 100644 (file)
@@ -1791,9 +1791,13 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_artstd.obj \\r
        $(OBJS)\monodll_arttango.obj \\r
        $(OBJS)\monodll_bmpbase.obj \\r
+       $(OBJS)\monodll_bmpbtncmn.obj \\r
        $(OBJS)\monodll_bookctrl.obj \\r
        $(OBJS)\monodll_btncmn.obj \\r
        $(OBJS)\monodll_cairo.obj \\r
+       $(OBJS)\monodll_calctrlcmn.obj \\r
+       $(OBJS)\monodll_checkboxcmn.obj \\r
+       $(OBJS)\monodll_checklstcmn.obj \\r
        $(OBJS)\monodll_choiccmn.obj \\r
        $(OBJS)\monodll_clipcmn.obj \\r
        $(OBJS)\monodll_clrpickercmn.obj \\r
@@ -1810,6 +1814,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_dcbufcmn.obj \\r
        $(OBJS)\monodll_dcgraph.obj \\r
        $(OBJS)\monodll_dcsvg.obj \\r
+       $(OBJS)\monodll_dirctrlcmn.obj \\r
        $(OBJS)\monodll_dlgcmn.obj \\r
        $(OBJS)\monodll_dndcmn.obj \\r
        $(OBJS)\monodll_dobjcmn.obj \\r
@@ -1836,6 +1841,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_geometry.obj \\r
        $(OBJS)\monodll_gifdecod.obj \\r
        $(OBJS)\monodll_graphcmn.obj \\r
+       $(OBJS)\monodll_gridcmn.obj \\r
        $(OBJS)\monodll_headercolcmn.obj \\r
        $(OBJS)\monodll_headerctrlcmn.obj \\r
        $(OBJS)\monodll_helpbase.obj \\r
@@ -1860,23 +1866,32 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_menucmn.obj \\r
        $(OBJS)\monodll_mousemanager.obj \\r
        $(OBJS)\monodll_nbkbase.obj \\r
+       $(OBJS)\monodll_odcombocmn.obj \\r
        $(OBJS)\monodll_overlaycmn.obj \\r
        $(OBJS)\monodll_ownerdrwcmn.obj \\r
        $(OBJS)\monodll_paper.obj \\r
+       $(OBJS)\monodll_panelcmn.obj \\r
        $(OBJS)\monodll_persist.obj \\r
        $(OBJS)\monodll_pickerbase.obj \\r
        $(OBJS)\monodll_popupcmn.obj \\r
        $(OBJS)\monodll_prntbase.obj \\r
        $(OBJS)\monodll_quantize.obj \\r
+       $(OBJS)\monodll_radiobtncmn.obj \\r
        $(OBJS)\monodll_radiocmn.obj \\r
        $(OBJS)\monodll_rearrangectrl.obj \\r
        $(OBJS)\monodll_rendcmn.obj \\r
        $(OBJS)\monodll_rgncmn.obj \\r
+       $(OBJS)\monodll_scrolbarcmn.obj \\r
        $(OBJS)\monodll_settcmn.obj \\r
        $(OBJS)\monodll_sizer.obj \\r
+       $(OBJS)\monodll_slidercmn.obj \\r
+       $(OBJS)\monodll_spinbtncmn.obj \\r
        $(OBJS)\monodll_spinctrlcmn.obj \\r
        $(OBJS)\monodll_srchcmn.obj \\r
        $(OBJS)\monodll_statbar.obj \\r
+       $(OBJS)\monodll_statbmpcmn.obj \\r
+       $(OBJS)\monodll_statboxcmn.obj \\r
+       $(OBJS)\monodll_statlinecmn.obj \\r
        $(OBJS)\monodll_stattextcmn.obj \\r
        $(OBJS)\monodll_stockitem.obj \\r
        $(OBJS)\monodll_tbarbase.obj \\r
@@ -2039,9 +2054,13 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_artstd.obj \\r
        $(OBJS)\monodll_arttango.obj \\r
        $(OBJS)\monodll_bmpbase.obj \\r
+       $(OBJS)\monodll_bmpbtncmn.obj \\r
        $(OBJS)\monodll_bookctrl.obj \\r
        $(OBJS)\monodll_btncmn.obj \\r
        $(OBJS)\monodll_cairo.obj \\r
+       $(OBJS)\monodll_calctrlcmn.obj \\r
+       $(OBJS)\monodll_checkboxcmn.obj \\r
+       $(OBJS)\monodll_checklstcmn.obj \\r
        $(OBJS)\monodll_choiccmn.obj \\r
        $(OBJS)\monodll_clipcmn.obj \\r
        $(OBJS)\monodll_clrpickercmn.obj \\r
@@ -2058,6 +2077,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_dcbufcmn.obj \\r
        $(OBJS)\monodll_dcgraph.obj \\r
        $(OBJS)\monodll_dcsvg.obj \\r
+       $(OBJS)\monodll_dirctrlcmn.obj \\r
        $(OBJS)\monodll_dlgcmn.obj \\r
        $(OBJS)\monodll_dndcmn.obj \\r
        $(OBJS)\monodll_dobjcmn.obj \\r
@@ -2084,6 +2104,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_geometry.obj \\r
        $(OBJS)\monodll_gifdecod.obj \\r
        $(OBJS)\monodll_graphcmn.obj \\r
+       $(OBJS)\monodll_gridcmn.obj \\r
        $(OBJS)\monodll_headercolcmn.obj \\r
        $(OBJS)\monodll_headerctrlcmn.obj \\r
        $(OBJS)\monodll_helpbase.obj \\r
@@ -2108,23 +2129,32 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_menucmn.obj \\r
        $(OBJS)\monodll_mousemanager.obj \\r
        $(OBJS)\monodll_nbkbase.obj \\r
+       $(OBJS)\monodll_odcombocmn.obj \\r
        $(OBJS)\monodll_overlaycmn.obj \\r
        $(OBJS)\monodll_ownerdrwcmn.obj \\r
        $(OBJS)\monodll_paper.obj \\r
+       $(OBJS)\monodll_panelcmn.obj \\r
        $(OBJS)\monodll_persist.obj \\r
        $(OBJS)\monodll_pickerbase.obj \\r
        $(OBJS)\monodll_popupcmn.obj \\r
        $(OBJS)\monodll_prntbase.obj \\r
        $(OBJS)\monodll_quantize.obj \\r
+       $(OBJS)\monodll_radiobtncmn.obj \\r
        $(OBJS)\monodll_radiocmn.obj \\r
        $(OBJS)\monodll_rearrangectrl.obj \\r
        $(OBJS)\monodll_rendcmn.obj \\r
        $(OBJS)\monodll_rgncmn.obj \\r
+       $(OBJS)\monodll_scrolbarcmn.obj \\r
        $(OBJS)\monodll_settcmn.obj \\r
        $(OBJS)\monodll_sizer.obj \\r
+       $(OBJS)\monodll_slidercmn.obj \\r
+       $(OBJS)\monodll_spinbtncmn.obj \\r
        $(OBJS)\monodll_spinctrlcmn.obj \\r
        $(OBJS)\monodll_srchcmn.obj \\r
        $(OBJS)\monodll_statbar.obj \\r
+       $(OBJS)\monodll_statbmpcmn.obj \\r
+       $(OBJS)\monodll_statboxcmn.obj \\r
+       $(OBJS)\monodll_statlinecmn.obj \\r
        $(OBJS)\monodll_stattextcmn.obj \\r
        $(OBJS)\monodll_stockitem.obj \\r
        $(OBJS)\monodll_tbarbase.obj \\r
@@ -2515,9 +2545,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_artstd.obj \\r
        $(OBJS)\monolib_arttango.obj \\r
        $(OBJS)\monolib_bmpbase.obj \\r
+       $(OBJS)\monolib_bmpbtncmn.obj \\r
        $(OBJS)\monolib_bookctrl.obj \\r
        $(OBJS)\monolib_btncmn.obj \\r
        $(OBJS)\monolib_cairo.obj \\r
+       $(OBJS)\monolib_calctrlcmn.obj \\r
+       $(OBJS)\monolib_checkboxcmn.obj \\r
+       $(OBJS)\monolib_checklstcmn.obj \\r
        $(OBJS)\monolib_choiccmn.obj \\r
        $(OBJS)\monolib_clipcmn.obj \\r
        $(OBJS)\monolib_clrpickercmn.obj \\r
@@ -2534,6 +2568,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_dcbufcmn.obj \\r
        $(OBJS)\monolib_dcgraph.obj \\r
        $(OBJS)\monolib_dcsvg.obj \\r
+       $(OBJS)\monolib_dirctrlcmn.obj \\r
        $(OBJS)\monolib_dlgcmn.obj \\r
        $(OBJS)\monolib_dndcmn.obj \\r
        $(OBJS)\monolib_dobjcmn.obj \\r
@@ -2560,6 +2595,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_geometry.obj \\r
        $(OBJS)\monolib_gifdecod.obj \\r
        $(OBJS)\monolib_graphcmn.obj \\r
+       $(OBJS)\monolib_gridcmn.obj \\r
        $(OBJS)\monolib_headercolcmn.obj \\r
        $(OBJS)\monolib_headerctrlcmn.obj \\r
        $(OBJS)\monolib_helpbase.obj \\r
@@ -2584,23 +2620,32 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_menucmn.obj \\r
        $(OBJS)\monolib_mousemanager.obj \\r
        $(OBJS)\monolib_nbkbase.obj \\r
+       $(OBJS)\monolib_odcombocmn.obj \\r
        $(OBJS)\monolib_overlaycmn.obj \\r
        $(OBJS)\monolib_ownerdrwcmn.obj \\r
        $(OBJS)\monolib_paper.obj \\r
+       $(OBJS)\monolib_panelcmn.obj \\r
        $(OBJS)\monolib_persist.obj \\r
        $(OBJS)\monolib_pickerbase.obj \\r
        $(OBJS)\monolib_popupcmn.obj \\r
        $(OBJS)\monolib_prntbase.obj \\r
        $(OBJS)\monolib_quantize.obj \\r
+       $(OBJS)\monolib_radiobtncmn.obj \\r
        $(OBJS)\monolib_radiocmn.obj \\r
        $(OBJS)\monolib_rearrangectrl.obj \\r
        $(OBJS)\monolib_rendcmn.obj \\r
        $(OBJS)\monolib_rgncmn.obj \\r
+       $(OBJS)\monolib_scrolbarcmn.obj \\r
        $(OBJS)\monolib_settcmn.obj \\r
        $(OBJS)\monolib_sizer.obj \\r
+       $(OBJS)\monolib_slidercmn.obj \\r
+       $(OBJS)\monolib_spinbtncmn.obj \\r
        $(OBJS)\monolib_spinctrlcmn.obj \\r
        $(OBJS)\monolib_srchcmn.obj \\r
        $(OBJS)\monolib_statbar.obj \\r
+       $(OBJS)\monolib_statbmpcmn.obj \\r
+       $(OBJS)\monolib_statboxcmn.obj \\r
+       $(OBJS)\monolib_statlinecmn.obj \\r
        $(OBJS)\monolib_stattextcmn.obj \\r
        $(OBJS)\monolib_stockitem.obj \\r
        $(OBJS)\monolib_tbarbase.obj \\r
@@ -2763,9 +2808,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_artstd.obj \\r
        $(OBJS)\monolib_arttango.obj \\r
        $(OBJS)\monolib_bmpbase.obj \\r
+       $(OBJS)\monolib_bmpbtncmn.obj \\r
        $(OBJS)\monolib_bookctrl.obj \\r
        $(OBJS)\monolib_btncmn.obj \\r
        $(OBJS)\monolib_cairo.obj \\r
+       $(OBJS)\monolib_calctrlcmn.obj \\r
+       $(OBJS)\monolib_checkboxcmn.obj \\r
+       $(OBJS)\monolib_checklstcmn.obj \\r
        $(OBJS)\monolib_choiccmn.obj \\r
        $(OBJS)\monolib_clipcmn.obj \\r
        $(OBJS)\monolib_clrpickercmn.obj \\r
@@ -2782,6 +2831,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_dcbufcmn.obj \\r
        $(OBJS)\monolib_dcgraph.obj \\r
        $(OBJS)\monolib_dcsvg.obj \\r
+       $(OBJS)\monolib_dirctrlcmn.obj \\r
        $(OBJS)\monolib_dlgcmn.obj \\r
        $(OBJS)\monolib_dndcmn.obj \\r
        $(OBJS)\monolib_dobjcmn.obj \\r
@@ -2808,6 +2858,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_geometry.obj \\r
        $(OBJS)\monolib_gifdecod.obj \\r
        $(OBJS)\monolib_graphcmn.obj \\r
+       $(OBJS)\monolib_gridcmn.obj \\r
        $(OBJS)\monolib_headercolcmn.obj \\r
        $(OBJS)\monolib_headerctrlcmn.obj \\r
        $(OBJS)\monolib_helpbase.obj \\r
@@ -2832,23 +2883,32 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_menucmn.obj \\r
        $(OBJS)\monolib_mousemanager.obj \\r
        $(OBJS)\monolib_nbkbase.obj \\r
+       $(OBJS)\monolib_odcombocmn.obj \\r
        $(OBJS)\monolib_overlaycmn.obj \\r
        $(OBJS)\monolib_ownerdrwcmn.obj \\r
        $(OBJS)\monolib_paper.obj \\r
+       $(OBJS)\monolib_panelcmn.obj \\r
        $(OBJS)\monolib_persist.obj \\r
        $(OBJS)\monolib_pickerbase.obj \\r
        $(OBJS)\monolib_popupcmn.obj \\r
        $(OBJS)\monolib_prntbase.obj \\r
        $(OBJS)\monolib_quantize.obj \\r
+       $(OBJS)\monolib_radiobtncmn.obj \\r
        $(OBJS)\monolib_radiocmn.obj \\r
        $(OBJS)\monolib_rearrangectrl.obj \\r
        $(OBJS)\monolib_rendcmn.obj \\r
        $(OBJS)\monolib_rgncmn.obj \\r
+       $(OBJS)\monolib_scrolbarcmn.obj \\r
        $(OBJS)\monolib_settcmn.obj \\r
        $(OBJS)\monolib_sizer.obj \\r
+       $(OBJS)\monolib_slidercmn.obj \\r
+       $(OBJS)\monolib_spinbtncmn.obj \\r
        $(OBJS)\monolib_spinctrlcmn.obj \\r
        $(OBJS)\monolib_srchcmn.obj \\r
        $(OBJS)\monolib_statbar.obj \\r
+       $(OBJS)\monolib_statbmpcmn.obj \\r
+       $(OBJS)\monolib_statboxcmn.obj \\r
+       $(OBJS)\monolib_statlinecmn.obj \\r
        $(OBJS)\monolib_stattextcmn.obj \\r
        $(OBJS)\monolib_stockitem.obj \\r
        $(OBJS)\monolib_tbarbase.obj \\r
@@ -3127,9 +3187,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_artstd.obj \\r
        $(OBJS)\coredll_arttango.obj \\r
        $(OBJS)\coredll_bmpbase.obj \\r
+       $(OBJS)\coredll_bmpbtncmn.obj \\r
        $(OBJS)\coredll_bookctrl.obj \\r
        $(OBJS)\coredll_btncmn.obj \\r
        $(OBJS)\coredll_cairo.obj \\r
+       $(OBJS)\coredll_calctrlcmn.obj \\r
+       $(OBJS)\coredll_checkboxcmn.obj \\r
+       $(OBJS)\coredll_checklstcmn.obj \\r
        $(OBJS)\coredll_choiccmn.obj \\r
        $(OBJS)\coredll_clipcmn.obj \\r
        $(OBJS)\coredll_clrpickercmn.obj \\r
@@ -3146,6 +3210,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_dcbufcmn.obj \\r
        $(OBJS)\coredll_dcgraph.obj \\r
        $(OBJS)\coredll_dcsvg.obj \\r
+       $(OBJS)\coredll_dirctrlcmn.obj \\r
        $(OBJS)\coredll_dlgcmn.obj \\r
        $(OBJS)\coredll_dndcmn.obj \\r
        $(OBJS)\coredll_dobjcmn.obj \\r
@@ -3172,6 +3237,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_geometry.obj \\r
        $(OBJS)\coredll_gifdecod.obj \\r
        $(OBJS)\coredll_graphcmn.obj \\r
+       $(OBJS)\coredll_gridcmn.obj \\r
        $(OBJS)\coredll_headercolcmn.obj \\r
        $(OBJS)\coredll_headerctrlcmn.obj \\r
        $(OBJS)\coredll_helpbase.obj \\r
@@ -3196,23 +3262,32 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_menucmn.obj \\r
        $(OBJS)\coredll_mousemanager.obj \\r
        $(OBJS)\coredll_nbkbase.obj \\r
+       $(OBJS)\coredll_odcombocmn.obj \\r
        $(OBJS)\coredll_overlaycmn.obj \\r
        $(OBJS)\coredll_ownerdrwcmn.obj \\r
        $(OBJS)\coredll_paper.obj \\r
+       $(OBJS)\coredll_panelcmn.obj \\r
        $(OBJS)\coredll_persist.obj \\r
        $(OBJS)\coredll_pickerbase.obj \\r
        $(OBJS)\coredll_popupcmn.obj \\r
        $(OBJS)\coredll_prntbase.obj \\r
        $(OBJS)\coredll_quantize.obj \\r
+       $(OBJS)\coredll_radiobtncmn.obj \\r
        $(OBJS)\coredll_radiocmn.obj \\r
        $(OBJS)\coredll_rearrangectrl.obj \\r
        $(OBJS)\coredll_rendcmn.obj \\r
        $(OBJS)\coredll_rgncmn.obj \\r
+       $(OBJS)\coredll_scrolbarcmn.obj \\r
        $(OBJS)\coredll_settcmn.obj \\r
        $(OBJS)\coredll_sizer.obj \\r
+       $(OBJS)\coredll_slidercmn.obj \\r
+       $(OBJS)\coredll_spinbtncmn.obj \\r
        $(OBJS)\coredll_spinctrlcmn.obj \\r
        $(OBJS)\coredll_srchcmn.obj \\r
        $(OBJS)\coredll_statbar.obj \\r
+       $(OBJS)\coredll_statbmpcmn.obj \\r
+       $(OBJS)\coredll_statboxcmn.obj \\r
+       $(OBJS)\coredll_statlinecmn.obj \\r
        $(OBJS)\coredll_stattextcmn.obj \\r
        $(OBJS)\coredll_stockitem.obj \\r
        $(OBJS)\coredll_tbarbase.obj \\r
@@ -3375,9 +3450,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_artstd.obj \\r
        $(OBJS)\coredll_arttango.obj \\r
        $(OBJS)\coredll_bmpbase.obj \\r
+       $(OBJS)\coredll_bmpbtncmn.obj \\r
        $(OBJS)\coredll_bookctrl.obj \\r
        $(OBJS)\coredll_btncmn.obj \\r
        $(OBJS)\coredll_cairo.obj \\r
+       $(OBJS)\coredll_calctrlcmn.obj \\r
+       $(OBJS)\coredll_checkboxcmn.obj \\r
+       $(OBJS)\coredll_checklstcmn.obj \\r
        $(OBJS)\coredll_choiccmn.obj \\r
        $(OBJS)\coredll_clipcmn.obj \\r
        $(OBJS)\coredll_clrpickercmn.obj \\r
@@ -3394,6 +3473,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_dcbufcmn.obj \\r
        $(OBJS)\coredll_dcgraph.obj \\r
        $(OBJS)\coredll_dcsvg.obj \\r
+       $(OBJS)\coredll_dirctrlcmn.obj \\r
        $(OBJS)\coredll_dlgcmn.obj \\r
        $(OBJS)\coredll_dndcmn.obj \\r
        $(OBJS)\coredll_dobjcmn.obj \\r
@@ -3420,6 +3500,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_geometry.obj \\r
        $(OBJS)\coredll_gifdecod.obj \\r
        $(OBJS)\coredll_graphcmn.obj \\r
+       $(OBJS)\coredll_gridcmn.obj \\r
        $(OBJS)\coredll_headercolcmn.obj \\r
        $(OBJS)\coredll_headerctrlcmn.obj \\r
        $(OBJS)\coredll_helpbase.obj \\r
@@ -3444,23 +3525,32 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_menucmn.obj \\r
        $(OBJS)\coredll_mousemanager.obj \\r
        $(OBJS)\coredll_nbkbase.obj \\r
+       $(OBJS)\coredll_odcombocmn.obj \\r
        $(OBJS)\coredll_overlaycmn.obj \\r
        $(OBJS)\coredll_ownerdrwcmn.obj \\r
        $(OBJS)\coredll_paper.obj \\r
+       $(OBJS)\coredll_panelcmn.obj \\r
        $(OBJS)\coredll_persist.obj \\r
        $(OBJS)\coredll_pickerbase.obj \\r
        $(OBJS)\coredll_popupcmn.obj \\r
        $(OBJS)\coredll_prntbase.obj \\r
        $(OBJS)\coredll_quantize.obj \\r
+       $(OBJS)\coredll_radiobtncmn.obj \\r
        $(OBJS)\coredll_radiocmn.obj \\r
        $(OBJS)\coredll_rearrangectrl.obj \\r
        $(OBJS)\coredll_rendcmn.obj \\r
        $(OBJS)\coredll_rgncmn.obj \\r
+       $(OBJS)\coredll_scrolbarcmn.obj \\r
        $(OBJS)\coredll_settcmn.obj \\r
        $(OBJS)\coredll_sizer.obj \\r
+       $(OBJS)\coredll_slidercmn.obj \\r
+       $(OBJS)\coredll_spinbtncmn.obj \\r
        $(OBJS)\coredll_spinctrlcmn.obj \\r
        $(OBJS)\coredll_srchcmn.obj \\r
        $(OBJS)\coredll_statbar.obj \\r
+       $(OBJS)\coredll_statbmpcmn.obj \\r
+       $(OBJS)\coredll_statboxcmn.obj \\r
+       $(OBJS)\coredll_statlinecmn.obj \\r
        $(OBJS)\coredll_stattextcmn.obj \\r
        $(OBJS)\coredll_stockitem.obj \\r
        $(OBJS)\coredll_tbarbase.obj \\r
@@ -3632,9 +3722,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_artstd.obj \\r
        $(OBJS)\corelib_arttango.obj \\r
        $(OBJS)\corelib_bmpbase.obj \\r
+       $(OBJS)\corelib_bmpbtncmn.obj \\r
        $(OBJS)\corelib_bookctrl.obj \\r
        $(OBJS)\corelib_btncmn.obj \\r
        $(OBJS)\corelib_cairo.obj \\r
+       $(OBJS)\corelib_calctrlcmn.obj \\r
+       $(OBJS)\corelib_checkboxcmn.obj \\r
+       $(OBJS)\corelib_checklstcmn.obj \\r
        $(OBJS)\corelib_choiccmn.obj \\r
        $(OBJS)\corelib_clipcmn.obj \\r
        $(OBJS)\corelib_clrpickercmn.obj \\r
@@ -3651,6 +3745,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_dcbufcmn.obj \\r
        $(OBJS)\corelib_dcgraph.obj \\r
        $(OBJS)\corelib_dcsvg.obj \\r
+       $(OBJS)\corelib_dirctrlcmn.obj \\r
        $(OBJS)\corelib_dlgcmn.obj \\r
        $(OBJS)\corelib_dndcmn.obj \\r
        $(OBJS)\corelib_dobjcmn.obj \\r
@@ -3677,6 +3772,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_geometry.obj \\r
        $(OBJS)\corelib_gifdecod.obj \\r
        $(OBJS)\corelib_graphcmn.obj \\r
+       $(OBJS)\corelib_gridcmn.obj \\r
        $(OBJS)\corelib_headercolcmn.obj \\r
        $(OBJS)\corelib_headerctrlcmn.obj \\r
        $(OBJS)\corelib_helpbase.obj \\r
@@ -3701,23 +3797,32 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_menucmn.obj \\r
        $(OBJS)\corelib_mousemanager.obj \\r
        $(OBJS)\corelib_nbkbase.obj \\r
+       $(OBJS)\corelib_odcombocmn.obj \\r
        $(OBJS)\corelib_overlaycmn.obj \\r
        $(OBJS)\corelib_ownerdrwcmn.obj \\r
        $(OBJS)\corelib_paper.obj \\r
+       $(OBJS)\corelib_panelcmn.obj \\r
        $(OBJS)\corelib_persist.obj \\r
        $(OBJS)\corelib_pickerbase.obj \\r
        $(OBJS)\corelib_popupcmn.obj \\r
        $(OBJS)\corelib_prntbase.obj \\r
        $(OBJS)\corelib_quantize.obj \\r
+       $(OBJS)\corelib_radiobtncmn.obj \\r
        $(OBJS)\corelib_radiocmn.obj \\r
        $(OBJS)\corelib_rearrangectrl.obj \\r
        $(OBJS)\corelib_rendcmn.obj \\r
        $(OBJS)\corelib_rgncmn.obj \\r
+       $(OBJS)\corelib_scrolbarcmn.obj \\r
        $(OBJS)\corelib_settcmn.obj \\r
        $(OBJS)\corelib_sizer.obj \\r
+       $(OBJS)\corelib_slidercmn.obj \\r
+       $(OBJS)\corelib_spinbtncmn.obj \\r
        $(OBJS)\corelib_spinctrlcmn.obj \\r
        $(OBJS)\corelib_srchcmn.obj \\r
        $(OBJS)\corelib_statbar.obj \\r
+       $(OBJS)\corelib_statbmpcmn.obj \\r
+       $(OBJS)\corelib_statboxcmn.obj \\r
+       $(OBJS)\corelib_statlinecmn.obj \\r
        $(OBJS)\corelib_stattextcmn.obj \\r
        $(OBJS)\corelib_stockitem.obj \\r
        $(OBJS)\corelib_tbarbase.obj \\r
@@ -3880,9 +3985,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_artstd.obj \\r
        $(OBJS)\corelib_arttango.obj \\r
        $(OBJS)\corelib_bmpbase.obj \\r
+       $(OBJS)\corelib_bmpbtncmn.obj \\r
        $(OBJS)\corelib_bookctrl.obj \\r
        $(OBJS)\corelib_btncmn.obj \\r
        $(OBJS)\corelib_cairo.obj \\r
+       $(OBJS)\corelib_calctrlcmn.obj \\r
+       $(OBJS)\corelib_checkboxcmn.obj \\r
+       $(OBJS)\corelib_checklstcmn.obj \\r
        $(OBJS)\corelib_choiccmn.obj \\r
        $(OBJS)\corelib_clipcmn.obj \\r
        $(OBJS)\corelib_clrpickercmn.obj \\r
@@ -3899,6 +4008,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_dcbufcmn.obj \\r
        $(OBJS)\corelib_dcgraph.obj \\r
        $(OBJS)\corelib_dcsvg.obj \\r
+       $(OBJS)\corelib_dirctrlcmn.obj \\r
        $(OBJS)\corelib_dlgcmn.obj \\r
        $(OBJS)\corelib_dndcmn.obj \\r
        $(OBJS)\corelib_dobjcmn.obj \\r
@@ -3925,6 +4035,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_geometry.obj \\r
        $(OBJS)\corelib_gifdecod.obj \\r
        $(OBJS)\corelib_graphcmn.obj \\r
+       $(OBJS)\corelib_gridcmn.obj \\r
        $(OBJS)\corelib_headercolcmn.obj \\r
        $(OBJS)\corelib_headerctrlcmn.obj \\r
        $(OBJS)\corelib_helpbase.obj \\r
@@ -3949,23 +4060,32 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_menucmn.obj \\r
        $(OBJS)\corelib_mousemanager.obj \\r
        $(OBJS)\corelib_nbkbase.obj \\r
+       $(OBJS)\corelib_odcombocmn.obj \\r
        $(OBJS)\corelib_overlaycmn.obj \\r
        $(OBJS)\corelib_ownerdrwcmn.obj \\r
        $(OBJS)\corelib_paper.obj \\r
+       $(OBJS)\corelib_panelcmn.obj \\r
        $(OBJS)\corelib_persist.obj \\r
        $(OBJS)\corelib_pickerbase.obj \\r
        $(OBJS)\corelib_popupcmn.obj \\r
        $(OBJS)\corelib_prntbase.obj \\r
        $(OBJS)\corelib_quantize.obj \\r
+       $(OBJS)\corelib_radiobtncmn.obj \\r
        $(OBJS)\corelib_radiocmn.obj \\r
        $(OBJS)\corelib_rearrangectrl.obj \\r
        $(OBJS)\corelib_rendcmn.obj \\r
        $(OBJS)\corelib_rgncmn.obj \\r
+       $(OBJS)\corelib_scrolbarcmn.obj \\r
        $(OBJS)\corelib_settcmn.obj \\r
        $(OBJS)\corelib_sizer.obj \\r
+       $(OBJS)\corelib_slidercmn.obj \\r
+       $(OBJS)\corelib_spinbtncmn.obj \\r
        $(OBJS)\corelib_spinctrlcmn.obj \\r
        $(OBJS)\corelib_srchcmn.obj \\r
        $(OBJS)\corelib_statbar.obj \\r
+       $(OBJS)\corelib_statbmpcmn.obj \\r
+       $(OBJS)\corelib_statboxcmn.obj \\r
+       $(OBJS)\corelib_statlinecmn.obj \\r
        $(OBJS)\corelib_stattextcmn.obj \\r
        $(OBJS)\corelib_stockitem.obj \\r
        $(OBJS)\corelib_tbarbase.obj \\r
@@ -7138,6 +7258,11 @@ $(OBJS)\monodll_bmpbase.obj: ..\..\src\common\bmpbase.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\bmpbase.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_bmpbtncmn.obj: ..\..\src\common\bmpbtncmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\bmpbtncmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_bookctrl.obj: ..\..\src\common\bookctrl.cpp\r
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\bookctrl.cpp\r
@@ -7153,6 +7278,26 @@ $(OBJS)\monodll_cairo.obj: ..\..\src\common\cairo.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\cairo.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_checkboxcmn.obj: ..\..\src\common\checkboxcmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\checkboxcmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_checklstcmn.obj: ..\..\src\common\checklstcmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\checklstcmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_choiccmn.obj: ..\..\src\common\choiccmn.cpp\r
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\choiccmn.cpp\r
@@ -7233,6 +7378,11 @@ $(OBJS)\monodll_dcsvg.obj: ..\..\src\common\dcsvg.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dcsvg.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_dirctrlcmn.obj: ..\..\src\common\dirctrlcmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dirctrlcmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp\r
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dlgcmn.cpp\r
@@ -7363,6 +7513,11 @@ $(OBJS)\monodll_graphcmn.obj: ..\..\src\common\graphcmn.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\graphcmn.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_gridcmn.obj: ..\..\src\common\gridcmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\gridcmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_headercolcmn.obj: ..\..\src\common\headercolcmn.cpp\r
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\headercolcmn.cpp\r
@@ -7483,6 +7638,11 @@ $(OBJS)\monodll_nbkbase.obj: ..\..\src\common\nbkbase.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\nbkbase.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\odcombocmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp\r
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\overlaycmn.cpp\r
@@ -7498,6 +7658,11 @@ $(OBJS)\monodll_paper.obj: ..\..\src\common\paper.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\paper.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_panelcmn.obj: ..\..\src\common\panelcmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\panelcmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_persist.obj: ..\..\src\common\persist.cpp\r
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\persist.cpp\r
@@ -7523,6 +7688,11 @@ $(OBJS)\monodll_quantize.obj: ..\..\src\common\quantize.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\quantize.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_radiobtncmn.obj: ..\..\src\common\radiobtncmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\radiobtncmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_radiocmn.obj: ..\..\src\common\radiocmn.cpp\r
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\radiocmn.cpp\r
@@ -7543,6 +7713,11 @@ $(OBJS)\monodll_rgncmn.obj: ..\..\src\common\rgncmn.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\rgncmn.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_scrolbarcmn.obj: ..\..\src\common\scrolbarcmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\scrolbarcmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_settcmn.obj: ..\..\src\common\settcmn.cpp\r
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\settcmn.cpp\r
@@ -7553,6 +7728,16 @@ $(OBJS)\monodll_sizer.obj: ..\..\src\common\sizer.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\sizer.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_slidercmn.obj: ..\..\src\common\slidercmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\slidercmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_spinbtncmn.obj: ..\..\src\common\spinbtncmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\spinbtncmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_spinctrlcmn.obj: ..\..\src\common\spinctrlcmn.cpp\r
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\spinctrlcmn.cpp\r
@@ -7568,6 +7753,21 @@ $(OBJS)\monodll_statbar.obj: ..\..\src\common\statbar.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\statbar.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_statbmpcmn.obj: ..\..\src\common\statbmpcmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\statbmpcmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_statboxcmn.obj: ..\..\src\common\statboxcmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\statboxcmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_statlinecmn.obj: ..\..\src\common\statlinecmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\statlinecmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_stattextcmn.obj: ..\..\src\common\stattextcmn.cpp\r
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\stattextcmn.cpp\r
@@ -7823,11 +8023,6 @@ $(OBJS)\monodll_bmpcboxcmn.obj: ..\..\src\common\bmpcboxcmn.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\bmpcboxcmn.cpp\r
 !endif\r
 \r
-!if "$(USE_GUI)" == "1"\r
-$(OBJS)\monodll_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp\r
-       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp\r
-!endif\r
-\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_datavcmn.obj: ..\..\src\common\datavcmn.cpp\r
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\datavcmn.cpp\r
@@ -9385,6 +9580,11 @@ $(OBJS)\monolib_bmpbase.obj: ..\..\src\common\bmpbase.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\bmpbase.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_bmpbtncmn.obj: ..\..\src\common\bmpbtncmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\bmpbtncmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_bookctrl.obj: ..\..\src\common\bookctrl.cpp\r
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\bookctrl.cpp\r
@@ -9400,6 +9600,26 @@ $(OBJS)\monolib_cairo.obj: ..\..\src\common\cairo.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\cairo.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_checkboxcmn.obj: ..\..\src\common\checkboxcmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\checkboxcmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_checklstcmn.obj: ..\..\src\common\checklstcmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\checklstcmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_choiccmn.obj: ..\..\src\common\choiccmn.cpp\r
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\choiccmn.cpp\r
@@ -9480,6 +9700,11 @@ $(OBJS)\monolib_dcsvg.obj: ..\..\src\common\dcsvg.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dcsvg.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_dirctrlcmn.obj: ..\..\src\common\dirctrlcmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dirctrlcmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp\r
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dlgcmn.cpp\r
@@ -9610,6 +9835,11 @@ $(OBJS)\monolib_graphcmn.obj: ..\..\src\common\graphcmn.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\graphcmn.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_gridcmn.obj: ..\..\src\common\gridcmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\gridcmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_headercolcmn.obj: ..\..\src\common\headercolcmn.cpp\r
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\headercolcmn.cpp\r
@@ -9730,6 +9960,11 @@ $(OBJS)\monolib_nbkbase.obj: ..\..\src\common\nbkbase.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\nbkbase.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\odcombocmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp\r
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\overlaycmn.cpp\r
@@ -9745,6 +9980,11 @@ $(OBJS)\monolib_paper.obj: ..\..\src\common\paper.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\paper.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_panelcmn.obj: ..\..\src\common\panelcmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\panelcmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_persist.obj: ..\..\src\common\persist.cpp\r
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\persist.cpp\r
@@ -9770,6 +10010,11 @@ $(OBJS)\monolib_quantize.obj: ..\..\src\common\quantize.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\quantize.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_radiobtncmn.obj: ..\..\src\common\radiobtncmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\radiobtncmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_radiocmn.obj: ..\..\src\common\radiocmn.cpp\r
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\radiocmn.cpp\r
@@ -9790,6 +10035,11 @@ $(OBJS)\monolib_rgncmn.obj: ..\..\src\common\rgncmn.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\rgncmn.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_scrolbarcmn.obj: ..\..\src\common\scrolbarcmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\scrolbarcmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_settcmn.obj: ..\..\src\common\settcmn.cpp\r
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\settcmn.cpp\r
@@ -9800,6 +10050,16 @@ $(OBJS)\monolib_sizer.obj: ..\..\src\common\sizer.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\sizer.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_slidercmn.obj: ..\..\src\common\slidercmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\slidercmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_spinbtncmn.obj: ..\..\src\common\spinbtncmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\spinbtncmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_spinctrlcmn.obj: ..\..\src\common\spinctrlcmn.cpp\r
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\spinctrlcmn.cpp\r
@@ -9815,6 +10075,21 @@ $(OBJS)\monolib_statbar.obj: ..\..\src\common\statbar.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\statbar.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_statbmpcmn.obj: ..\..\src\common\statbmpcmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\statbmpcmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_statboxcmn.obj: ..\..\src\common\statboxcmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\statboxcmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_statlinecmn.obj: ..\..\src\common\statlinecmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\statlinecmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_stattextcmn.obj: ..\..\src\common\stattextcmn.cpp\r
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\stattextcmn.cpp\r
@@ -10070,11 +10345,6 @@ $(OBJS)\monolib_bmpcboxcmn.obj: ..\..\src\common\bmpcboxcmn.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\bmpcboxcmn.cpp\r
 !endif\r
 \r
-!if "$(USE_GUI)" == "1"\r
-$(OBJS)\monolib_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp\r
-       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp\r
-!endif\r
-\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_datavcmn.obj: ..\..\src\common\datavcmn.cpp\r
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\datavcmn.cpp\r
@@ -11623,6 +11893,11 @@ $(OBJS)\coredll_bmpbase.obj: ..\..\src\common\bmpbase.cpp
        $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\bmpbase.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_bmpbtncmn.obj: ..\..\src\common\bmpbtncmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\bmpbtncmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_bookctrl.obj: ..\..\src\common\bookctrl.cpp\r
        $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\bookctrl.cpp\r
@@ -11638,6 +11913,21 @@ $(OBJS)\coredll_cairo.obj: ..\..\src\common\cairo.cpp
        $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\cairo.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_checkboxcmn.obj: ..\..\src\common\checkboxcmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\checkboxcmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_checklstcmn.obj: ..\..\src\common\checklstcmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\checklstcmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_choiccmn.obj: ..\..\src\common\choiccmn.cpp\r
        $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\choiccmn.cpp\r
@@ -11718,6 +12008,11 @@ $(OBJS)\coredll_dcsvg.obj: ..\..\src\common\dcsvg.cpp
        $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\dcsvg.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_dirctrlcmn.obj: ..\..\src\common\dirctrlcmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\dirctrlcmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp\r
        $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\dlgcmn.cpp\r
@@ -11848,6 +12143,11 @@ $(OBJS)\coredll_graphcmn.obj: ..\..\src\common\graphcmn.cpp
        $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\graphcmn.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_gridcmn.obj: ..\..\src\common\gridcmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\gridcmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_headercolcmn.obj: ..\..\src\common\headercolcmn.cpp\r
        $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\headercolcmn.cpp\r
@@ -11968,6 +12268,11 @@ $(OBJS)\coredll_nbkbase.obj: ..\..\src\common\nbkbase.cpp
        $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\nbkbase.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\odcombocmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp\r
        $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\overlaycmn.cpp\r
@@ -11983,6 +12288,11 @@ $(OBJS)\coredll_paper.obj: ..\..\src\common\paper.cpp
        $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\paper.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_panelcmn.obj: ..\..\src\common\panelcmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\panelcmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_persist.obj: ..\..\src\common\persist.cpp\r
        $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\persist.cpp\r
@@ -12008,6 +12318,11 @@ $(OBJS)\coredll_quantize.obj: ..\..\src\common\quantize.cpp
        $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\quantize.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_radiobtncmn.obj: ..\..\src\common\radiobtncmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\radiobtncmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_radiocmn.obj: ..\..\src\common\radiocmn.cpp\r
        $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\radiocmn.cpp\r
@@ -12028,6 +12343,11 @@ $(OBJS)\coredll_rgncmn.obj: ..\..\src\common\rgncmn.cpp
        $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\rgncmn.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_scrolbarcmn.obj: ..\..\src\common\scrolbarcmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\scrolbarcmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_settcmn.obj: ..\..\src\common\settcmn.cpp\r
        $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\settcmn.cpp\r
@@ -12038,6 +12358,16 @@ $(OBJS)\coredll_sizer.obj: ..\..\src\common\sizer.cpp
        $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\sizer.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_slidercmn.obj: ..\..\src\common\slidercmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\slidercmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_spinbtncmn.obj: ..\..\src\common\spinbtncmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\spinbtncmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_spinctrlcmn.obj: ..\..\src\common\spinctrlcmn.cpp\r
        $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\spinctrlcmn.cpp\r
@@ -12053,6 +12383,21 @@ $(OBJS)\coredll_statbar.obj: ..\..\src\common\statbar.cpp
        $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\statbar.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_statbmpcmn.obj: ..\..\src\common\statbmpcmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\statbmpcmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_statboxcmn.obj: ..\..\src\common\statboxcmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\statboxcmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_statlinecmn.obj: ..\..\src\common\statlinecmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\statlinecmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_stattextcmn.obj: ..\..\src\common\stattextcmn.cpp\r
        $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\stattextcmn.cpp\r
@@ -12938,6 +13283,11 @@ $(OBJS)\corelib_bmpbase.obj: ..\..\src\common\bmpbase.cpp
        $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\bmpbase.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_bmpbtncmn.obj: ..\..\src\common\bmpbtncmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\bmpbtncmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_bookctrl.obj: ..\..\src\common\bookctrl.cpp\r
        $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\bookctrl.cpp\r
@@ -12953,6 +13303,21 @@ $(OBJS)\corelib_cairo.obj: ..\..\src\common\cairo.cpp
        $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\cairo.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_checkboxcmn.obj: ..\..\src\common\checkboxcmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\checkboxcmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_checklstcmn.obj: ..\..\src\common\checklstcmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\checklstcmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_choiccmn.obj: ..\..\src\common\choiccmn.cpp\r
        $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\choiccmn.cpp\r
@@ -13033,6 +13398,11 @@ $(OBJS)\corelib_dcsvg.obj: ..\..\src\common\dcsvg.cpp
        $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\dcsvg.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_dirctrlcmn.obj: ..\..\src\common\dirctrlcmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\dirctrlcmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp\r
        $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\dlgcmn.cpp\r
@@ -13163,6 +13533,11 @@ $(OBJS)\corelib_graphcmn.obj: ..\..\src\common\graphcmn.cpp
        $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\graphcmn.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_gridcmn.obj: ..\..\src\common\gridcmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\gridcmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_headercolcmn.obj: ..\..\src\common\headercolcmn.cpp\r
        $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\headercolcmn.cpp\r
@@ -13283,6 +13658,11 @@ $(OBJS)\corelib_nbkbase.obj: ..\..\src\common\nbkbase.cpp
        $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\nbkbase.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\odcombocmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp\r
        $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\overlaycmn.cpp\r
@@ -13298,6 +13678,11 @@ $(OBJS)\corelib_paper.obj: ..\..\src\common\paper.cpp
        $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\paper.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_panelcmn.obj: ..\..\src\common\panelcmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\panelcmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_persist.obj: ..\..\src\common\persist.cpp\r
        $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\persist.cpp\r
@@ -13323,6 +13708,11 @@ $(OBJS)\corelib_quantize.obj: ..\..\src\common\quantize.cpp
        $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\quantize.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_radiobtncmn.obj: ..\..\src\common\radiobtncmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\radiobtncmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_radiocmn.obj: ..\..\src\common\radiocmn.cpp\r
        $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\radiocmn.cpp\r
@@ -13343,6 +13733,11 @@ $(OBJS)\corelib_rgncmn.obj: ..\..\src\common\rgncmn.cpp
        $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\rgncmn.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_scrolbarcmn.obj: ..\..\src\common\scrolbarcmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\scrolbarcmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_settcmn.obj: ..\..\src\common\settcmn.cpp\r
        $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\settcmn.cpp\r
@@ -13353,6 +13748,16 @@ $(OBJS)\corelib_sizer.obj: ..\..\src\common\sizer.cpp
        $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\sizer.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_slidercmn.obj: ..\..\src\common\slidercmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\slidercmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_spinbtncmn.obj: ..\..\src\common\spinbtncmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\spinbtncmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_spinctrlcmn.obj: ..\..\src\common\spinctrlcmn.cpp\r
        $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\spinctrlcmn.cpp\r
@@ -13368,6 +13773,21 @@ $(OBJS)\corelib_statbar.obj: ..\..\src\common\statbar.cpp
        $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\statbar.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_statbmpcmn.obj: ..\..\src\common\statbmpcmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\statbmpcmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_statboxcmn.obj: ..\..\src\common\statboxcmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\statboxcmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_statlinecmn.obj: ..\..\src\common\statlinecmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\statlinecmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_stattextcmn.obj: ..\..\src\common\stattextcmn.cpp\r
        $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\stattextcmn.cpp\r
index 7716e034a1d2c1d6e0559c2a464c1eb288fd2ab4..7df486ff820dcef3eed9e9d1c42273ca9478a918 100644 (file)
@@ -1802,9 +1802,13 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_artstd.o \\r
        $(OBJS)\monodll_arttango.o \\r
        $(OBJS)\monodll_bmpbase.o \\r
+       $(OBJS)\monodll_bmpbtncmn.o \\r
        $(OBJS)\monodll_bookctrl.o \\r
        $(OBJS)\monodll_btncmn.o \\r
        $(OBJS)\monodll_cairo.o \\r
+       $(OBJS)\monodll_calctrlcmn.o \\r
+       $(OBJS)\monodll_checkboxcmn.o \\r
+       $(OBJS)\monodll_checklstcmn.o \\r
        $(OBJS)\monodll_choiccmn.o \\r
        $(OBJS)\monodll_clipcmn.o \\r
        $(OBJS)\monodll_clrpickercmn.o \\r
@@ -1821,6 +1825,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_dcbufcmn.o \\r
        $(OBJS)\monodll_dcgraph.o \\r
        $(OBJS)\monodll_dcsvg.o \\r
+       $(OBJS)\monodll_dirctrlcmn.o \\r
        $(OBJS)\monodll_dlgcmn.o \\r
        $(OBJS)\monodll_dndcmn.o \\r
        $(OBJS)\monodll_dobjcmn.o \\r
@@ -1847,6 +1852,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_geometry.o \\r
        $(OBJS)\monodll_gifdecod.o \\r
        $(OBJS)\monodll_graphcmn.o \\r
+       $(OBJS)\monodll_gridcmn.o \\r
        $(OBJS)\monodll_headercolcmn.o \\r
        $(OBJS)\monodll_headerctrlcmn.o \\r
        $(OBJS)\monodll_helpbase.o \\r
@@ -1871,23 +1877,32 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_menucmn.o \\r
        $(OBJS)\monodll_mousemanager.o \\r
        $(OBJS)\monodll_nbkbase.o \\r
+       $(OBJS)\monodll_odcombocmn.o \\r
        $(OBJS)\monodll_overlaycmn.o \\r
        $(OBJS)\monodll_ownerdrwcmn.o \\r
        $(OBJS)\monodll_paper.o \\r
+       $(OBJS)\monodll_panelcmn.o \\r
        $(OBJS)\monodll_persist.o \\r
        $(OBJS)\monodll_pickerbase.o \\r
        $(OBJS)\monodll_popupcmn.o \\r
        $(OBJS)\monodll_prntbase.o \\r
        $(OBJS)\monodll_quantize.o \\r
+       $(OBJS)\monodll_radiobtncmn.o \\r
        $(OBJS)\monodll_radiocmn.o \\r
        $(OBJS)\monodll_rearrangectrl.o \\r
        $(OBJS)\monodll_rendcmn.o \\r
        $(OBJS)\monodll_rgncmn.o \\r
+       $(OBJS)\monodll_scrolbarcmn.o \\r
        $(OBJS)\monodll_settcmn.o \\r
        $(OBJS)\monodll_sizer.o \\r
+       $(OBJS)\monodll_slidercmn.o \\r
+       $(OBJS)\monodll_spinbtncmn.o \\r
        $(OBJS)\monodll_spinctrlcmn.o \\r
        $(OBJS)\monodll_srchcmn.o \\r
        $(OBJS)\monodll_statbar.o \\r
+       $(OBJS)\monodll_statbmpcmn.o \\r
+       $(OBJS)\monodll_statboxcmn.o \\r
+       $(OBJS)\monodll_statlinecmn.o \\r
        $(OBJS)\monodll_stattextcmn.o \\r
        $(OBJS)\monodll_stockitem.o \\r
        $(OBJS)\monodll_tbarbase.o \\r
@@ -2052,9 +2067,13 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_artstd.o \\r
        $(OBJS)\monodll_arttango.o \\r
        $(OBJS)\monodll_bmpbase.o \\r
+       $(OBJS)\monodll_bmpbtncmn.o \\r
        $(OBJS)\monodll_bookctrl.o \\r
        $(OBJS)\monodll_btncmn.o \\r
        $(OBJS)\monodll_cairo.o \\r
+       $(OBJS)\monodll_calctrlcmn.o \\r
+       $(OBJS)\monodll_checkboxcmn.o \\r
+       $(OBJS)\monodll_checklstcmn.o \\r
        $(OBJS)\monodll_choiccmn.o \\r
        $(OBJS)\monodll_clipcmn.o \\r
        $(OBJS)\monodll_clrpickercmn.o \\r
@@ -2071,6 +2090,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_dcbufcmn.o \\r
        $(OBJS)\monodll_dcgraph.o \\r
        $(OBJS)\monodll_dcsvg.o \\r
+       $(OBJS)\monodll_dirctrlcmn.o \\r
        $(OBJS)\monodll_dlgcmn.o \\r
        $(OBJS)\monodll_dndcmn.o \\r
        $(OBJS)\monodll_dobjcmn.o \\r
@@ -2097,6 +2117,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_geometry.o \\r
        $(OBJS)\monodll_gifdecod.o \\r
        $(OBJS)\monodll_graphcmn.o \\r
+       $(OBJS)\monodll_gridcmn.o \\r
        $(OBJS)\monodll_headercolcmn.o \\r
        $(OBJS)\monodll_headerctrlcmn.o \\r
        $(OBJS)\monodll_helpbase.o \\r
@@ -2121,23 +2142,32 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_menucmn.o \\r
        $(OBJS)\monodll_mousemanager.o \\r
        $(OBJS)\monodll_nbkbase.o \\r
+       $(OBJS)\monodll_odcombocmn.o \\r
        $(OBJS)\monodll_overlaycmn.o \\r
        $(OBJS)\monodll_ownerdrwcmn.o \\r
        $(OBJS)\monodll_paper.o \\r
+       $(OBJS)\monodll_panelcmn.o \\r
        $(OBJS)\monodll_persist.o \\r
        $(OBJS)\monodll_pickerbase.o \\r
        $(OBJS)\monodll_popupcmn.o \\r
        $(OBJS)\monodll_prntbase.o \\r
        $(OBJS)\monodll_quantize.o \\r
+       $(OBJS)\monodll_radiobtncmn.o \\r
        $(OBJS)\monodll_radiocmn.o \\r
        $(OBJS)\monodll_rearrangectrl.o \\r
        $(OBJS)\monodll_rendcmn.o \\r
        $(OBJS)\monodll_rgncmn.o \\r
+       $(OBJS)\monodll_scrolbarcmn.o \\r
        $(OBJS)\monodll_settcmn.o \\r
        $(OBJS)\monodll_sizer.o \\r
+       $(OBJS)\monodll_slidercmn.o \\r
+       $(OBJS)\monodll_spinbtncmn.o \\r
        $(OBJS)\monodll_spinctrlcmn.o \\r
        $(OBJS)\monodll_srchcmn.o \\r
        $(OBJS)\monodll_statbar.o \\r
+       $(OBJS)\monodll_statbmpcmn.o \\r
+       $(OBJS)\monodll_statboxcmn.o \\r
+       $(OBJS)\monodll_statlinecmn.o \\r
        $(OBJS)\monodll_stattextcmn.o \\r
        $(OBJS)\monodll_stockitem.o \\r
        $(OBJS)\monodll_tbarbase.o \\r
@@ -2532,9 +2562,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_artstd.o \\r
        $(OBJS)\monolib_arttango.o \\r
        $(OBJS)\monolib_bmpbase.o \\r
+       $(OBJS)\monolib_bmpbtncmn.o \\r
        $(OBJS)\monolib_bookctrl.o \\r
        $(OBJS)\monolib_btncmn.o \\r
        $(OBJS)\monolib_cairo.o \\r
+       $(OBJS)\monolib_calctrlcmn.o \\r
+       $(OBJS)\monolib_checkboxcmn.o \\r
+       $(OBJS)\monolib_checklstcmn.o \\r
        $(OBJS)\monolib_choiccmn.o \\r
        $(OBJS)\monolib_clipcmn.o \\r
        $(OBJS)\monolib_clrpickercmn.o \\r
@@ -2551,6 +2585,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_dcbufcmn.o \\r
        $(OBJS)\monolib_dcgraph.o \\r
        $(OBJS)\monolib_dcsvg.o \\r
+       $(OBJS)\monolib_dirctrlcmn.o \\r
        $(OBJS)\monolib_dlgcmn.o \\r
        $(OBJS)\monolib_dndcmn.o \\r
        $(OBJS)\monolib_dobjcmn.o \\r
@@ -2577,6 +2612,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_geometry.o \\r
        $(OBJS)\monolib_gifdecod.o \\r
        $(OBJS)\monolib_graphcmn.o \\r
+       $(OBJS)\monolib_gridcmn.o \\r
        $(OBJS)\monolib_headercolcmn.o \\r
        $(OBJS)\monolib_headerctrlcmn.o \\r
        $(OBJS)\monolib_helpbase.o \\r
@@ -2601,23 +2637,32 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_menucmn.o \\r
        $(OBJS)\monolib_mousemanager.o \\r
        $(OBJS)\monolib_nbkbase.o \\r
+       $(OBJS)\monolib_odcombocmn.o \\r
        $(OBJS)\monolib_overlaycmn.o \\r
        $(OBJS)\monolib_ownerdrwcmn.o \\r
        $(OBJS)\monolib_paper.o \\r
+       $(OBJS)\monolib_panelcmn.o \\r
        $(OBJS)\monolib_persist.o \\r
        $(OBJS)\monolib_pickerbase.o \\r
        $(OBJS)\monolib_popupcmn.o \\r
        $(OBJS)\monolib_prntbase.o \\r
        $(OBJS)\monolib_quantize.o \\r
+       $(OBJS)\monolib_radiobtncmn.o \\r
        $(OBJS)\monolib_radiocmn.o \\r
        $(OBJS)\monolib_rearrangectrl.o \\r
        $(OBJS)\monolib_rendcmn.o \\r
        $(OBJS)\monolib_rgncmn.o \\r
+       $(OBJS)\monolib_scrolbarcmn.o \\r
        $(OBJS)\monolib_settcmn.o \\r
        $(OBJS)\monolib_sizer.o \\r
+       $(OBJS)\monolib_slidercmn.o \\r
+       $(OBJS)\monolib_spinbtncmn.o \\r
        $(OBJS)\monolib_spinctrlcmn.o \\r
        $(OBJS)\monolib_srchcmn.o \\r
        $(OBJS)\monolib_statbar.o \\r
+       $(OBJS)\monolib_statbmpcmn.o \\r
+       $(OBJS)\monolib_statboxcmn.o \\r
+       $(OBJS)\monolib_statlinecmn.o \\r
        $(OBJS)\monolib_stattextcmn.o \\r
        $(OBJS)\monolib_stockitem.o \\r
        $(OBJS)\monolib_tbarbase.o \\r
@@ -2782,9 +2827,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_artstd.o \\r
        $(OBJS)\monolib_arttango.o \\r
        $(OBJS)\monolib_bmpbase.o \\r
+       $(OBJS)\monolib_bmpbtncmn.o \\r
        $(OBJS)\monolib_bookctrl.o \\r
        $(OBJS)\monolib_btncmn.o \\r
        $(OBJS)\monolib_cairo.o \\r
+       $(OBJS)\monolib_calctrlcmn.o \\r
+       $(OBJS)\monolib_checkboxcmn.o \\r
+       $(OBJS)\monolib_checklstcmn.o \\r
        $(OBJS)\monolib_choiccmn.o \\r
        $(OBJS)\monolib_clipcmn.o \\r
        $(OBJS)\monolib_clrpickercmn.o \\r
@@ -2801,6 +2850,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_dcbufcmn.o \\r
        $(OBJS)\monolib_dcgraph.o \\r
        $(OBJS)\monolib_dcsvg.o \\r
+       $(OBJS)\monolib_dirctrlcmn.o \\r
        $(OBJS)\monolib_dlgcmn.o \\r
        $(OBJS)\monolib_dndcmn.o \\r
        $(OBJS)\monolib_dobjcmn.o \\r
@@ -2827,6 +2877,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_geometry.o \\r
        $(OBJS)\monolib_gifdecod.o \\r
        $(OBJS)\monolib_graphcmn.o \\r
+       $(OBJS)\monolib_gridcmn.o \\r
        $(OBJS)\monolib_headercolcmn.o \\r
        $(OBJS)\monolib_headerctrlcmn.o \\r
        $(OBJS)\monolib_helpbase.o \\r
@@ -2851,23 +2902,32 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_menucmn.o \\r
        $(OBJS)\monolib_mousemanager.o \\r
        $(OBJS)\monolib_nbkbase.o \\r
+       $(OBJS)\monolib_odcombocmn.o \\r
        $(OBJS)\monolib_overlaycmn.o \\r
        $(OBJS)\monolib_ownerdrwcmn.o \\r
        $(OBJS)\monolib_paper.o \\r
+       $(OBJS)\monolib_panelcmn.o \\r
        $(OBJS)\monolib_persist.o \\r
        $(OBJS)\monolib_pickerbase.o \\r
        $(OBJS)\monolib_popupcmn.o \\r
        $(OBJS)\monolib_prntbase.o \\r
        $(OBJS)\monolib_quantize.o \\r
+       $(OBJS)\monolib_radiobtncmn.o \\r
        $(OBJS)\monolib_radiocmn.o \\r
        $(OBJS)\monolib_rearrangectrl.o \\r
        $(OBJS)\monolib_rendcmn.o \\r
        $(OBJS)\monolib_rgncmn.o \\r
+       $(OBJS)\monolib_scrolbarcmn.o \\r
        $(OBJS)\monolib_settcmn.o \\r
        $(OBJS)\monolib_sizer.o \\r
+       $(OBJS)\monolib_slidercmn.o \\r
+       $(OBJS)\monolib_spinbtncmn.o \\r
        $(OBJS)\monolib_spinctrlcmn.o \\r
        $(OBJS)\monolib_srchcmn.o \\r
        $(OBJS)\monolib_statbar.o \\r
+       $(OBJS)\monolib_statbmpcmn.o \\r
+       $(OBJS)\monolib_statboxcmn.o \\r
+       $(OBJS)\monolib_statlinecmn.o \\r
        $(OBJS)\monolib_stattextcmn.o \\r
        $(OBJS)\monolib_stockitem.o \\r
        $(OBJS)\monolib_tbarbase.o \\r
@@ -3160,9 +3220,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_artstd.o \\r
        $(OBJS)\coredll_arttango.o \\r
        $(OBJS)\coredll_bmpbase.o \\r
+       $(OBJS)\coredll_bmpbtncmn.o \\r
        $(OBJS)\coredll_bookctrl.o \\r
        $(OBJS)\coredll_btncmn.o \\r
        $(OBJS)\coredll_cairo.o \\r
+       $(OBJS)\coredll_calctrlcmn.o \\r
+       $(OBJS)\coredll_checkboxcmn.o \\r
+       $(OBJS)\coredll_checklstcmn.o \\r
        $(OBJS)\coredll_choiccmn.o \\r
        $(OBJS)\coredll_clipcmn.o \\r
        $(OBJS)\coredll_clrpickercmn.o \\r
@@ -3179,6 +3243,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_dcbufcmn.o \\r
        $(OBJS)\coredll_dcgraph.o \\r
        $(OBJS)\coredll_dcsvg.o \\r
+       $(OBJS)\coredll_dirctrlcmn.o \\r
        $(OBJS)\coredll_dlgcmn.o \\r
        $(OBJS)\coredll_dndcmn.o \\r
        $(OBJS)\coredll_dobjcmn.o \\r
@@ -3205,6 +3270,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_geometry.o \\r
        $(OBJS)\coredll_gifdecod.o \\r
        $(OBJS)\coredll_graphcmn.o \\r
+       $(OBJS)\coredll_gridcmn.o \\r
        $(OBJS)\coredll_headercolcmn.o \\r
        $(OBJS)\coredll_headerctrlcmn.o \\r
        $(OBJS)\coredll_helpbase.o \\r
@@ -3229,23 +3295,32 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_menucmn.o \\r
        $(OBJS)\coredll_mousemanager.o \\r
        $(OBJS)\coredll_nbkbase.o \\r
+       $(OBJS)\coredll_odcombocmn.o \\r
        $(OBJS)\coredll_overlaycmn.o \\r
        $(OBJS)\coredll_ownerdrwcmn.o \\r
        $(OBJS)\coredll_paper.o \\r
+       $(OBJS)\coredll_panelcmn.o \\r
        $(OBJS)\coredll_persist.o \\r
        $(OBJS)\coredll_pickerbase.o \\r
        $(OBJS)\coredll_popupcmn.o \\r
        $(OBJS)\coredll_prntbase.o \\r
        $(OBJS)\coredll_quantize.o \\r
+       $(OBJS)\coredll_radiobtncmn.o \\r
        $(OBJS)\coredll_radiocmn.o \\r
        $(OBJS)\coredll_rearrangectrl.o \\r
        $(OBJS)\coredll_rendcmn.o \\r
        $(OBJS)\coredll_rgncmn.o \\r
+       $(OBJS)\coredll_scrolbarcmn.o \\r
        $(OBJS)\coredll_settcmn.o \\r
        $(OBJS)\coredll_sizer.o \\r
+       $(OBJS)\coredll_slidercmn.o \\r
+       $(OBJS)\coredll_spinbtncmn.o \\r
        $(OBJS)\coredll_spinctrlcmn.o \\r
        $(OBJS)\coredll_srchcmn.o \\r
        $(OBJS)\coredll_statbar.o \\r
+       $(OBJS)\coredll_statbmpcmn.o \\r
+       $(OBJS)\coredll_statboxcmn.o \\r
+       $(OBJS)\coredll_statlinecmn.o \\r
        $(OBJS)\coredll_stattextcmn.o \\r
        $(OBJS)\coredll_stockitem.o \\r
        $(OBJS)\coredll_tbarbase.o \\r
@@ -3410,9 +3485,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_artstd.o \\r
        $(OBJS)\coredll_arttango.o \\r
        $(OBJS)\coredll_bmpbase.o \\r
+       $(OBJS)\coredll_bmpbtncmn.o \\r
        $(OBJS)\coredll_bookctrl.o \\r
        $(OBJS)\coredll_btncmn.o \\r
        $(OBJS)\coredll_cairo.o \\r
+       $(OBJS)\coredll_calctrlcmn.o \\r
+       $(OBJS)\coredll_checkboxcmn.o \\r
+       $(OBJS)\coredll_checklstcmn.o \\r
        $(OBJS)\coredll_choiccmn.o \\r
        $(OBJS)\coredll_clipcmn.o \\r
        $(OBJS)\coredll_clrpickercmn.o \\r
@@ -3429,6 +3508,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_dcbufcmn.o \\r
        $(OBJS)\coredll_dcgraph.o \\r
        $(OBJS)\coredll_dcsvg.o \\r
+       $(OBJS)\coredll_dirctrlcmn.o \\r
        $(OBJS)\coredll_dlgcmn.o \\r
        $(OBJS)\coredll_dndcmn.o \\r
        $(OBJS)\coredll_dobjcmn.o \\r
@@ -3455,6 +3535,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_geometry.o \\r
        $(OBJS)\coredll_gifdecod.o \\r
        $(OBJS)\coredll_graphcmn.o \\r
+       $(OBJS)\coredll_gridcmn.o \\r
        $(OBJS)\coredll_headercolcmn.o \\r
        $(OBJS)\coredll_headerctrlcmn.o \\r
        $(OBJS)\coredll_helpbase.o \\r
@@ -3479,23 +3560,32 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_menucmn.o \\r
        $(OBJS)\coredll_mousemanager.o \\r
        $(OBJS)\coredll_nbkbase.o \\r
+       $(OBJS)\coredll_odcombocmn.o \\r
        $(OBJS)\coredll_overlaycmn.o \\r
        $(OBJS)\coredll_ownerdrwcmn.o \\r
        $(OBJS)\coredll_paper.o \\r
+       $(OBJS)\coredll_panelcmn.o \\r
        $(OBJS)\coredll_persist.o \\r
        $(OBJS)\coredll_pickerbase.o \\r
        $(OBJS)\coredll_popupcmn.o \\r
        $(OBJS)\coredll_prntbase.o \\r
        $(OBJS)\coredll_quantize.o \\r
+       $(OBJS)\coredll_radiobtncmn.o \\r
        $(OBJS)\coredll_radiocmn.o \\r
        $(OBJS)\coredll_rearrangectrl.o \\r
        $(OBJS)\coredll_rendcmn.o \\r
        $(OBJS)\coredll_rgncmn.o \\r
+       $(OBJS)\coredll_scrolbarcmn.o \\r
        $(OBJS)\coredll_settcmn.o \\r
        $(OBJS)\coredll_sizer.o \\r
+       $(OBJS)\coredll_slidercmn.o \\r
+       $(OBJS)\coredll_spinbtncmn.o \\r
        $(OBJS)\coredll_spinctrlcmn.o \\r
        $(OBJS)\coredll_srchcmn.o \\r
        $(OBJS)\coredll_statbar.o \\r
+       $(OBJS)\coredll_statbmpcmn.o \\r
+       $(OBJS)\coredll_statboxcmn.o \\r
+       $(OBJS)\coredll_statlinecmn.o \\r
        $(OBJS)\coredll_stattextcmn.o \\r
        $(OBJS)\coredll_stockitem.o \\r
        $(OBJS)\coredll_tbarbase.o \\r
@@ -3673,9 +3763,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_artstd.o \\r
        $(OBJS)\corelib_arttango.o \\r
        $(OBJS)\corelib_bmpbase.o \\r
+       $(OBJS)\corelib_bmpbtncmn.o \\r
        $(OBJS)\corelib_bookctrl.o \\r
        $(OBJS)\corelib_btncmn.o \\r
        $(OBJS)\corelib_cairo.o \\r
+       $(OBJS)\corelib_calctrlcmn.o \\r
+       $(OBJS)\corelib_checkboxcmn.o \\r
+       $(OBJS)\corelib_checklstcmn.o \\r
        $(OBJS)\corelib_choiccmn.o \\r
        $(OBJS)\corelib_clipcmn.o \\r
        $(OBJS)\corelib_clrpickercmn.o \\r
@@ -3692,6 +3786,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_dcbufcmn.o \\r
        $(OBJS)\corelib_dcgraph.o \\r
        $(OBJS)\corelib_dcsvg.o \\r
+       $(OBJS)\corelib_dirctrlcmn.o \\r
        $(OBJS)\corelib_dlgcmn.o \\r
        $(OBJS)\corelib_dndcmn.o \\r
        $(OBJS)\corelib_dobjcmn.o \\r
@@ -3718,6 +3813,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_geometry.o \\r
        $(OBJS)\corelib_gifdecod.o \\r
        $(OBJS)\corelib_graphcmn.o \\r
+       $(OBJS)\corelib_gridcmn.o \\r
        $(OBJS)\corelib_headercolcmn.o \\r
        $(OBJS)\corelib_headerctrlcmn.o \\r
        $(OBJS)\corelib_helpbase.o \\r
@@ -3742,23 +3838,32 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_menucmn.o \\r
        $(OBJS)\corelib_mousemanager.o \\r
        $(OBJS)\corelib_nbkbase.o \\r
+       $(OBJS)\corelib_odcombocmn.o \\r
        $(OBJS)\corelib_overlaycmn.o \\r
        $(OBJS)\corelib_ownerdrwcmn.o \\r
        $(OBJS)\corelib_paper.o \\r
+       $(OBJS)\corelib_panelcmn.o \\r
        $(OBJS)\corelib_persist.o \\r
        $(OBJS)\corelib_pickerbase.o \\r
        $(OBJS)\corelib_popupcmn.o \\r
        $(OBJS)\corelib_prntbase.o \\r
        $(OBJS)\corelib_quantize.o \\r
+       $(OBJS)\corelib_radiobtncmn.o \\r
        $(OBJS)\corelib_radiocmn.o \\r
        $(OBJS)\corelib_rearrangectrl.o \\r
        $(OBJS)\corelib_rendcmn.o \\r
        $(OBJS)\corelib_rgncmn.o \\r
+       $(OBJS)\corelib_scrolbarcmn.o \\r
        $(OBJS)\corelib_settcmn.o \\r
        $(OBJS)\corelib_sizer.o \\r
+       $(OBJS)\corelib_slidercmn.o \\r
+       $(OBJS)\corelib_spinbtncmn.o \\r
        $(OBJS)\corelib_spinctrlcmn.o \\r
        $(OBJS)\corelib_srchcmn.o \\r
        $(OBJS)\corelib_statbar.o \\r
+       $(OBJS)\corelib_statbmpcmn.o \\r
+       $(OBJS)\corelib_statboxcmn.o \\r
+       $(OBJS)\corelib_statlinecmn.o \\r
        $(OBJS)\corelib_stattextcmn.o \\r
        $(OBJS)\corelib_stockitem.o \\r
        $(OBJS)\corelib_tbarbase.o \\r
@@ -3923,9 +4028,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_artstd.o \\r
        $(OBJS)\corelib_arttango.o \\r
        $(OBJS)\corelib_bmpbase.o \\r
+       $(OBJS)\corelib_bmpbtncmn.o \\r
        $(OBJS)\corelib_bookctrl.o \\r
        $(OBJS)\corelib_btncmn.o \\r
        $(OBJS)\corelib_cairo.o \\r
+       $(OBJS)\corelib_calctrlcmn.o \\r
+       $(OBJS)\corelib_checkboxcmn.o \\r
+       $(OBJS)\corelib_checklstcmn.o \\r
        $(OBJS)\corelib_choiccmn.o \\r
        $(OBJS)\corelib_clipcmn.o \\r
        $(OBJS)\corelib_clrpickercmn.o \\r
@@ -3942,6 +4051,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_dcbufcmn.o \\r
        $(OBJS)\corelib_dcgraph.o \\r
        $(OBJS)\corelib_dcsvg.o \\r
+       $(OBJS)\corelib_dirctrlcmn.o \\r
        $(OBJS)\corelib_dlgcmn.o \\r
        $(OBJS)\corelib_dndcmn.o \\r
        $(OBJS)\corelib_dobjcmn.o \\r
@@ -3968,6 +4078,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_geometry.o \\r
        $(OBJS)\corelib_gifdecod.o \\r
        $(OBJS)\corelib_graphcmn.o \\r
+       $(OBJS)\corelib_gridcmn.o \\r
        $(OBJS)\corelib_headercolcmn.o \\r
        $(OBJS)\corelib_headerctrlcmn.o \\r
        $(OBJS)\corelib_helpbase.o \\r
@@ -3992,23 +4103,32 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_menucmn.o \\r
        $(OBJS)\corelib_mousemanager.o \\r
        $(OBJS)\corelib_nbkbase.o \\r
+       $(OBJS)\corelib_odcombocmn.o \\r
        $(OBJS)\corelib_overlaycmn.o \\r
        $(OBJS)\corelib_ownerdrwcmn.o \\r
        $(OBJS)\corelib_paper.o \\r
+       $(OBJS)\corelib_panelcmn.o \\r
        $(OBJS)\corelib_persist.o \\r
        $(OBJS)\corelib_pickerbase.o \\r
        $(OBJS)\corelib_popupcmn.o \\r
        $(OBJS)\corelib_prntbase.o \\r
        $(OBJS)\corelib_quantize.o \\r
+       $(OBJS)\corelib_radiobtncmn.o \\r
        $(OBJS)\corelib_radiocmn.o \\r
        $(OBJS)\corelib_rearrangectrl.o \\r
        $(OBJS)\corelib_rendcmn.o \\r
        $(OBJS)\corelib_rgncmn.o \\r
+       $(OBJS)\corelib_scrolbarcmn.o \\r
        $(OBJS)\corelib_settcmn.o \\r
        $(OBJS)\corelib_sizer.o \\r
+       $(OBJS)\corelib_slidercmn.o \\r
+       $(OBJS)\corelib_spinbtncmn.o \\r
        $(OBJS)\corelib_spinctrlcmn.o \\r
        $(OBJS)\corelib_srchcmn.o \\r
        $(OBJS)\corelib_statbar.o \\r
+       $(OBJS)\corelib_statbmpcmn.o \\r
+       $(OBJS)\corelib_statboxcmn.o \\r
+       $(OBJS)\corelib_statlinecmn.o \\r
        $(OBJS)\corelib_stattextcmn.o \\r
        $(OBJS)\corelib_stockitem.o \\r
        $(OBJS)\corelib_tbarbase.o \\r
@@ -7288,6 +7408,11 @@ $(OBJS)\monodll_bmpbase.o: ../../src/common/bmpbase.cpp
        $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
 endif\r
 \r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\monodll_bmpbtncmn.o: ../../src/common/bmpbtncmn.cpp\r
+       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
 ifeq ($(USE_GUI),1)\r
 $(OBJS)\monodll_bookctrl.o: ../../src/common/bookctrl.cpp\r
        $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
@@ -7303,6 +7428,26 @@ $(OBJS)\monodll_cairo.o: ../../src/common/cairo.cpp
        $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
 endif\r
 \r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\monodll_calctrlcmn.o: ../../src/common/calctrlcmn.cpp\r
+       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\monodll_calctrlcmn.o: ../../src/common/calctrlcmn.cpp\r
+       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\monodll_checkboxcmn.o: ../../src/common/checkboxcmn.cpp\r
+       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\monodll_checklstcmn.o: ../../src/common/checklstcmn.cpp\r
+       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
 ifeq ($(USE_GUI),1)\r
 $(OBJS)\monodll_choiccmn.o: ../../src/common/choiccmn.cpp\r
        $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
@@ -7383,6 +7528,11 @@ $(OBJS)\monodll_dcsvg.o: ../../src/common/dcsvg.cpp
        $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
 endif\r
 \r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\monodll_dirctrlcmn.o: ../../src/common/dirctrlcmn.cpp\r
+       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
 ifeq ($(USE_GUI),1)\r
 $(OBJS)\monodll_dlgcmn.o: ../../src/common/dlgcmn.cpp\r
        $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
@@ -7513,6 +7663,11 @@ $(OBJS)\monodll_graphcmn.o: ../../src/common/graphcmn.cpp
        $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
 endif\r
 \r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\monodll_gridcmn.o: ../../src/common/gridcmn.cpp\r
+       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
 ifeq ($(USE_GUI),1)\r
 $(OBJS)\monodll_headercolcmn.o: ../../src/common/headercolcmn.cpp\r
        $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
@@ -7633,6 +7788,11 @@ $(OBJS)\monodll_nbkbase.o: ../../src/common/nbkbase.cpp
        $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
 endif\r
 \r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\monodll_odcombocmn.o: ../../src/common/odcombocmn.cpp\r
+       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
 ifeq ($(USE_GUI),1)\r
 $(OBJS)\monodll_overlaycmn.o: ../../src/common/overlaycmn.cpp\r
        $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
@@ -7648,6 +7808,11 @@ $(OBJS)\monodll_paper.o: ../../src/common/paper.cpp
        $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
 endif\r
 \r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\monodll_panelcmn.o: ../../src/common/panelcmn.cpp\r
+       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
 ifeq ($(USE_GUI),1)\r
 $(OBJS)\monodll_persist.o: ../../src/common/persist.cpp\r
        $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
@@ -7673,6 +7838,11 @@ $(OBJS)\monodll_quantize.o: ../../src/common/quantize.cpp
        $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
 endif\r
 \r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\monodll_radiobtncmn.o: ../../src/common/radiobtncmn.cpp\r
+       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
 ifeq ($(USE_GUI),1)\r
 $(OBJS)\monodll_radiocmn.o: ../../src/common/radiocmn.cpp\r
        $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
@@ -7693,6 +7863,11 @@ $(OBJS)\monodll_rgncmn.o: ../../src/common/rgncmn.cpp
        $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
 endif\r
 \r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\monodll_scrolbarcmn.o: ../../src/common/scrolbarcmn.cpp\r
+       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
 ifeq ($(USE_GUI),1)\r
 $(OBJS)\monodll_settcmn.o: ../../src/common/settcmn.cpp\r
        $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
@@ -7703,6 +7878,16 @@ $(OBJS)\monodll_sizer.o: ../../src/common/sizer.cpp
        $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
 endif\r
 \r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\monodll_slidercmn.o: ../../src/common/slidercmn.cpp\r
+       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\monodll_spinbtncmn.o: ../../src/common/spinbtncmn.cpp\r
+       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
 ifeq ($(USE_GUI),1)\r
 $(OBJS)\monodll_spinctrlcmn.o: ../../src/common/spinctrlcmn.cpp\r
        $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
@@ -7718,6 +7903,21 @@ $(OBJS)\monodll_statbar.o: ../../src/common/statbar.cpp
        $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
 endif\r
 \r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\monodll_statbmpcmn.o: ../../src/common/statbmpcmn.cpp\r
+       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\monodll_statboxcmn.o: ../../src/common/statboxcmn.cpp\r
+       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\monodll_statlinecmn.o: ../../src/common/statlinecmn.cpp\r
+       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
 ifeq ($(USE_GUI),1)\r
 $(OBJS)\monodll_stattextcmn.o: ../../src/common/stattextcmn.cpp\r
        $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
@@ -7973,11 +8173,6 @@ $(OBJS)\monodll_bmpcboxcmn.o: ../../src/common/bmpcboxcmn.cpp
        $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
 endif\r
 \r
-ifeq ($(USE_GUI),1)\r
-$(OBJS)\monodll_calctrlcmn.o: ../../src/common/calctrlcmn.cpp\r
-       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
-endif\r
-\r
 ifeq ($(USE_GUI),1)\r
 $(OBJS)\monodll_datavcmn.o: ../../src/common/datavcmn.cpp\r
        $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
@@ -9535,6 +9730,11 @@ $(OBJS)\monolib_bmpbase.o: ../../src/common/bmpbase.cpp
        $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
 endif\r
 \r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\monolib_bmpbtncmn.o: ../../src/common/bmpbtncmn.cpp\r
+       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
 ifeq ($(USE_GUI),1)\r
 $(OBJS)\monolib_bookctrl.o: ../../src/common/bookctrl.cpp\r
        $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
@@ -9550,6 +9750,26 @@ $(OBJS)\monolib_cairo.o: ../../src/common/cairo.cpp
        $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
 endif\r
 \r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\monolib_calctrlcmn.o: ../../src/common/calctrlcmn.cpp\r
+       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\monolib_calctrlcmn.o: ../../src/common/calctrlcmn.cpp\r
+       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\monolib_checkboxcmn.o: ../../src/common/checkboxcmn.cpp\r
+       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\monolib_checklstcmn.o: ../../src/common/checklstcmn.cpp\r
+       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
 ifeq ($(USE_GUI),1)\r
 $(OBJS)\monolib_choiccmn.o: ../../src/common/choiccmn.cpp\r
        $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
@@ -9630,6 +9850,11 @@ $(OBJS)\monolib_dcsvg.o: ../../src/common/dcsvg.cpp
        $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
 endif\r
 \r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\monolib_dirctrlcmn.o: ../../src/common/dirctrlcmn.cpp\r
+       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
 ifeq ($(USE_GUI),1)\r
 $(OBJS)\monolib_dlgcmn.o: ../../src/common/dlgcmn.cpp\r
        $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
@@ -9760,6 +9985,11 @@ $(OBJS)\monolib_graphcmn.o: ../../src/common/graphcmn.cpp
        $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
 endif\r
 \r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\monolib_gridcmn.o: ../../src/common/gridcmn.cpp\r
+       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
 ifeq ($(USE_GUI),1)\r
 $(OBJS)\monolib_headercolcmn.o: ../../src/common/headercolcmn.cpp\r
        $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
@@ -9880,6 +10110,11 @@ $(OBJS)\monolib_nbkbase.o: ../../src/common/nbkbase.cpp
        $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
 endif\r
 \r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\monolib_odcombocmn.o: ../../src/common/odcombocmn.cpp\r
+       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
 ifeq ($(USE_GUI),1)\r
 $(OBJS)\monolib_overlaycmn.o: ../../src/common/overlaycmn.cpp\r
        $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
@@ -9895,6 +10130,11 @@ $(OBJS)\monolib_paper.o: ../../src/common/paper.cpp
        $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
 endif\r
 \r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\monolib_panelcmn.o: ../../src/common/panelcmn.cpp\r
+       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
 ifeq ($(USE_GUI),1)\r
 $(OBJS)\monolib_persist.o: ../../src/common/persist.cpp\r
        $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
@@ -9920,6 +10160,11 @@ $(OBJS)\monolib_quantize.o: ../../src/common/quantize.cpp
        $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
 endif\r
 \r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\monolib_radiobtncmn.o: ../../src/common/radiobtncmn.cpp\r
+       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
 ifeq ($(USE_GUI),1)\r
 $(OBJS)\monolib_radiocmn.o: ../../src/common/radiocmn.cpp\r
        $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
@@ -9940,6 +10185,11 @@ $(OBJS)\monolib_rgncmn.o: ../../src/common/rgncmn.cpp
        $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
 endif\r
 \r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\monolib_scrolbarcmn.o: ../../src/common/scrolbarcmn.cpp\r
+       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
 ifeq ($(USE_GUI),1)\r
 $(OBJS)\monolib_settcmn.o: ../../src/common/settcmn.cpp\r
        $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
@@ -9950,6 +10200,16 @@ $(OBJS)\monolib_sizer.o: ../../src/common/sizer.cpp
        $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
 endif\r
 \r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\monolib_slidercmn.o: ../../src/common/slidercmn.cpp\r
+       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\monolib_spinbtncmn.o: ../../src/common/spinbtncmn.cpp\r
+       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
 ifeq ($(USE_GUI),1)\r
 $(OBJS)\monolib_spinctrlcmn.o: ../../src/common/spinctrlcmn.cpp\r
        $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
@@ -9965,6 +10225,21 @@ $(OBJS)\monolib_statbar.o: ../../src/common/statbar.cpp
        $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
 endif\r
 \r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\monolib_statbmpcmn.o: ../../src/common/statbmpcmn.cpp\r
+       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\monolib_statboxcmn.o: ../../src/common/statboxcmn.cpp\r
+       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\monolib_statlinecmn.o: ../../src/common/statlinecmn.cpp\r
+       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
 ifeq ($(USE_GUI),1)\r
 $(OBJS)\monolib_stattextcmn.o: ../../src/common/stattextcmn.cpp\r
        $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
@@ -10220,11 +10495,6 @@ $(OBJS)\monolib_bmpcboxcmn.o: ../../src/common/bmpcboxcmn.cpp
        $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
 endif\r
 \r
-ifeq ($(USE_GUI),1)\r
-$(OBJS)\monolib_calctrlcmn.o: ../../src/common/calctrlcmn.cpp\r
-       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
-endif\r
-\r
 ifeq ($(USE_GUI),1)\r
 $(OBJS)\monolib_datavcmn.o: ../../src/common/datavcmn.cpp\r
        $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
@@ -11773,6 +12043,11 @@ $(OBJS)\coredll_bmpbase.o: ../../src/common/bmpbase.cpp
        $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<\r
 endif\r
 \r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\coredll_bmpbtncmn.o: ../../src/common/bmpbtncmn.cpp\r
+       $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
 ifeq ($(USE_GUI),1)\r
 $(OBJS)\coredll_bookctrl.o: ../../src/common/bookctrl.cpp\r
        $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<\r
@@ -11788,6 +12063,21 @@ $(OBJS)\coredll_cairo.o: ../../src/common/cairo.cpp
        $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<\r
 endif\r
 \r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\coredll_calctrlcmn.o: ../../src/common/calctrlcmn.cpp\r
+       $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\coredll_checkboxcmn.o: ../../src/common/checkboxcmn.cpp\r
+       $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\coredll_checklstcmn.o: ../../src/common/checklstcmn.cpp\r
+       $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
 ifeq ($(USE_GUI),1)\r
 $(OBJS)\coredll_choiccmn.o: ../../src/common/choiccmn.cpp\r
        $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<\r
@@ -11868,6 +12158,11 @@ $(OBJS)\coredll_dcsvg.o: ../../src/common/dcsvg.cpp
        $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<\r
 endif\r
 \r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\coredll_dirctrlcmn.o: ../../src/common/dirctrlcmn.cpp\r
+       $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
 ifeq ($(USE_GUI),1)\r
 $(OBJS)\coredll_dlgcmn.o: ../../src/common/dlgcmn.cpp\r
        $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<\r
@@ -11998,6 +12293,11 @@ $(OBJS)\coredll_graphcmn.o: ../../src/common/graphcmn.cpp
        $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<\r
 endif\r
 \r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\coredll_gridcmn.o: ../../src/common/gridcmn.cpp\r
+       $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
 ifeq ($(USE_GUI),1)\r
 $(OBJS)\coredll_headercolcmn.o: ../../src/common/headercolcmn.cpp\r
        $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<\r
@@ -12118,6 +12418,11 @@ $(OBJS)\coredll_nbkbase.o: ../../src/common/nbkbase.cpp
        $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<\r
 endif\r
 \r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\coredll_odcombocmn.o: ../../src/common/odcombocmn.cpp\r
+       $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
 ifeq ($(USE_GUI),1)\r
 $(OBJS)\coredll_overlaycmn.o: ../../src/common/overlaycmn.cpp\r
        $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<\r
@@ -12133,6 +12438,11 @@ $(OBJS)\coredll_paper.o: ../../src/common/paper.cpp
        $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<\r
 endif\r
 \r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\coredll_panelcmn.o: ../../src/common/panelcmn.cpp\r
+       $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
 ifeq ($(USE_GUI),1)\r
 $(OBJS)\coredll_persist.o: ../../src/common/persist.cpp\r
        $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<\r
@@ -12158,6 +12468,11 @@ $(OBJS)\coredll_quantize.o: ../../src/common/quantize.cpp
        $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<\r
 endif\r
 \r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\coredll_radiobtncmn.o: ../../src/common/radiobtncmn.cpp\r
+       $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
 ifeq ($(USE_GUI),1)\r
 $(OBJS)\coredll_radiocmn.o: ../../src/common/radiocmn.cpp\r
        $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<\r
@@ -12178,6 +12493,11 @@ $(OBJS)\coredll_rgncmn.o: ../../src/common/rgncmn.cpp
        $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<\r
 endif\r
 \r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\coredll_scrolbarcmn.o: ../../src/common/scrolbarcmn.cpp\r
+       $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
 ifeq ($(USE_GUI),1)\r
 $(OBJS)\coredll_settcmn.o: ../../src/common/settcmn.cpp\r
        $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<\r
@@ -12188,6 +12508,16 @@ $(OBJS)\coredll_sizer.o: ../../src/common/sizer.cpp
        $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<\r
 endif\r
 \r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\coredll_slidercmn.o: ../../src/common/slidercmn.cpp\r
+       $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\coredll_spinbtncmn.o: ../../src/common/spinbtncmn.cpp\r
+       $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
 ifeq ($(USE_GUI),1)\r
 $(OBJS)\coredll_spinctrlcmn.o: ../../src/common/spinctrlcmn.cpp\r
        $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<\r
@@ -12203,6 +12533,21 @@ $(OBJS)\coredll_statbar.o: ../../src/common/statbar.cpp
        $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<\r
 endif\r
 \r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\coredll_statbmpcmn.o: ../../src/common/statbmpcmn.cpp\r
+       $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\coredll_statboxcmn.o: ../../src/common/statboxcmn.cpp\r
+       $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\coredll_statlinecmn.o: ../../src/common/statlinecmn.cpp\r
+       $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
 ifeq ($(USE_GUI),1)\r
 $(OBJS)\coredll_stattextcmn.o: ../../src/common/stattextcmn.cpp\r
        $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<\r
@@ -13088,6 +13433,11 @@ $(OBJS)\corelib_bmpbase.o: ../../src/common/bmpbase.cpp
        $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<\r
 endif\r
 \r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\corelib_bmpbtncmn.o: ../../src/common/bmpbtncmn.cpp\r
+       $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
 ifeq ($(USE_GUI),1)\r
 $(OBJS)\corelib_bookctrl.o: ../../src/common/bookctrl.cpp\r
        $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<\r
@@ -13103,6 +13453,21 @@ $(OBJS)\corelib_cairo.o: ../../src/common/cairo.cpp
        $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<\r
 endif\r
 \r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\corelib_calctrlcmn.o: ../../src/common/calctrlcmn.cpp\r
+       $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\corelib_checkboxcmn.o: ../../src/common/checkboxcmn.cpp\r
+       $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\corelib_checklstcmn.o: ../../src/common/checklstcmn.cpp\r
+       $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
 ifeq ($(USE_GUI),1)\r
 $(OBJS)\corelib_choiccmn.o: ../../src/common/choiccmn.cpp\r
        $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<\r
@@ -13183,6 +13548,11 @@ $(OBJS)\corelib_dcsvg.o: ../../src/common/dcsvg.cpp
        $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<\r
 endif\r
 \r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\corelib_dirctrlcmn.o: ../../src/common/dirctrlcmn.cpp\r
+       $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
 ifeq ($(USE_GUI),1)\r
 $(OBJS)\corelib_dlgcmn.o: ../../src/common/dlgcmn.cpp\r
        $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<\r
@@ -13313,6 +13683,11 @@ $(OBJS)\corelib_graphcmn.o: ../../src/common/graphcmn.cpp
        $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<\r
 endif\r
 \r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\corelib_gridcmn.o: ../../src/common/gridcmn.cpp\r
+       $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
 ifeq ($(USE_GUI),1)\r
 $(OBJS)\corelib_headercolcmn.o: ../../src/common/headercolcmn.cpp\r
        $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<\r
@@ -13433,6 +13808,11 @@ $(OBJS)\corelib_nbkbase.o: ../../src/common/nbkbase.cpp
        $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<\r
 endif\r
 \r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\corelib_odcombocmn.o: ../../src/common/odcombocmn.cpp\r
+       $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
 ifeq ($(USE_GUI),1)\r
 $(OBJS)\corelib_overlaycmn.o: ../../src/common/overlaycmn.cpp\r
        $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<\r
@@ -13448,6 +13828,11 @@ $(OBJS)\corelib_paper.o: ../../src/common/paper.cpp
        $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<\r
 endif\r
 \r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\corelib_panelcmn.o: ../../src/common/panelcmn.cpp\r
+       $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
 ifeq ($(USE_GUI),1)\r
 $(OBJS)\corelib_persist.o: ../../src/common/persist.cpp\r
        $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<\r
@@ -13473,6 +13858,11 @@ $(OBJS)\corelib_quantize.o: ../../src/common/quantize.cpp
        $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<\r
 endif\r
 \r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\corelib_radiobtncmn.o: ../../src/common/radiobtncmn.cpp\r
+       $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
 ifeq ($(USE_GUI),1)\r
 $(OBJS)\corelib_radiocmn.o: ../../src/common/radiocmn.cpp\r
        $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<\r
@@ -13493,6 +13883,11 @@ $(OBJS)\corelib_rgncmn.o: ../../src/common/rgncmn.cpp
        $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<\r
 endif\r
 \r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\corelib_scrolbarcmn.o: ../../src/common/scrolbarcmn.cpp\r
+       $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
 ifeq ($(USE_GUI),1)\r
 $(OBJS)\corelib_settcmn.o: ../../src/common/settcmn.cpp\r
        $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<\r
@@ -13503,6 +13898,16 @@ $(OBJS)\corelib_sizer.o: ../../src/common/sizer.cpp
        $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<\r
 endif\r
 \r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\corelib_slidercmn.o: ../../src/common/slidercmn.cpp\r
+       $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\corelib_spinbtncmn.o: ../../src/common/spinbtncmn.cpp\r
+       $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
 ifeq ($(USE_GUI),1)\r
 $(OBJS)\corelib_spinctrlcmn.o: ../../src/common/spinctrlcmn.cpp\r
        $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<\r
@@ -13518,6 +13923,21 @@ $(OBJS)\corelib_statbar.o: ../../src/common/statbar.cpp
        $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<\r
 endif\r
 \r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\corelib_statbmpcmn.o: ../../src/common/statbmpcmn.cpp\r
+       $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\corelib_statboxcmn.o: ../../src/common/statboxcmn.cpp\r
+       $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\corelib_statlinecmn.o: ../../src/common/statlinecmn.cpp\r
+       $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
 ifeq ($(USE_GUI),1)\r
 $(OBJS)\corelib_stattextcmn.o: ../../src/common/stattextcmn.cpp\r
        $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<\r
index b178e1f125ebf82f92593413113763017d4fd057..b0090620fc0bb93aec8e6ae8fb222aef5aacc265 100644 (file)
@@ -1999,9 +1999,13 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_artstd.obj \\r
        $(OBJS)\monodll_arttango.obj \\r
        $(OBJS)\monodll_bmpbase.obj \\r
+       $(OBJS)\monodll_bmpbtncmn.obj \\r
        $(OBJS)\monodll_bookctrl.obj \\r
        $(OBJS)\monodll_btncmn.obj \\r
        $(OBJS)\monodll_cairo.obj \\r
+       $(OBJS)\monodll_calctrlcmn.obj \\r
+       $(OBJS)\monodll_checkboxcmn.obj \\r
+       $(OBJS)\monodll_checklstcmn.obj \\r
        $(OBJS)\monodll_choiccmn.obj \\r
        $(OBJS)\monodll_clipcmn.obj \\r
        $(OBJS)\monodll_clrpickercmn.obj \\r
@@ -2018,6 +2022,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_dcbufcmn.obj \\r
        $(OBJS)\monodll_dcgraph.obj \\r
        $(OBJS)\monodll_dcsvg.obj \\r
+       $(OBJS)\monodll_dirctrlcmn.obj \\r
        $(OBJS)\monodll_dlgcmn.obj \\r
        $(OBJS)\monodll_dndcmn.obj \\r
        $(OBJS)\monodll_dobjcmn.obj \\r
@@ -2044,6 +2049,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_geometry.obj \\r
        $(OBJS)\monodll_gifdecod.obj \\r
        $(OBJS)\monodll_graphcmn.obj \\r
+       $(OBJS)\monodll_gridcmn.obj \\r
        $(OBJS)\monodll_headercolcmn.obj \\r
        $(OBJS)\monodll_headerctrlcmn.obj \\r
        $(OBJS)\monodll_helpbase.obj \\r
@@ -2068,23 +2074,32 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_menucmn.obj \\r
        $(OBJS)\monodll_mousemanager.obj \\r
        $(OBJS)\monodll_nbkbase.obj \\r
+       $(OBJS)\monodll_odcombocmn.obj \\r
        $(OBJS)\monodll_overlaycmn.obj \\r
        $(OBJS)\monodll_ownerdrwcmn.obj \\r
        $(OBJS)\monodll_paper.obj \\r
+       $(OBJS)\monodll_panelcmn.obj \\r
        $(OBJS)\monodll_persist.obj \\r
        $(OBJS)\monodll_pickerbase.obj \\r
        $(OBJS)\monodll_popupcmn.obj \\r
        $(OBJS)\monodll_prntbase.obj \\r
        $(OBJS)\monodll_quantize.obj \\r
+       $(OBJS)\monodll_radiobtncmn.obj \\r
        $(OBJS)\monodll_radiocmn.obj \\r
        $(OBJS)\monodll_rearrangectrl.obj \\r
        $(OBJS)\monodll_rendcmn.obj \\r
        $(OBJS)\monodll_rgncmn.obj \\r
+       $(OBJS)\monodll_scrolbarcmn.obj \\r
        $(OBJS)\monodll_settcmn.obj \\r
        $(OBJS)\monodll_sizer.obj \\r
+       $(OBJS)\monodll_slidercmn.obj \\r
+       $(OBJS)\monodll_spinbtncmn.obj \\r
        $(OBJS)\monodll_spinctrlcmn.obj \\r
        $(OBJS)\monodll_srchcmn.obj \\r
        $(OBJS)\monodll_statbar.obj \\r
+       $(OBJS)\monodll_statbmpcmn.obj \\r
+       $(OBJS)\monodll_statboxcmn.obj \\r
+       $(OBJS)\monodll_statlinecmn.obj \\r
        $(OBJS)\monodll_stattextcmn.obj \\r
        $(OBJS)\monodll_stockitem.obj \\r
        $(OBJS)\monodll_tbarbase.obj \\r
@@ -2247,9 +2262,13 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_artstd.obj \\r
        $(OBJS)\monodll_arttango.obj \\r
        $(OBJS)\monodll_bmpbase.obj \\r
+       $(OBJS)\monodll_bmpbtncmn.obj \\r
        $(OBJS)\monodll_bookctrl.obj \\r
        $(OBJS)\monodll_btncmn.obj \\r
        $(OBJS)\monodll_cairo.obj \\r
+       $(OBJS)\monodll_calctrlcmn.obj \\r
+       $(OBJS)\monodll_checkboxcmn.obj \\r
+       $(OBJS)\monodll_checklstcmn.obj \\r
        $(OBJS)\monodll_choiccmn.obj \\r
        $(OBJS)\monodll_clipcmn.obj \\r
        $(OBJS)\monodll_clrpickercmn.obj \\r
@@ -2266,6 +2285,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_dcbufcmn.obj \\r
        $(OBJS)\monodll_dcgraph.obj \\r
        $(OBJS)\monodll_dcsvg.obj \\r
+       $(OBJS)\monodll_dirctrlcmn.obj \\r
        $(OBJS)\monodll_dlgcmn.obj \\r
        $(OBJS)\monodll_dndcmn.obj \\r
        $(OBJS)\monodll_dobjcmn.obj \\r
@@ -2292,6 +2312,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_geometry.obj \\r
        $(OBJS)\monodll_gifdecod.obj \\r
        $(OBJS)\monodll_graphcmn.obj \\r
+       $(OBJS)\monodll_gridcmn.obj \\r
        $(OBJS)\monodll_headercolcmn.obj \\r
        $(OBJS)\monodll_headerctrlcmn.obj \\r
        $(OBJS)\monodll_helpbase.obj \\r
@@ -2316,23 +2337,32 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_menucmn.obj \\r
        $(OBJS)\monodll_mousemanager.obj \\r
        $(OBJS)\monodll_nbkbase.obj \\r
+       $(OBJS)\monodll_odcombocmn.obj \\r
        $(OBJS)\monodll_overlaycmn.obj \\r
        $(OBJS)\monodll_ownerdrwcmn.obj \\r
        $(OBJS)\monodll_paper.obj \\r
+       $(OBJS)\monodll_panelcmn.obj \\r
        $(OBJS)\monodll_persist.obj \\r
        $(OBJS)\monodll_pickerbase.obj \\r
        $(OBJS)\monodll_popupcmn.obj \\r
        $(OBJS)\monodll_prntbase.obj \\r
        $(OBJS)\monodll_quantize.obj \\r
+       $(OBJS)\monodll_radiobtncmn.obj \\r
        $(OBJS)\monodll_radiocmn.obj \\r
        $(OBJS)\monodll_rearrangectrl.obj \\r
        $(OBJS)\monodll_rendcmn.obj \\r
        $(OBJS)\monodll_rgncmn.obj \\r
+       $(OBJS)\monodll_scrolbarcmn.obj \\r
        $(OBJS)\monodll_settcmn.obj \\r
        $(OBJS)\monodll_sizer.obj \\r
+       $(OBJS)\monodll_slidercmn.obj \\r
+       $(OBJS)\monodll_spinbtncmn.obj \\r
        $(OBJS)\monodll_spinctrlcmn.obj \\r
        $(OBJS)\monodll_srchcmn.obj \\r
        $(OBJS)\monodll_statbar.obj \\r
+       $(OBJS)\monodll_statbmpcmn.obj \\r
+       $(OBJS)\monodll_statboxcmn.obj \\r
+       $(OBJS)\monodll_statlinecmn.obj \\r
        $(OBJS)\monodll_stattextcmn.obj \\r
        $(OBJS)\monodll_stockitem.obj \\r
        $(OBJS)\monodll_tbarbase.obj \\r
@@ -2729,9 +2759,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_artstd.obj \\r
        $(OBJS)\monolib_arttango.obj \\r
        $(OBJS)\monolib_bmpbase.obj \\r
+       $(OBJS)\monolib_bmpbtncmn.obj \\r
        $(OBJS)\monolib_bookctrl.obj \\r
        $(OBJS)\monolib_btncmn.obj \\r
        $(OBJS)\monolib_cairo.obj \\r
+       $(OBJS)\monolib_calctrlcmn.obj \\r
+       $(OBJS)\monolib_checkboxcmn.obj \\r
+       $(OBJS)\monolib_checklstcmn.obj \\r
        $(OBJS)\monolib_choiccmn.obj \\r
        $(OBJS)\monolib_clipcmn.obj \\r
        $(OBJS)\monolib_clrpickercmn.obj \\r
@@ -2748,6 +2782,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_dcbufcmn.obj \\r
        $(OBJS)\monolib_dcgraph.obj \\r
        $(OBJS)\monolib_dcsvg.obj \\r
+       $(OBJS)\monolib_dirctrlcmn.obj \\r
        $(OBJS)\monolib_dlgcmn.obj \\r
        $(OBJS)\monolib_dndcmn.obj \\r
        $(OBJS)\monolib_dobjcmn.obj \\r
@@ -2774,6 +2809,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_geometry.obj \\r
        $(OBJS)\monolib_gifdecod.obj \\r
        $(OBJS)\monolib_graphcmn.obj \\r
+       $(OBJS)\monolib_gridcmn.obj \\r
        $(OBJS)\monolib_headercolcmn.obj \\r
        $(OBJS)\monolib_headerctrlcmn.obj \\r
        $(OBJS)\monolib_helpbase.obj \\r
@@ -2798,23 +2834,32 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_menucmn.obj \\r
        $(OBJS)\monolib_mousemanager.obj \\r
        $(OBJS)\monolib_nbkbase.obj \\r
+       $(OBJS)\monolib_odcombocmn.obj \\r
        $(OBJS)\monolib_overlaycmn.obj \\r
        $(OBJS)\monolib_ownerdrwcmn.obj \\r
        $(OBJS)\monolib_paper.obj \\r
+       $(OBJS)\monolib_panelcmn.obj \\r
        $(OBJS)\monolib_persist.obj \\r
        $(OBJS)\monolib_pickerbase.obj \\r
        $(OBJS)\monolib_popupcmn.obj \\r
        $(OBJS)\monolib_prntbase.obj \\r
        $(OBJS)\monolib_quantize.obj \\r
+       $(OBJS)\monolib_radiobtncmn.obj \\r
        $(OBJS)\monolib_radiocmn.obj \\r
        $(OBJS)\monolib_rearrangectrl.obj \\r
        $(OBJS)\monolib_rendcmn.obj \\r
        $(OBJS)\monolib_rgncmn.obj \\r
+       $(OBJS)\monolib_scrolbarcmn.obj \\r
        $(OBJS)\monolib_settcmn.obj \\r
        $(OBJS)\monolib_sizer.obj \\r
+       $(OBJS)\monolib_slidercmn.obj \\r
+       $(OBJS)\monolib_spinbtncmn.obj \\r
        $(OBJS)\monolib_spinctrlcmn.obj \\r
        $(OBJS)\monolib_srchcmn.obj \\r
        $(OBJS)\monolib_statbar.obj \\r
+       $(OBJS)\monolib_statbmpcmn.obj \\r
+       $(OBJS)\monolib_statboxcmn.obj \\r
+       $(OBJS)\monolib_statlinecmn.obj \\r
        $(OBJS)\monolib_stattextcmn.obj \\r
        $(OBJS)\monolib_stockitem.obj \\r
        $(OBJS)\monolib_tbarbase.obj \\r
@@ -2977,9 +3022,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_artstd.obj \\r
        $(OBJS)\monolib_arttango.obj \\r
        $(OBJS)\monolib_bmpbase.obj \\r
+       $(OBJS)\monolib_bmpbtncmn.obj \\r
        $(OBJS)\monolib_bookctrl.obj \\r
        $(OBJS)\monolib_btncmn.obj \\r
        $(OBJS)\monolib_cairo.obj \\r
+       $(OBJS)\monolib_calctrlcmn.obj \\r
+       $(OBJS)\monolib_checkboxcmn.obj \\r
+       $(OBJS)\monolib_checklstcmn.obj \\r
        $(OBJS)\monolib_choiccmn.obj \\r
        $(OBJS)\monolib_clipcmn.obj \\r
        $(OBJS)\monolib_clrpickercmn.obj \\r
@@ -2996,6 +3045,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_dcbufcmn.obj \\r
        $(OBJS)\monolib_dcgraph.obj \\r
        $(OBJS)\monolib_dcsvg.obj \\r
+       $(OBJS)\monolib_dirctrlcmn.obj \\r
        $(OBJS)\monolib_dlgcmn.obj \\r
        $(OBJS)\monolib_dndcmn.obj \\r
        $(OBJS)\monolib_dobjcmn.obj \\r
@@ -3022,6 +3072,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_geometry.obj \\r
        $(OBJS)\monolib_gifdecod.obj \\r
        $(OBJS)\monolib_graphcmn.obj \\r
+       $(OBJS)\monolib_gridcmn.obj \\r
        $(OBJS)\monolib_headercolcmn.obj \\r
        $(OBJS)\monolib_headerctrlcmn.obj \\r
        $(OBJS)\monolib_helpbase.obj \\r
@@ -3046,23 +3097,32 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_menucmn.obj \\r
        $(OBJS)\monolib_mousemanager.obj \\r
        $(OBJS)\monolib_nbkbase.obj \\r
+       $(OBJS)\monolib_odcombocmn.obj \\r
        $(OBJS)\monolib_overlaycmn.obj \\r
        $(OBJS)\monolib_ownerdrwcmn.obj \\r
        $(OBJS)\monolib_paper.obj \\r
+       $(OBJS)\monolib_panelcmn.obj \\r
        $(OBJS)\monolib_persist.obj \\r
        $(OBJS)\monolib_pickerbase.obj \\r
        $(OBJS)\monolib_popupcmn.obj \\r
        $(OBJS)\monolib_prntbase.obj \\r
        $(OBJS)\monolib_quantize.obj \\r
+       $(OBJS)\monolib_radiobtncmn.obj \\r
        $(OBJS)\monolib_radiocmn.obj \\r
        $(OBJS)\monolib_rearrangectrl.obj \\r
        $(OBJS)\monolib_rendcmn.obj \\r
        $(OBJS)\monolib_rgncmn.obj \\r
+       $(OBJS)\monolib_scrolbarcmn.obj \\r
        $(OBJS)\monolib_settcmn.obj \\r
        $(OBJS)\monolib_sizer.obj \\r
+       $(OBJS)\monolib_slidercmn.obj \\r
+       $(OBJS)\monolib_spinbtncmn.obj \\r
        $(OBJS)\monolib_spinctrlcmn.obj \\r
        $(OBJS)\monolib_srchcmn.obj \\r
        $(OBJS)\monolib_statbar.obj \\r
+       $(OBJS)\monolib_statbmpcmn.obj \\r
+       $(OBJS)\monolib_statboxcmn.obj \\r
+       $(OBJS)\monolib_statlinecmn.obj \\r
        $(OBJS)\monolib_stattextcmn.obj \\r
        $(OBJS)\monolib_stockitem.obj \\r
        $(OBJS)\monolib_tbarbase.obj \\r
@@ -3407,9 +3467,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_artstd.obj \\r
        $(OBJS)\coredll_arttango.obj \\r
        $(OBJS)\coredll_bmpbase.obj \\r
+       $(OBJS)\coredll_bmpbtncmn.obj \\r
        $(OBJS)\coredll_bookctrl.obj \\r
        $(OBJS)\coredll_btncmn.obj \\r
        $(OBJS)\coredll_cairo.obj \\r
+       $(OBJS)\coredll_calctrlcmn.obj \\r
+       $(OBJS)\coredll_checkboxcmn.obj \\r
+       $(OBJS)\coredll_checklstcmn.obj \\r
        $(OBJS)\coredll_choiccmn.obj \\r
        $(OBJS)\coredll_clipcmn.obj \\r
        $(OBJS)\coredll_clrpickercmn.obj \\r
@@ -3426,6 +3490,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_dcbufcmn.obj \\r
        $(OBJS)\coredll_dcgraph.obj \\r
        $(OBJS)\coredll_dcsvg.obj \\r
+       $(OBJS)\coredll_dirctrlcmn.obj \\r
        $(OBJS)\coredll_dlgcmn.obj \\r
        $(OBJS)\coredll_dndcmn.obj \\r
        $(OBJS)\coredll_dobjcmn.obj \\r
@@ -3452,6 +3517,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_geometry.obj \\r
        $(OBJS)\coredll_gifdecod.obj \\r
        $(OBJS)\coredll_graphcmn.obj \\r
+       $(OBJS)\coredll_gridcmn.obj \\r
        $(OBJS)\coredll_headercolcmn.obj \\r
        $(OBJS)\coredll_headerctrlcmn.obj \\r
        $(OBJS)\coredll_helpbase.obj \\r
@@ -3476,23 +3542,32 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_menucmn.obj \\r
        $(OBJS)\coredll_mousemanager.obj \\r
        $(OBJS)\coredll_nbkbase.obj \\r
+       $(OBJS)\coredll_odcombocmn.obj \\r
        $(OBJS)\coredll_overlaycmn.obj \\r
        $(OBJS)\coredll_ownerdrwcmn.obj \\r
        $(OBJS)\coredll_paper.obj \\r
+       $(OBJS)\coredll_panelcmn.obj \\r
        $(OBJS)\coredll_persist.obj \\r
        $(OBJS)\coredll_pickerbase.obj \\r
        $(OBJS)\coredll_popupcmn.obj \\r
        $(OBJS)\coredll_prntbase.obj \\r
        $(OBJS)\coredll_quantize.obj \\r
+       $(OBJS)\coredll_radiobtncmn.obj \\r
        $(OBJS)\coredll_radiocmn.obj \\r
        $(OBJS)\coredll_rearrangectrl.obj \\r
        $(OBJS)\coredll_rendcmn.obj \\r
        $(OBJS)\coredll_rgncmn.obj \\r
+       $(OBJS)\coredll_scrolbarcmn.obj \\r
        $(OBJS)\coredll_settcmn.obj \\r
        $(OBJS)\coredll_sizer.obj \\r
+       $(OBJS)\coredll_slidercmn.obj \\r
+       $(OBJS)\coredll_spinbtncmn.obj \\r
        $(OBJS)\coredll_spinctrlcmn.obj \\r
        $(OBJS)\coredll_srchcmn.obj \\r
        $(OBJS)\coredll_statbar.obj \\r
+       $(OBJS)\coredll_statbmpcmn.obj \\r
+       $(OBJS)\coredll_statboxcmn.obj \\r
+       $(OBJS)\coredll_statlinecmn.obj \\r
        $(OBJS)\coredll_stattextcmn.obj \\r
        $(OBJS)\coredll_stockitem.obj \\r
        $(OBJS)\coredll_tbarbase.obj \\r
@@ -3655,9 +3730,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_artstd.obj \\r
        $(OBJS)\coredll_arttango.obj \\r
        $(OBJS)\coredll_bmpbase.obj \\r
+       $(OBJS)\coredll_bmpbtncmn.obj \\r
        $(OBJS)\coredll_bookctrl.obj \\r
        $(OBJS)\coredll_btncmn.obj \\r
        $(OBJS)\coredll_cairo.obj \\r
+       $(OBJS)\coredll_calctrlcmn.obj \\r
+       $(OBJS)\coredll_checkboxcmn.obj \\r
+       $(OBJS)\coredll_checklstcmn.obj \\r
        $(OBJS)\coredll_choiccmn.obj \\r
        $(OBJS)\coredll_clipcmn.obj \\r
        $(OBJS)\coredll_clrpickercmn.obj \\r
@@ -3674,6 +3753,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_dcbufcmn.obj \\r
        $(OBJS)\coredll_dcgraph.obj \\r
        $(OBJS)\coredll_dcsvg.obj \\r
+       $(OBJS)\coredll_dirctrlcmn.obj \\r
        $(OBJS)\coredll_dlgcmn.obj \\r
        $(OBJS)\coredll_dndcmn.obj \\r
        $(OBJS)\coredll_dobjcmn.obj \\r
@@ -3700,6 +3780,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_geometry.obj \\r
        $(OBJS)\coredll_gifdecod.obj \\r
        $(OBJS)\coredll_graphcmn.obj \\r
+       $(OBJS)\coredll_gridcmn.obj \\r
        $(OBJS)\coredll_headercolcmn.obj \\r
        $(OBJS)\coredll_headerctrlcmn.obj \\r
        $(OBJS)\coredll_helpbase.obj \\r
@@ -3724,23 +3805,32 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_menucmn.obj \\r
        $(OBJS)\coredll_mousemanager.obj \\r
        $(OBJS)\coredll_nbkbase.obj \\r
+       $(OBJS)\coredll_odcombocmn.obj \\r
        $(OBJS)\coredll_overlaycmn.obj \\r
        $(OBJS)\coredll_ownerdrwcmn.obj \\r
        $(OBJS)\coredll_paper.obj \\r
+       $(OBJS)\coredll_panelcmn.obj \\r
        $(OBJS)\coredll_persist.obj \\r
        $(OBJS)\coredll_pickerbase.obj \\r
        $(OBJS)\coredll_popupcmn.obj \\r
        $(OBJS)\coredll_prntbase.obj \\r
        $(OBJS)\coredll_quantize.obj \\r
+       $(OBJS)\coredll_radiobtncmn.obj \\r
        $(OBJS)\coredll_radiocmn.obj \\r
        $(OBJS)\coredll_rearrangectrl.obj \\r
        $(OBJS)\coredll_rendcmn.obj \\r
        $(OBJS)\coredll_rgncmn.obj \\r
+       $(OBJS)\coredll_scrolbarcmn.obj \\r
        $(OBJS)\coredll_settcmn.obj \\r
        $(OBJS)\coredll_sizer.obj \\r
+       $(OBJS)\coredll_slidercmn.obj \\r
+       $(OBJS)\coredll_spinbtncmn.obj \\r
        $(OBJS)\coredll_spinctrlcmn.obj \\r
        $(OBJS)\coredll_srchcmn.obj \\r
        $(OBJS)\coredll_statbar.obj \\r
+       $(OBJS)\coredll_statbmpcmn.obj \\r
+       $(OBJS)\coredll_statboxcmn.obj \\r
+       $(OBJS)\coredll_statlinecmn.obj \\r
        $(OBJS)\coredll_stattextcmn.obj \\r
        $(OBJS)\coredll_stockitem.obj \\r
        $(OBJS)\coredll_tbarbase.obj \\r
@@ -3918,9 +4008,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_artstd.obj \\r
        $(OBJS)\corelib_arttango.obj \\r
        $(OBJS)\corelib_bmpbase.obj \\r
+       $(OBJS)\corelib_bmpbtncmn.obj \\r
        $(OBJS)\corelib_bookctrl.obj \\r
        $(OBJS)\corelib_btncmn.obj \\r
        $(OBJS)\corelib_cairo.obj \\r
+       $(OBJS)\corelib_calctrlcmn.obj \\r
+       $(OBJS)\corelib_checkboxcmn.obj \\r
+       $(OBJS)\corelib_checklstcmn.obj \\r
        $(OBJS)\corelib_choiccmn.obj \\r
        $(OBJS)\corelib_clipcmn.obj \\r
        $(OBJS)\corelib_clrpickercmn.obj \\r
@@ -3937,6 +4031,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_dcbufcmn.obj \\r
        $(OBJS)\corelib_dcgraph.obj \\r
        $(OBJS)\corelib_dcsvg.obj \\r
+       $(OBJS)\corelib_dirctrlcmn.obj \\r
        $(OBJS)\corelib_dlgcmn.obj \\r
        $(OBJS)\corelib_dndcmn.obj \\r
        $(OBJS)\corelib_dobjcmn.obj \\r
@@ -3963,6 +4058,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_geometry.obj \\r
        $(OBJS)\corelib_gifdecod.obj \\r
        $(OBJS)\corelib_graphcmn.obj \\r
+       $(OBJS)\corelib_gridcmn.obj \\r
        $(OBJS)\corelib_headercolcmn.obj \\r
        $(OBJS)\corelib_headerctrlcmn.obj \\r
        $(OBJS)\corelib_helpbase.obj \\r
@@ -3987,23 +4083,32 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_menucmn.obj \\r
        $(OBJS)\corelib_mousemanager.obj \\r
        $(OBJS)\corelib_nbkbase.obj \\r
+       $(OBJS)\corelib_odcombocmn.obj \\r
        $(OBJS)\corelib_overlaycmn.obj \\r
        $(OBJS)\corelib_ownerdrwcmn.obj \\r
        $(OBJS)\corelib_paper.obj \\r
+       $(OBJS)\corelib_panelcmn.obj \\r
        $(OBJS)\corelib_persist.obj \\r
        $(OBJS)\corelib_pickerbase.obj \\r
        $(OBJS)\corelib_popupcmn.obj \\r
        $(OBJS)\corelib_prntbase.obj \\r
        $(OBJS)\corelib_quantize.obj \\r
+       $(OBJS)\corelib_radiobtncmn.obj \\r
        $(OBJS)\corelib_radiocmn.obj \\r
        $(OBJS)\corelib_rearrangectrl.obj \\r
        $(OBJS)\corelib_rendcmn.obj \\r
        $(OBJS)\corelib_rgncmn.obj \\r
+       $(OBJS)\corelib_scrolbarcmn.obj \\r
        $(OBJS)\corelib_settcmn.obj \\r
        $(OBJS)\corelib_sizer.obj \\r
+       $(OBJS)\corelib_slidercmn.obj \\r
+       $(OBJS)\corelib_spinbtncmn.obj \\r
        $(OBJS)\corelib_spinctrlcmn.obj \\r
        $(OBJS)\corelib_srchcmn.obj \\r
        $(OBJS)\corelib_statbar.obj \\r
+       $(OBJS)\corelib_statbmpcmn.obj \\r
+       $(OBJS)\corelib_statboxcmn.obj \\r
+       $(OBJS)\corelib_statlinecmn.obj \\r
        $(OBJS)\corelib_stattextcmn.obj \\r
        $(OBJS)\corelib_stockitem.obj \\r
        $(OBJS)\corelib_tbarbase.obj \\r
@@ -4166,9 +4271,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_artstd.obj \\r
        $(OBJS)\corelib_arttango.obj \\r
        $(OBJS)\corelib_bmpbase.obj \\r
+       $(OBJS)\corelib_bmpbtncmn.obj \\r
        $(OBJS)\corelib_bookctrl.obj \\r
        $(OBJS)\corelib_btncmn.obj \\r
        $(OBJS)\corelib_cairo.obj \\r
+       $(OBJS)\corelib_calctrlcmn.obj \\r
+       $(OBJS)\corelib_checkboxcmn.obj \\r
+       $(OBJS)\corelib_checklstcmn.obj \\r
        $(OBJS)\corelib_choiccmn.obj \\r
        $(OBJS)\corelib_clipcmn.obj \\r
        $(OBJS)\corelib_clrpickercmn.obj \\r
@@ -4185,6 +4294,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_dcbufcmn.obj \\r
        $(OBJS)\corelib_dcgraph.obj \\r
        $(OBJS)\corelib_dcsvg.obj \\r
+       $(OBJS)\corelib_dirctrlcmn.obj \\r
        $(OBJS)\corelib_dlgcmn.obj \\r
        $(OBJS)\corelib_dndcmn.obj \\r
        $(OBJS)\corelib_dobjcmn.obj \\r
@@ -4211,6 +4321,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_geometry.obj \\r
        $(OBJS)\corelib_gifdecod.obj \\r
        $(OBJS)\corelib_graphcmn.obj \\r
+       $(OBJS)\corelib_gridcmn.obj \\r
        $(OBJS)\corelib_headercolcmn.obj \\r
        $(OBJS)\corelib_headerctrlcmn.obj \\r
        $(OBJS)\corelib_helpbase.obj \\r
@@ -4235,23 +4346,32 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_menucmn.obj \\r
        $(OBJS)\corelib_mousemanager.obj \\r
        $(OBJS)\corelib_nbkbase.obj \\r
+       $(OBJS)\corelib_odcombocmn.obj \\r
        $(OBJS)\corelib_overlaycmn.obj \\r
        $(OBJS)\corelib_ownerdrwcmn.obj \\r
        $(OBJS)\corelib_paper.obj \\r
+       $(OBJS)\corelib_panelcmn.obj \\r
        $(OBJS)\corelib_persist.obj \\r
        $(OBJS)\corelib_pickerbase.obj \\r
        $(OBJS)\corelib_popupcmn.obj \\r
        $(OBJS)\corelib_prntbase.obj \\r
        $(OBJS)\corelib_quantize.obj \\r
+       $(OBJS)\corelib_radiobtncmn.obj \\r
        $(OBJS)\corelib_radiocmn.obj \\r
        $(OBJS)\corelib_rearrangectrl.obj \\r
        $(OBJS)\corelib_rendcmn.obj \\r
        $(OBJS)\corelib_rgncmn.obj \\r
+       $(OBJS)\corelib_scrolbarcmn.obj \\r
        $(OBJS)\corelib_settcmn.obj \\r
        $(OBJS)\corelib_sizer.obj \\r
+       $(OBJS)\corelib_slidercmn.obj \\r
+       $(OBJS)\corelib_spinbtncmn.obj \\r
        $(OBJS)\corelib_spinctrlcmn.obj \\r
        $(OBJS)\corelib_srchcmn.obj \\r
        $(OBJS)\corelib_statbar.obj \\r
+       $(OBJS)\corelib_statbmpcmn.obj \\r
+       $(OBJS)\corelib_statboxcmn.obj \\r
+       $(OBJS)\corelib_statlinecmn.obj \\r
        $(OBJS)\corelib_stattextcmn.obj \\r
        $(OBJS)\corelib_stockitem.obj \\r
        $(OBJS)\corelib_tbarbase.obj \\r
@@ -7718,6 +7838,11 @@ $(OBJS)\monodll_bmpbase.obj: ..\..\src\common\bmpbase.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\bmpbase.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_bmpbtncmn.obj: ..\..\src\common\bmpbtncmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\bmpbtncmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_bookctrl.obj: ..\..\src\common\bookctrl.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\bookctrl.cpp\r
@@ -7733,6 +7858,26 @@ $(OBJS)\monodll_cairo.obj: ..\..\src\common\cairo.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\cairo.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_checkboxcmn.obj: ..\..\src\common\checkboxcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\checkboxcmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_checklstcmn.obj: ..\..\src\common\checklstcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\checklstcmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_choiccmn.obj: ..\..\src\common\choiccmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\choiccmn.cpp\r
@@ -7813,6 +7958,11 @@ $(OBJS)\monodll_dcsvg.obj: ..\..\src\common\dcsvg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dcsvg.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_dirctrlcmn.obj: ..\..\src\common\dirctrlcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dirctrlcmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dlgcmn.cpp\r
@@ -7943,6 +8093,11 @@ $(OBJS)\monodll_graphcmn.obj: ..\..\src\common\graphcmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\graphcmn.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_gridcmn.obj: ..\..\src\common\gridcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\gridcmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_headercolcmn.obj: ..\..\src\common\headercolcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\headercolcmn.cpp\r
@@ -8063,6 +8218,11 @@ $(OBJS)\monodll_nbkbase.obj: ..\..\src\common\nbkbase.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\nbkbase.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\odcombocmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\overlaycmn.cpp\r
@@ -8078,6 +8238,11 @@ $(OBJS)\monodll_paper.obj: ..\..\src\common\paper.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\paper.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_panelcmn.obj: ..\..\src\common\panelcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\panelcmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_persist.obj: ..\..\src\common\persist.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\persist.cpp\r
@@ -8103,6 +8268,11 @@ $(OBJS)\monodll_quantize.obj: ..\..\src\common\quantize.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\quantize.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_radiobtncmn.obj: ..\..\src\common\radiobtncmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\radiobtncmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_radiocmn.obj: ..\..\src\common\radiocmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\radiocmn.cpp\r
@@ -8123,6 +8293,11 @@ $(OBJS)\monodll_rgncmn.obj: ..\..\src\common\rgncmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\rgncmn.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_scrolbarcmn.obj: ..\..\src\common\scrolbarcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\scrolbarcmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_settcmn.obj: ..\..\src\common\settcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\settcmn.cpp\r
@@ -8133,6 +8308,16 @@ $(OBJS)\monodll_sizer.obj: ..\..\src\common\sizer.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\sizer.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_slidercmn.obj: ..\..\src\common\slidercmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\slidercmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_spinbtncmn.obj: ..\..\src\common\spinbtncmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\spinbtncmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_spinctrlcmn.obj: ..\..\src\common\spinctrlcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\spinctrlcmn.cpp\r
@@ -8148,6 +8333,21 @@ $(OBJS)\monodll_statbar.obj: ..\..\src\common\statbar.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\statbar.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_statbmpcmn.obj: ..\..\src\common\statbmpcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\statbmpcmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_statboxcmn.obj: ..\..\src\common\statboxcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\statboxcmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_statlinecmn.obj: ..\..\src\common\statlinecmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\statlinecmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_stattextcmn.obj: ..\..\src\common\stattextcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\stattextcmn.cpp\r
@@ -8403,11 +8603,6 @@ $(OBJS)\monodll_bmpcboxcmn.obj: ..\..\src\common\bmpcboxcmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\bmpcboxcmn.cpp\r
 !endif\r
 \r
-!if "$(USE_GUI)" == "1"\r
-$(OBJS)\monodll_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp\r
-!endif\r
-\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_datavcmn.obj: ..\..\src\common\datavcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\datavcmn.cpp\r
@@ -9965,6 +10160,11 @@ $(OBJS)\monolib_bmpbase.obj: ..\..\src\common\bmpbase.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\bmpbase.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_bmpbtncmn.obj: ..\..\src\common\bmpbtncmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\bmpbtncmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_bookctrl.obj: ..\..\src\common\bookctrl.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\bookctrl.cpp\r
@@ -9980,6 +10180,26 @@ $(OBJS)\monolib_cairo.obj: ..\..\src\common\cairo.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\cairo.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_checkboxcmn.obj: ..\..\src\common\checkboxcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\checkboxcmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_checklstcmn.obj: ..\..\src\common\checklstcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\checklstcmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_choiccmn.obj: ..\..\src\common\choiccmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\choiccmn.cpp\r
@@ -10060,6 +10280,11 @@ $(OBJS)\monolib_dcsvg.obj: ..\..\src\common\dcsvg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dcsvg.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_dirctrlcmn.obj: ..\..\src\common\dirctrlcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dirctrlcmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dlgcmn.cpp\r
@@ -10190,6 +10415,11 @@ $(OBJS)\monolib_graphcmn.obj: ..\..\src\common\graphcmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\graphcmn.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_gridcmn.obj: ..\..\src\common\gridcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\gridcmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_headercolcmn.obj: ..\..\src\common\headercolcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\headercolcmn.cpp\r
@@ -10310,6 +10540,11 @@ $(OBJS)\monolib_nbkbase.obj: ..\..\src\common\nbkbase.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\nbkbase.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\odcombocmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\overlaycmn.cpp\r
@@ -10325,6 +10560,11 @@ $(OBJS)\monolib_paper.obj: ..\..\src\common\paper.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\paper.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_panelcmn.obj: ..\..\src\common\panelcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\panelcmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_persist.obj: ..\..\src\common\persist.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\persist.cpp\r
@@ -10350,6 +10590,11 @@ $(OBJS)\monolib_quantize.obj: ..\..\src\common\quantize.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\quantize.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_radiobtncmn.obj: ..\..\src\common\radiobtncmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\radiobtncmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_radiocmn.obj: ..\..\src\common\radiocmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\radiocmn.cpp\r
@@ -10370,6 +10615,11 @@ $(OBJS)\monolib_rgncmn.obj: ..\..\src\common\rgncmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\rgncmn.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_scrolbarcmn.obj: ..\..\src\common\scrolbarcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\scrolbarcmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_settcmn.obj: ..\..\src\common\settcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\settcmn.cpp\r
@@ -10380,6 +10630,16 @@ $(OBJS)\monolib_sizer.obj: ..\..\src\common\sizer.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\sizer.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_slidercmn.obj: ..\..\src\common\slidercmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\slidercmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_spinbtncmn.obj: ..\..\src\common\spinbtncmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\spinbtncmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_spinctrlcmn.obj: ..\..\src\common\spinctrlcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\spinctrlcmn.cpp\r
@@ -10395,6 +10655,21 @@ $(OBJS)\monolib_statbar.obj: ..\..\src\common\statbar.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\statbar.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_statbmpcmn.obj: ..\..\src\common\statbmpcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\statbmpcmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_statboxcmn.obj: ..\..\src\common\statboxcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\statboxcmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_statlinecmn.obj: ..\..\src\common\statlinecmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\statlinecmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_stattextcmn.obj: ..\..\src\common\stattextcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\stattextcmn.cpp\r
@@ -10650,11 +10925,6 @@ $(OBJS)\monolib_bmpcboxcmn.obj: ..\..\src\common\bmpcboxcmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\bmpcboxcmn.cpp\r
 !endif\r
 \r
-!if "$(USE_GUI)" == "1"\r
-$(OBJS)\monolib_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp\r
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp\r
-!endif\r
-\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_datavcmn.obj: ..\..\src\common\datavcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\datavcmn.cpp\r
@@ -12203,6 +12473,11 @@ $(OBJS)\coredll_bmpbase.obj: ..\..\src\common\bmpbase.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\bmpbase.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_bmpbtncmn.obj: ..\..\src\common\bmpbtncmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\bmpbtncmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_bookctrl.obj: ..\..\src\common\bookctrl.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\bookctrl.cpp\r
@@ -12218,6 +12493,21 @@ $(OBJS)\coredll_cairo.obj: ..\..\src\common\cairo.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\cairo.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_checkboxcmn.obj: ..\..\src\common\checkboxcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\checkboxcmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_checklstcmn.obj: ..\..\src\common\checklstcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\checklstcmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_choiccmn.obj: ..\..\src\common\choiccmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\choiccmn.cpp\r
@@ -12298,6 +12588,11 @@ $(OBJS)\coredll_dcsvg.obj: ..\..\src\common\dcsvg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\dcsvg.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_dirctrlcmn.obj: ..\..\src\common\dirctrlcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\dirctrlcmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\dlgcmn.cpp\r
@@ -12428,6 +12723,11 @@ $(OBJS)\coredll_graphcmn.obj: ..\..\src\common\graphcmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\graphcmn.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_gridcmn.obj: ..\..\src\common\gridcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\gridcmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_headercolcmn.obj: ..\..\src\common\headercolcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\headercolcmn.cpp\r
@@ -12548,6 +12848,11 @@ $(OBJS)\coredll_nbkbase.obj: ..\..\src\common\nbkbase.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\nbkbase.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\odcombocmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\overlaycmn.cpp\r
@@ -12563,6 +12868,11 @@ $(OBJS)\coredll_paper.obj: ..\..\src\common\paper.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\paper.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_panelcmn.obj: ..\..\src\common\panelcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\panelcmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_persist.obj: ..\..\src\common\persist.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\persist.cpp\r
@@ -12588,6 +12898,11 @@ $(OBJS)\coredll_quantize.obj: ..\..\src\common\quantize.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\quantize.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_radiobtncmn.obj: ..\..\src\common\radiobtncmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\radiobtncmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_radiocmn.obj: ..\..\src\common\radiocmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\radiocmn.cpp\r
@@ -12608,6 +12923,11 @@ $(OBJS)\coredll_rgncmn.obj: ..\..\src\common\rgncmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\rgncmn.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_scrolbarcmn.obj: ..\..\src\common\scrolbarcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\scrolbarcmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_settcmn.obj: ..\..\src\common\settcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\settcmn.cpp\r
@@ -12618,6 +12938,16 @@ $(OBJS)\coredll_sizer.obj: ..\..\src\common\sizer.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\sizer.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_slidercmn.obj: ..\..\src\common\slidercmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\slidercmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_spinbtncmn.obj: ..\..\src\common\spinbtncmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\spinbtncmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_spinctrlcmn.obj: ..\..\src\common\spinctrlcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\spinctrlcmn.cpp\r
@@ -12633,6 +12963,21 @@ $(OBJS)\coredll_statbar.obj: ..\..\src\common\statbar.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\statbar.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_statbmpcmn.obj: ..\..\src\common\statbmpcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\statbmpcmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_statboxcmn.obj: ..\..\src\common\statboxcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\statboxcmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_statlinecmn.obj: ..\..\src\common\statlinecmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\statlinecmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_stattextcmn.obj: ..\..\src\common\stattextcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\stattextcmn.cpp\r
@@ -13518,6 +13863,11 @@ $(OBJS)\corelib_bmpbase.obj: ..\..\src\common\bmpbase.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\bmpbase.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_bmpbtncmn.obj: ..\..\src\common\bmpbtncmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\bmpbtncmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_bookctrl.obj: ..\..\src\common\bookctrl.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\bookctrl.cpp\r
@@ -13533,6 +13883,21 @@ $(OBJS)\corelib_cairo.obj: ..\..\src\common\cairo.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\cairo.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_checkboxcmn.obj: ..\..\src\common\checkboxcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\checkboxcmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_checklstcmn.obj: ..\..\src\common\checklstcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\checklstcmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_choiccmn.obj: ..\..\src\common\choiccmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\choiccmn.cpp\r
@@ -13613,6 +13978,11 @@ $(OBJS)\corelib_dcsvg.obj: ..\..\src\common\dcsvg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\dcsvg.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_dirctrlcmn.obj: ..\..\src\common\dirctrlcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\dirctrlcmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\dlgcmn.cpp\r
@@ -13743,6 +14113,11 @@ $(OBJS)\corelib_graphcmn.obj: ..\..\src\common\graphcmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\graphcmn.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_gridcmn.obj: ..\..\src\common\gridcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\gridcmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_headercolcmn.obj: ..\..\src\common\headercolcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\headercolcmn.cpp\r
@@ -13863,6 +14238,11 @@ $(OBJS)\corelib_nbkbase.obj: ..\..\src\common\nbkbase.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\nbkbase.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\odcombocmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\overlaycmn.cpp\r
@@ -13878,6 +14258,11 @@ $(OBJS)\corelib_paper.obj: ..\..\src\common\paper.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\paper.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_panelcmn.obj: ..\..\src\common\panelcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\panelcmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_persist.obj: ..\..\src\common\persist.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\persist.cpp\r
@@ -13903,6 +14288,11 @@ $(OBJS)\corelib_quantize.obj: ..\..\src\common\quantize.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\quantize.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_radiobtncmn.obj: ..\..\src\common\radiobtncmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\radiobtncmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_radiocmn.obj: ..\..\src\common\radiocmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\radiocmn.cpp\r
@@ -13923,6 +14313,11 @@ $(OBJS)\corelib_rgncmn.obj: ..\..\src\common\rgncmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\rgncmn.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_scrolbarcmn.obj: ..\..\src\common\scrolbarcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\scrolbarcmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_settcmn.obj: ..\..\src\common\settcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\settcmn.cpp\r
@@ -13933,6 +14328,16 @@ $(OBJS)\corelib_sizer.obj: ..\..\src\common\sizer.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\sizer.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_slidercmn.obj: ..\..\src\common\slidercmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\slidercmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_spinbtncmn.obj: ..\..\src\common\spinbtncmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\spinbtncmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_spinctrlcmn.obj: ..\..\src\common\spinctrlcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\spinctrlcmn.cpp\r
@@ -13948,6 +14353,21 @@ $(OBJS)\corelib_statbar.obj: ..\..\src\common\statbar.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\statbar.cpp\r
 !endif\r
 \r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_statbmpcmn.obj: ..\..\src\common\statbmpcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\statbmpcmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_statboxcmn.obj: ..\..\src\common\statboxcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\statboxcmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_statlinecmn.obj: ..\..\src\common\statlinecmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\statlinecmn.cpp\r
+!endif\r
+\r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_stattextcmn.obj: ..\..\src\common\stattextcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\stattextcmn.cpp\r
index 944fdd8c6deb78b936b76667d4d201673ee01978..d7c6345bb089bc85d6792add8be09d59c010a0dc 100644 (file)
@@ -357,9 +357,13 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_artstd.obj &\r
        $(OBJS)\monodll_arttango.obj &\r
        $(OBJS)\monodll_bmpbase.obj &\r
+       $(OBJS)\monodll_bmpbtncmn.obj &\r
        $(OBJS)\monodll_bookctrl.obj &\r
        $(OBJS)\monodll_btncmn.obj &\r
        $(OBJS)\monodll_cairo.obj &\r
+       $(OBJS)\monodll_calctrlcmn.obj &\r
+       $(OBJS)\monodll_checkboxcmn.obj &\r
+       $(OBJS)\monodll_checklstcmn.obj &\r
        $(OBJS)\monodll_choiccmn.obj &\r
        $(OBJS)\monodll_clipcmn.obj &\r
        $(OBJS)\monodll_clrpickercmn.obj &\r
@@ -376,6 +380,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_dcbufcmn.obj &\r
        $(OBJS)\monodll_dcgraph.obj &\r
        $(OBJS)\monodll_dcsvg.obj &\r
+       $(OBJS)\monodll_dirctrlcmn.obj &\r
        $(OBJS)\monodll_dlgcmn.obj &\r
        $(OBJS)\monodll_dndcmn.obj &\r
        $(OBJS)\monodll_dobjcmn.obj &\r
@@ -402,6 +407,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_geometry.obj &\r
        $(OBJS)\monodll_gifdecod.obj &\r
        $(OBJS)\monodll_graphcmn.obj &\r
+       $(OBJS)\monodll_gridcmn.obj &\r
        $(OBJS)\monodll_headercolcmn.obj &\r
        $(OBJS)\monodll_headerctrlcmn.obj &\r
        $(OBJS)\monodll_helpbase.obj &\r
@@ -426,23 +432,32 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_menucmn.obj &\r
        $(OBJS)\monodll_mousemanager.obj &\r
        $(OBJS)\monodll_nbkbase.obj &\r
+       $(OBJS)\monodll_odcombocmn.obj &\r
        $(OBJS)\monodll_overlaycmn.obj &\r
        $(OBJS)\monodll_ownerdrwcmn.obj &\r
        $(OBJS)\monodll_paper.obj &\r
+       $(OBJS)\monodll_panelcmn.obj &\r
        $(OBJS)\monodll_persist.obj &\r
        $(OBJS)\monodll_pickerbase.obj &\r
        $(OBJS)\monodll_popupcmn.obj &\r
        $(OBJS)\monodll_prntbase.obj &\r
        $(OBJS)\monodll_quantize.obj &\r
+       $(OBJS)\monodll_radiobtncmn.obj &\r
        $(OBJS)\monodll_radiocmn.obj &\r
        $(OBJS)\monodll_rearrangectrl.obj &\r
        $(OBJS)\monodll_rendcmn.obj &\r
        $(OBJS)\monodll_rgncmn.obj &\r
+       $(OBJS)\monodll_scrolbarcmn.obj &\r
        $(OBJS)\monodll_settcmn.obj &\r
        $(OBJS)\monodll_sizer.obj &\r
+       $(OBJS)\monodll_slidercmn.obj &\r
+       $(OBJS)\monodll_spinbtncmn.obj &\r
        $(OBJS)\monodll_spinctrlcmn.obj &\r
        $(OBJS)\monodll_srchcmn.obj &\r
        $(OBJS)\monodll_statbar.obj &\r
+       $(OBJS)\monodll_statbmpcmn.obj &\r
+       $(OBJS)\monodll_statboxcmn.obj &\r
+       $(OBJS)\monodll_statlinecmn.obj &\r
        $(OBJS)\monodll_stattextcmn.obj &\r
        $(OBJS)\monodll_stockitem.obj &\r
        $(OBJS)\monodll_tbarbase.obj &\r
@@ -607,9 +622,13 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_artstd.obj &\r
        $(OBJS)\monodll_arttango.obj &\r
        $(OBJS)\monodll_bmpbase.obj &\r
+       $(OBJS)\monodll_bmpbtncmn.obj &\r
        $(OBJS)\monodll_bookctrl.obj &\r
        $(OBJS)\monodll_btncmn.obj &\r
        $(OBJS)\monodll_cairo.obj &\r
+       $(OBJS)\monodll_calctrlcmn.obj &\r
+       $(OBJS)\monodll_checkboxcmn.obj &\r
+       $(OBJS)\monodll_checklstcmn.obj &\r
        $(OBJS)\monodll_choiccmn.obj &\r
        $(OBJS)\monodll_clipcmn.obj &\r
        $(OBJS)\monodll_clrpickercmn.obj &\r
@@ -626,6 +645,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_dcbufcmn.obj &\r
        $(OBJS)\monodll_dcgraph.obj &\r
        $(OBJS)\monodll_dcsvg.obj &\r
+       $(OBJS)\monodll_dirctrlcmn.obj &\r
        $(OBJS)\monodll_dlgcmn.obj &\r
        $(OBJS)\monodll_dndcmn.obj &\r
        $(OBJS)\monodll_dobjcmn.obj &\r
@@ -652,6 +672,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_geometry.obj &\r
        $(OBJS)\monodll_gifdecod.obj &\r
        $(OBJS)\monodll_graphcmn.obj &\r
+       $(OBJS)\monodll_gridcmn.obj &\r
        $(OBJS)\monodll_headercolcmn.obj &\r
        $(OBJS)\monodll_headerctrlcmn.obj &\r
        $(OBJS)\monodll_helpbase.obj &\r
@@ -676,23 +697,32 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_menucmn.obj &\r
        $(OBJS)\monodll_mousemanager.obj &\r
        $(OBJS)\monodll_nbkbase.obj &\r
+       $(OBJS)\monodll_odcombocmn.obj &\r
        $(OBJS)\monodll_overlaycmn.obj &\r
        $(OBJS)\monodll_ownerdrwcmn.obj &\r
        $(OBJS)\monodll_paper.obj &\r
+       $(OBJS)\monodll_panelcmn.obj &\r
        $(OBJS)\monodll_persist.obj &\r
        $(OBJS)\monodll_pickerbase.obj &\r
        $(OBJS)\monodll_popupcmn.obj &\r
        $(OBJS)\monodll_prntbase.obj &\r
        $(OBJS)\monodll_quantize.obj &\r
+       $(OBJS)\monodll_radiobtncmn.obj &\r
        $(OBJS)\monodll_radiocmn.obj &\r
        $(OBJS)\monodll_rearrangectrl.obj &\r
        $(OBJS)\monodll_rendcmn.obj &\r
        $(OBJS)\monodll_rgncmn.obj &\r
+       $(OBJS)\monodll_scrolbarcmn.obj &\r
        $(OBJS)\monodll_settcmn.obj &\r
        $(OBJS)\monodll_sizer.obj &\r
+       $(OBJS)\monodll_slidercmn.obj &\r
+       $(OBJS)\monodll_spinbtncmn.obj &\r
        $(OBJS)\monodll_spinctrlcmn.obj &\r
        $(OBJS)\monodll_srchcmn.obj &\r
        $(OBJS)\monodll_statbar.obj &\r
+       $(OBJS)\monodll_statbmpcmn.obj &\r
+       $(OBJS)\monodll_statboxcmn.obj &\r
+       $(OBJS)\monodll_statlinecmn.obj &\r
        $(OBJS)\monodll_stattextcmn.obj &\r
        $(OBJS)\monodll_stockitem.obj &\r
        $(OBJS)\monodll_tbarbase.obj &\r
@@ -1092,9 +1122,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_artstd.obj &\r
        $(OBJS)\monolib_arttango.obj &\r
        $(OBJS)\monolib_bmpbase.obj &\r
+       $(OBJS)\monolib_bmpbtncmn.obj &\r
        $(OBJS)\monolib_bookctrl.obj &\r
        $(OBJS)\monolib_btncmn.obj &\r
        $(OBJS)\monolib_cairo.obj &\r
+       $(OBJS)\monolib_calctrlcmn.obj &\r
+       $(OBJS)\monolib_checkboxcmn.obj &\r
+       $(OBJS)\monolib_checklstcmn.obj &\r
        $(OBJS)\monolib_choiccmn.obj &\r
        $(OBJS)\monolib_clipcmn.obj &\r
        $(OBJS)\monolib_clrpickercmn.obj &\r
@@ -1111,6 +1145,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_dcbufcmn.obj &\r
        $(OBJS)\monolib_dcgraph.obj &\r
        $(OBJS)\monolib_dcsvg.obj &\r
+       $(OBJS)\monolib_dirctrlcmn.obj &\r
        $(OBJS)\monolib_dlgcmn.obj &\r
        $(OBJS)\monolib_dndcmn.obj &\r
        $(OBJS)\monolib_dobjcmn.obj &\r
@@ -1137,6 +1172,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_geometry.obj &\r
        $(OBJS)\monolib_gifdecod.obj &\r
        $(OBJS)\monolib_graphcmn.obj &\r
+       $(OBJS)\monolib_gridcmn.obj &\r
        $(OBJS)\monolib_headercolcmn.obj &\r
        $(OBJS)\monolib_headerctrlcmn.obj &\r
        $(OBJS)\monolib_helpbase.obj &\r
@@ -1161,23 +1197,32 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_menucmn.obj &\r
        $(OBJS)\monolib_mousemanager.obj &\r
        $(OBJS)\monolib_nbkbase.obj &\r
+       $(OBJS)\monolib_odcombocmn.obj &\r
        $(OBJS)\monolib_overlaycmn.obj &\r
        $(OBJS)\monolib_ownerdrwcmn.obj &\r
        $(OBJS)\monolib_paper.obj &\r
+       $(OBJS)\monolib_panelcmn.obj &\r
        $(OBJS)\monolib_persist.obj &\r
        $(OBJS)\monolib_pickerbase.obj &\r
        $(OBJS)\monolib_popupcmn.obj &\r
        $(OBJS)\monolib_prntbase.obj &\r
        $(OBJS)\monolib_quantize.obj &\r
+       $(OBJS)\monolib_radiobtncmn.obj &\r
        $(OBJS)\monolib_radiocmn.obj &\r
        $(OBJS)\monolib_rearrangectrl.obj &\r
        $(OBJS)\monolib_rendcmn.obj &\r
        $(OBJS)\monolib_rgncmn.obj &\r
+       $(OBJS)\monolib_scrolbarcmn.obj &\r
        $(OBJS)\monolib_settcmn.obj &\r
        $(OBJS)\monolib_sizer.obj &\r
+       $(OBJS)\monolib_slidercmn.obj &\r
+       $(OBJS)\monolib_spinbtncmn.obj &\r
        $(OBJS)\monolib_spinctrlcmn.obj &\r
        $(OBJS)\monolib_srchcmn.obj &\r
        $(OBJS)\monolib_statbar.obj &\r
+       $(OBJS)\monolib_statbmpcmn.obj &\r
+       $(OBJS)\monolib_statboxcmn.obj &\r
+       $(OBJS)\monolib_statlinecmn.obj &\r
        $(OBJS)\monolib_stattextcmn.obj &\r
        $(OBJS)\monolib_stockitem.obj &\r
        $(OBJS)\monolib_tbarbase.obj &\r
@@ -1342,9 +1387,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_artstd.obj &\r
        $(OBJS)\monolib_arttango.obj &\r
        $(OBJS)\monolib_bmpbase.obj &\r
+       $(OBJS)\monolib_bmpbtncmn.obj &\r
        $(OBJS)\monolib_bookctrl.obj &\r
        $(OBJS)\monolib_btncmn.obj &\r
        $(OBJS)\monolib_cairo.obj &\r
+       $(OBJS)\monolib_calctrlcmn.obj &\r
+       $(OBJS)\monolib_checkboxcmn.obj &\r
+       $(OBJS)\monolib_checklstcmn.obj &\r
        $(OBJS)\monolib_choiccmn.obj &\r
        $(OBJS)\monolib_clipcmn.obj &\r
        $(OBJS)\monolib_clrpickercmn.obj &\r
@@ -1361,6 +1410,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_dcbufcmn.obj &\r
        $(OBJS)\monolib_dcgraph.obj &\r
        $(OBJS)\monolib_dcsvg.obj &\r
+       $(OBJS)\monolib_dirctrlcmn.obj &\r
        $(OBJS)\monolib_dlgcmn.obj &\r
        $(OBJS)\monolib_dndcmn.obj &\r
        $(OBJS)\monolib_dobjcmn.obj &\r
@@ -1387,6 +1437,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_geometry.obj &\r
        $(OBJS)\monolib_gifdecod.obj &\r
        $(OBJS)\monolib_graphcmn.obj &\r
+       $(OBJS)\monolib_gridcmn.obj &\r
        $(OBJS)\monolib_headercolcmn.obj &\r
        $(OBJS)\monolib_headerctrlcmn.obj &\r
        $(OBJS)\monolib_helpbase.obj &\r
@@ -1411,23 +1462,32 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_menucmn.obj &\r
        $(OBJS)\monolib_mousemanager.obj &\r
        $(OBJS)\monolib_nbkbase.obj &\r
+       $(OBJS)\monolib_odcombocmn.obj &\r
        $(OBJS)\monolib_overlaycmn.obj &\r
        $(OBJS)\monolib_ownerdrwcmn.obj &\r
        $(OBJS)\monolib_paper.obj &\r
+       $(OBJS)\monolib_panelcmn.obj &\r
        $(OBJS)\monolib_persist.obj &\r
        $(OBJS)\monolib_pickerbase.obj &\r
        $(OBJS)\monolib_popupcmn.obj &\r
        $(OBJS)\monolib_prntbase.obj &\r
        $(OBJS)\monolib_quantize.obj &\r
+       $(OBJS)\monolib_radiobtncmn.obj &\r
        $(OBJS)\monolib_radiocmn.obj &\r
        $(OBJS)\monolib_rearrangectrl.obj &\r
        $(OBJS)\monolib_rendcmn.obj &\r
        $(OBJS)\monolib_rgncmn.obj &\r
+       $(OBJS)\monolib_scrolbarcmn.obj &\r
        $(OBJS)\monolib_settcmn.obj &\r
        $(OBJS)\monolib_sizer.obj &\r
+       $(OBJS)\monolib_slidercmn.obj &\r
+       $(OBJS)\monolib_spinbtncmn.obj &\r
        $(OBJS)\monolib_spinctrlcmn.obj &\r
        $(OBJS)\monolib_srchcmn.obj &\r
        $(OBJS)\monolib_statbar.obj &\r
+       $(OBJS)\monolib_statbmpcmn.obj &\r
+       $(OBJS)\monolib_statboxcmn.obj &\r
+       $(OBJS)\monolib_statlinecmn.obj &\r
        $(OBJS)\monolib_stattextcmn.obj &\r
        $(OBJS)\monolib_stockitem.obj &\r
        $(OBJS)\monolib_tbarbase.obj &\r
@@ -1731,9 +1791,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_artstd.obj &\r
        $(OBJS)\coredll_arttango.obj &\r
        $(OBJS)\coredll_bmpbase.obj &\r
+       $(OBJS)\coredll_bmpbtncmn.obj &\r
        $(OBJS)\coredll_bookctrl.obj &\r
        $(OBJS)\coredll_btncmn.obj &\r
        $(OBJS)\coredll_cairo.obj &\r
+       $(OBJS)\coredll_calctrlcmn.obj &\r
+       $(OBJS)\coredll_checkboxcmn.obj &\r
+       $(OBJS)\coredll_checklstcmn.obj &\r
        $(OBJS)\coredll_choiccmn.obj &\r
        $(OBJS)\coredll_clipcmn.obj &\r
        $(OBJS)\coredll_clrpickercmn.obj &\r
@@ -1750,6 +1814,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_dcbufcmn.obj &\r
        $(OBJS)\coredll_dcgraph.obj &\r
        $(OBJS)\coredll_dcsvg.obj &\r
+       $(OBJS)\coredll_dirctrlcmn.obj &\r
        $(OBJS)\coredll_dlgcmn.obj &\r
        $(OBJS)\coredll_dndcmn.obj &\r
        $(OBJS)\coredll_dobjcmn.obj &\r
@@ -1776,6 +1841,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_geometry.obj &\r
        $(OBJS)\coredll_gifdecod.obj &\r
        $(OBJS)\coredll_graphcmn.obj &\r
+       $(OBJS)\coredll_gridcmn.obj &\r
        $(OBJS)\coredll_headercolcmn.obj &\r
        $(OBJS)\coredll_headerctrlcmn.obj &\r
        $(OBJS)\coredll_helpbase.obj &\r
@@ -1800,23 +1866,32 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_menucmn.obj &\r
        $(OBJS)\coredll_mousemanager.obj &\r
        $(OBJS)\coredll_nbkbase.obj &\r
+       $(OBJS)\coredll_odcombocmn.obj &\r
        $(OBJS)\coredll_overlaycmn.obj &\r
        $(OBJS)\coredll_ownerdrwcmn.obj &\r
        $(OBJS)\coredll_paper.obj &\r
+       $(OBJS)\coredll_panelcmn.obj &\r
        $(OBJS)\coredll_persist.obj &\r
        $(OBJS)\coredll_pickerbase.obj &\r
        $(OBJS)\coredll_popupcmn.obj &\r
        $(OBJS)\coredll_prntbase.obj &\r
        $(OBJS)\coredll_quantize.obj &\r
+       $(OBJS)\coredll_radiobtncmn.obj &\r
        $(OBJS)\coredll_radiocmn.obj &\r
        $(OBJS)\coredll_rearrangectrl.obj &\r
        $(OBJS)\coredll_rendcmn.obj &\r
        $(OBJS)\coredll_rgncmn.obj &\r
+       $(OBJS)\coredll_scrolbarcmn.obj &\r
        $(OBJS)\coredll_settcmn.obj &\r
        $(OBJS)\coredll_sizer.obj &\r
+       $(OBJS)\coredll_slidercmn.obj &\r
+       $(OBJS)\coredll_spinbtncmn.obj &\r
        $(OBJS)\coredll_spinctrlcmn.obj &\r
        $(OBJS)\coredll_srchcmn.obj &\r
        $(OBJS)\coredll_statbar.obj &\r
+       $(OBJS)\coredll_statbmpcmn.obj &\r
+       $(OBJS)\coredll_statboxcmn.obj &\r
+       $(OBJS)\coredll_statlinecmn.obj &\r
        $(OBJS)\coredll_stattextcmn.obj &\r
        $(OBJS)\coredll_stockitem.obj &\r
        $(OBJS)\coredll_tbarbase.obj &\r
@@ -1981,9 +2056,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_artstd.obj &\r
        $(OBJS)\coredll_arttango.obj &\r
        $(OBJS)\coredll_bmpbase.obj &\r
+       $(OBJS)\coredll_bmpbtncmn.obj &\r
        $(OBJS)\coredll_bookctrl.obj &\r
        $(OBJS)\coredll_btncmn.obj &\r
        $(OBJS)\coredll_cairo.obj &\r
+       $(OBJS)\coredll_calctrlcmn.obj &\r
+       $(OBJS)\coredll_checkboxcmn.obj &\r
+       $(OBJS)\coredll_checklstcmn.obj &\r
        $(OBJS)\coredll_choiccmn.obj &\r
        $(OBJS)\coredll_clipcmn.obj &\r
        $(OBJS)\coredll_clrpickercmn.obj &\r
@@ -2000,6 +2079,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_dcbufcmn.obj &\r
        $(OBJS)\coredll_dcgraph.obj &\r
        $(OBJS)\coredll_dcsvg.obj &\r
+       $(OBJS)\coredll_dirctrlcmn.obj &\r
        $(OBJS)\coredll_dlgcmn.obj &\r
        $(OBJS)\coredll_dndcmn.obj &\r
        $(OBJS)\coredll_dobjcmn.obj &\r
@@ -2026,6 +2106,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_geometry.obj &\r
        $(OBJS)\coredll_gifdecod.obj &\r
        $(OBJS)\coredll_graphcmn.obj &\r
+       $(OBJS)\coredll_gridcmn.obj &\r
        $(OBJS)\coredll_headercolcmn.obj &\r
        $(OBJS)\coredll_headerctrlcmn.obj &\r
        $(OBJS)\coredll_helpbase.obj &\r
@@ -2050,23 +2131,32 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_menucmn.obj &\r
        $(OBJS)\coredll_mousemanager.obj &\r
        $(OBJS)\coredll_nbkbase.obj &\r
+       $(OBJS)\coredll_odcombocmn.obj &\r
        $(OBJS)\coredll_overlaycmn.obj &\r
        $(OBJS)\coredll_ownerdrwcmn.obj &\r
        $(OBJS)\coredll_paper.obj &\r
+       $(OBJS)\coredll_panelcmn.obj &\r
        $(OBJS)\coredll_persist.obj &\r
        $(OBJS)\coredll_pickerbase.obj &\r
        $(OBJS)\coredll_popupcmn.obj &\r
        $(OBJS)\coredll_prntbase.obj &\r
        $(OBJS)\coredll_quantize.obj &\r
+       $(OBJS)\coredll_radiobtncmn.obj &\r
        $(OBJS)\coredll_radiocmn.obj &\r
        $(OBJS)\coredll_rearrangectrl.obj &\r
        $(OBJS)\coredll_rendcmn.obj &\r
        $(OBJS)\coredll_rgncmn.obj &\r
+       $(OBJS)\coredll_scrolbarcmn.obj &\r
        $(OBJS)\coredll_settcmn.obj &\r
        $(OBJS)\coredll_sizer.obj &\r
+       $(OBJS)\coredll_slidercmn.obj &\r
+       $(OBJS)\coredll_spinbtncmn.obj &\r
        $(OBJS)\coredll_spinctrlcmn.obj &\r
        $(OBJS)\coredll_srchcmn.obj &\r
        $(OBJS)\coredll_statbar.obj &\r
+       $(OBJS)\coredll_statbmpcmn.obj &\r
+       $(OBJS)\coredll_statboxcmn.obj &\r
+       $(OBJS)\coredll_statlinecmn.obj &\r
        $(OBJS)\coredll_stattextcmn.obj &\r
        $(OBJS)\coredll_stockitem.obj &\r
        $(OBJS)\coredll_tbarbase.obj &\r
@@ -2246,9 +2336,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_artstd.obj &\r
        $(OBJS)\corelib_arttango.obj &\r
        $(OBJS)\corelib_bmpbase.obj &\r
+       $(OBJS)\corelib_bmpbtncmn.obj &\r
        $(OBJS)\corelib_bookctrl.obj &\r
        $(OBJS)\corelib_btncmn.obj &\r
        $(OBJS)\corelib_cairo.obj &\r
+       $(OBJS)\corelib_calctrlcmn.obj &\r
+       $(OBJS)\corelib_checkboxcmn.obj &\r
+       $(OBJS)\corelib_checklstcmn.obj &\r
        $(OBJS)\corelib_choiccmn.obj &\r
        $(OBJS)\corelib_clipcmn.obj &\r
        $(OBJS)\corelib_clrpickercmn.obj &\r
@@ -2265,6 +2359,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_dcbufcmn.obj &\r
        $(OBJS)\corelib_dcgraph.obj &\r
        $(OBJS)\corelib_dcsvg.obj &\r
+       $(OBJS)\corelib_dirctrlcmn.obj &\r
        $(OBJS)\corelib_dlgcmn.obj &\r
        $(OBJS)\corelib_dndcmn.obj &\r
        $(OBJS)\corelib_dobjcmn.obj &\r
@@ -2291,6 +2386,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_geometry.obj &\r
        $(OBJS)\corelib_gifdecod.obj &\r
        $(OBJS)\corelib_graphcmn.obj &\r
+       $(OBJS)\corelib_gridcmn.obj &\r
        $(OBJS)\corelib_headercolcmn.obj &\r
        $(OBJS)\corelib_headerctrlcmn.obj &\r
        $(OBJS)\corelib_helpbase.obj &\r
@@ -2315,23 +2411,32 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_menucmn.obj &\r
        $(OBJS)\corelib_mousemanager.obj &\r
        $(OBJS)\corelib_nbkbase.obj &\r
+       $(OBJS)\corelib_odcombocmn.obj &\r
        $(OBJS)\corelib_overlaycmn.obj &\r
        $(OBJS)\corelib_ownerdrwcmn.obj &\r
        $(OBJS)\corelib_paper.obj &\r
+       $(OBJS)\corelib_panelcmn.obj &\r
        $(OBJS)\corelib_persist.obj &\r
        $(OBJS)\corelib_pickerbase.obj &\r
        $(OBJS)\corelib_popupcmn.obj &\r
        $(OBJS)\corelib_prntbase.obj &\r
        $(OBJS)\corelib_quantize.obj &\r
+       $(OBJS)\corelib_radiobtncmn.obj &\r
        $(OBJS)\corelib_radiocmn.obj &\r
        $(OBJS)\corelib_rearrangectrl.obj &\r
        $(OBJS)\corelib_rendcmn.obj &\r
        $(OBJS)\corelib_rgncmn.obj &\r
+       $(OBJS)\corelib_scrolbarcmn.obj &\r
        $(OBJS)\corelib_settcmn.obj &\r
        $(OBJS)\corelib_sizer.obj &\r
+       $(OBJS)\corelib_slidercmn.obj &\r
+       $(OBJS)\corelib_spinbtncmn.obj &\r
        $(OBJS)\corelib_spinctrlcmn.obj &\r
        $(OBJS)\corelib_srchcmn.obj &\r
        $(OBJS)\corelib_statbar.obj &\r
+       $(OBJS)\corelib_statbmpcmn.obj &\r
+       $(OBJS)\corelib_statboxcmn.obj &\r
+       $(OBJS)\corelib_statlinecmn.obj &\r
        $(OBJS)\corelib_stattextcmn.obj &\r
        $(OBJS)\corelib_stockitem.obj &\r
        $(OBJS)\corelib_tbarbase.obj &\r
@@ -2496,9 +2601,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_artstd.obj &\r
        $(OBJS)\corelib_arttango.obj &\r
        $(OBJS)\corelib_bmpbase.obj &\r
+       $(OBJS)\corelib_bmpbtncmn.obj &\r
        $(OBJS)\corelib_bookctrl.obj &\r
        $(OBJS)\corelib_btncmn.obj &\r
        $(OBJS)\corelib_cairo.obj &\r
+       $(OBJS)\corelib_calctrlcmn.obj &\r
+       $(OBJS)\corelib_checkboxcmn.obj &\r
+       $(OBJS)\corelib_checklstcmn.obj &\r
        $(OBJS)\corelib_choiccmn.obj &\r
        $(OBJS)\corelib_clipcmn.obj &\r
        $(OBJS)\corelib_clrpickercmn.obj &\r
@@ -2515,6 +2624,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_dcbufcmn.obj &\r
        $(OBJS)\corelib_dcgraph.obj &\r
        $(OBJS)\corelib_dcsvg.obj &\r
+       $(OBJS)\corelib_dirctrlcmn.obj &\r
        $(OBJS)\corelib_dlgcmn.obj &\r
        $(OBJS)\corelib_dndcmn.obj &\r
        $(OBJS)\corelib_dobjcmn.obj &\r
@@ -2541,6 +2651,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_geometry.obj &\r
        $(OBJS)\corelib_gifdecod.obj &\r
        $(OBJS)\corelib_graphcmn.obj &\r
+       $(OBJS)\corelib_gridcmn.obj &\r
        $(OBJS)\corelib_headercolcmn.obj &\r
        $(OBJS)\corelib_headerctrlcmn.obj &\r
        $(OBJS)\corelib_helpbase.obj &\r
@@ -2565,23 +2676,32 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_menucmn.obj &\r
        $(OBJS)\corelib_mousemanager.obj &\r
        $(OBJS)\corelib_nbkbase.obj &\r
+       $(OBJS)\corelib_odcombocmn.obj &\r
        $(OBJS)\corelib_overlaycmn.obj &\r
        $(OBJS)\corelib_ownerdrwcmn.obj &\r
        $(OBJS)\corelib_paper.obj &\r
+       $(OBJS)\corelib_panelcmn.obj &\r
        $(OBJS)\corelib_persist.obj &\r
        $(OBJS)\corelib_pickerbase.obj &\r
        $(OBJS)\corelib_popupcmn.obj &\r
        $(OBJS)\corelib_prntbase.obj &\r
        $(OBJS)\corelib_quantize.obj &\r
+       $(OBJS)\corelib_radiobtncmn.obj &\r
        $(OBJS)\corelib_radiocmn.obj &\r
        $(OBJS)\corelib_rearrangectrl.obj &\r
        $(OBJS)\corelib_rendcmn.obj &\r
        $(OBJS)\corelib_rgncmn.obj &\r
+       $(OBJS)\corelib_scrolbarcmn.obj &\r
        $(OBJS)\corelib_settcmn.obj &\r
        $(OBJS)\corelib_sizer.obj &\r
+       $(OBJS)\corelib_slidercmn.obj &\r
+       $(OBJS)\corelib_spinbtncmn.obj &\r
        $(OBJS)\corelib_spinctrlcmn.obj &\r
        $(OBJS)\corelib_srchcmn.obj &\r
        $(OBJS)\corelib_statbar.obj &\r
+       $(OBJS)\corelib_statbmpcmn.obj &\r
+       $(OBJS)\corelib_statboxcmn.obj &\r
+       $(OBJS)\corelib_statlinecmn.obj &\r
        $(OBJS)\corelib_stattextcmn.obj &\r
        $(OBJS)\corelib_stockitem.obj &\r
        $(OBJS)\corelib_tbarbase.obj &\r
@@ -7547,6 +7667,11 @@ $(OBJS)\monodll_bmpbase.obj :  .AUTODEPEND ..\..\src\common\bmpbase.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
 !endif\r
 \r
+!ifeq USE_GUI 1\r
+$(OBJS)\monodll_bmpbtncmn.obj :  .AUTODEPEND ..\..\src\common\bmpbtncmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
+!endif\r
+\r
 !ifeq USE_GUI 1\r
 $(OBJS)\monodll_bookctrl.obj :  .AUTODEPEND ..\..\src\common\bookctrl.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
@@ -7562,6 +7687,26 @@ $(OBJS)\monodll_cairo.obj :  .AUTODEPEND ..\..\src\common\cairo.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
 !endif\r
 \r
+!ifeq USE_GUI 1\r
+$(OBJS)\monodll_calctrlcmn.obj :  .AUTODEPEND ..\..\src\common\calctrlcmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
+$(OBJS)\monodll_calctrlcmn.obj :  .AUTODEPEND ..\..\src\common\calctrlcmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
+$(OBJS)\monodll_checkboxcmn.obj :  .AUTODEPEND ..\..\src\common\checkboxcmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
+$(OBJS)\monodll_checklstcmn.obj :  .AUTODEPEND ..\..\src\common\checklstcmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
+!endif\r
+\r
 !ifeq USE_GUI 1\r
 $(OBJS)\monodll_choiccmn.obj :  .AUTODEPEND ..\..\src\common\choiccmn.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
@@ -7642,6 +7787,11 @@ $(OBJS)\monodll_dcsvg.obj :  .AUTODEPEND ..\..\src\common\dcsvg.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
 !endif\r
 \r
+!ifeq USE_GUI 1\r
+$(OBJS)\monodll_dirctrlcmn.obj :  .AUTODEPEND ..\..\src\common\dirctrlcmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
+!endif\r
+\r
 !ifeq USE_GUI 1\r
 $(OBJS)\monodll_dlgcmn.obj :  .AUTODEPEND ..\..\src\common\dlgcmn.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
@@ -7772,6 +7922,11 @@ $(OBJS)\monodll_graphcmn.obj :  .AUTODEPEND ..\..\src\common\graphcmn.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
 !endif\r
 \r
+!ifeq USE_GUI 1\r
+$(OBJS)\monodll_gridcmn.obj :  .AUTODEPEND ..\..\src\common\gridcmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
+!endif\r
+\r
 !ifeq USE_GUI 1\r
 $(OBJS)\monodll_headercolcmn.obj :  .AUTODEPEND ..\..\src\common\headercolcmn.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
@@ -7892,6 +8047,11 @@ $(OBJS)\monodll_nbkbase.obj :  .AUTODEPEND ..\..\src\common\nbkbase.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
 !endif\r
 \r
+!ifeq USE_GUI 1\r
+$(OBJS)\monodll_odcombocmn.obj :  .AUTODEPEND ..\..\src\common\odcombocmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
+!endif\r
+\r
 !ifeq USE_GUI 1\r
 $(OBJS)\monodll_overlaycmn.obj :  .AUTODEPEND ..\..\src\common\overlaycmn.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
@@ -7907,6 +8067,11 @@ $(OBJS)\monodll_paper.obj :  .AUTODEPEND ..\..\src\common\paper.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
 !endif\r
 \r
+!ifeq USE_GUI 1\r
+$(OBJS)\monodll_panelcmn.obj :  .AUTODEPEND ..\..\src\common\panelcmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
+!endif\r
+\r
 !ifeq USE_GUI 1\r
 $(OBJS)\monodll_persist.obj :  .AUTODEPEND ..\..\src\common\persist.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
@@ -7932,6 +8097,11 @@ $(OBJS)\monodll_quantize.obj :  .AUTODEPEND ..\..\src\common\quantize.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
 !endif\r
 \r
+!ifeq USE_GUI 1\r
+$(OBJS)\monodll_radiobtncmn.obj :  .AUTODEPEND ..\..\src\common\radiobtncmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
+!endif\r
+\r
 !ifeq USE_GUI 1\r
 $(OBJS)\monodll_radiocmn.obj :  .AUTODEPEND ..\..\src\common\radiocmn.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
@@ -7952,6 +8122,11 @@ $(OBJS)\monodll_rgncmn.obj :  .AUTODEPEND ..\..\src\common\rgncmn.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
 !endif\r
 \r
+!ifeq USE_GUI 1\r
+$(OBJS)\monodll_scrolbarcmn.obj :  .AUTODEPEND ..\..\src\common\scrolbarcmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
+!endif\r
+\r
 !ifeq USE_GUI 1\r
 $(OBJS)\monodll_settcmn.obj :  .AUTODEPEND ..\..\src\common\settcmn.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
@@ -7962,6 +8137,16 @@ $(OBJS)\monodll_sizer.obj :  .AUTODEPEND ..\..\src\common\sizer.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
 !endif\r
 \r
+!ifeq USE_GUI 1\r
+$(OBJS)\monodll_slidercmn.obj :  .AUTODEPEND ..\..\src\common\slidercmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
+$(OBJS)\monodll_spinbtncmn.obj :  .AUTODEPEND ..\..\src\common\spinbtncmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
+!endif\r
+\r
 !ifeq USE_GUI 1\r
 $(OBJS)\monodll_spinctrlcmn.obj :  .AUTODEPEND ..\..\src\common\spinctrlcmn.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
@@ -7977,6 +8162,21 @@ $(OBJS)\monodll_statbar.obj :  .AUTODEPEND ..\..\src\common\statbar.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
 !endif\r
 \r
+!ifeq USE_GUI 1\r
+$(OBJS)\monodll_statbmpcmn.obj :  .AUTODEPEND ..\..\src\common\statbmpcmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
+$(OBJS)\monodll_statboxcmn.obj :  .AUTODEPEND ..\..\src\common\statboxcmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
+$(OBJS)\monodll_statlinecmn.obj :  .AUTODEPEND ..\..\src\common\statlinecmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
+!endif\r
+\r
 !ifeq USE_GUI 1\r
 $(OBJS)\monodll_stattextcmn.obj :  .AUTODEPEND ..\..\src\common\stattextcmn.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
@@ -8232,11 +8432,6 @@ $(OBJS)\monodll_bmpcboxcmn.obj :  .AUTODEPEND ..\..\src\common\bmpcboxcmn.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
 !endif\r
 \r
-!ifeq USE_GUI 1\r
-$(OBJS)\monodll_calctrlcmn.obj :  .AUTODEPEND ..\..\src\common\calctrlcmn.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
-!endif\r
-\r
 !ifeq USE_GUI 1\r
 $(OBJS)\monodll_datavcmn.obj :  .AUTODEPEND ..\..\src\common\datavcmn.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
@@ -9794,6 +9989,11 @@ $(OBJS)\monolib_bmpbase.obj :  .AUTODEPEND ..\..\src\common\bmpbase.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
 !endif\r
 \r
+!ifeq USE_GUI 1\r
+$(OBJS)\monolib_bmpbtncmn.obj :  .AUTODEPEND ..\..\src\common\bmpbtncmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
+!endif\r
+\r
 !ifeq USE_GUI 1\r
 $(OBJS)\monolib_bookctrl.obj :  .AUTODEPEND ..\..\src\common\bookctrl.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
@@ -9809,6 +10009,26 @@ $(OBJS)\monolib_cairo.obj :  .AUTODEPEND ..\..\src\common\cairo.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
 !endif\r
 \r
+!ifeq USE_GUI 1\r
+$(OBJS)\monolib_calctrlcmn.obj :  .AUTODEPEND ..\..\src\common\calctrlcmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
+$(OBJS)\monolib_calctrlcmn.obj :  .AUTODEPEND ..\..\src\common\calctrlcmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
+$(OBJS)\monolib_checkboxcmn.obj :  .AUTODEPEND ..\..\src\common\checkboxcmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
+$(OBJS)\monolib_checklstcmn.obj :  .AUTODEPEND ..\..\src\common\checklstcmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
+!endif\r
+\r
 !ifeq USE_GUI 1\r
 $(OBJS)\monolib_choiccmn.obj :  .AUTODEPEND ..\..\src\common\choiccmn.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
@@ -9889,6 +10109,11 @@ $(OBJS)\monolib_dcsvg.obj :  .AUTODEPEND ..\..\src\common\dcsvg.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
 !endif\r
 \r
+!ifeq USE_GUI 1\r
+$(OBJS)\monolib_dirctrlcmn.obj :  .AUTODEPEND ..\..\src\common\dirctrlcmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
+!endif\r
+\r
 !ifeq USE_GUI 1\r
 $(OBJS)\monolib_dlgcmn.obj :  .AUTODEPEND ..\..\src\common\dlgcmn.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
@@ -10019,6 +10244,11 @@ $(OBJS)\monolib_graphcmn.obj :  .AUTODEPEND ..\..\src\common\graphcmn.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
 !endif\r
 \r
+!ifeq USE_GUI 1\r
+$(OBJS)\monolib_gridcmn.obj :  .AUTODEPEND ..\..\src\common\gridcmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
+!endif\r
+\r
 !ifeq USE_GUI 1\r
 $(OBJS)\monolib_headercolcmn.obj :  .AUTODEPEND ..\..\src\common\headercolcmn.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
@@ -10139,6 +10369,11 @@ $(OBJS)\monolib_nbkbase.obj :  .AUTODEPEND ..\..\src\common\nbkbase.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
 !endif\r
 \r
+!ifeq USE_GUI 1\r
+$(OBJS)\monolib_odcombocmn.obj :  .AUTODEPEND ..\..\src\common\odcombocmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
+!endif\r
+\r
 !ifeq USE_GUI 1\r
 $(OBJS)\monolib_overlaycmn.obj :  .AUTODEPEND ..\..\src\common\overlaycmn.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
@@ -10154,6 +10389,11 @@ $(OBJS)\monolib_paper.obj :  .AUTODEPEND ..\..\src\common\paper.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
 !endif\r
 \r
+!ifeq USE_GUI 1\r
+$(OBJS)\monolib_panelcmn.obj :  .AUTODEPEND ..\..\src\common\panelcmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
+!endif\r
+\r
 !ifeq USE_GUI 1\r
 $(OBJS)\monolib_persist.obj :  .AUTODEPEND ..\..\src\common\persist.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
@@ -10179,6 +10419,11 @@ $(OBJS)\monolib_quantize.obj :  .AUTODEPEND ..\..\src\common\quantize.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
 !endif\r
 \r
+!ifeq USE_GUI 1\r
+$(OBJS)\monolib_radiobtncmn.obj :  .AUTODEPEND ..\..\src\common\radiobtncmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
+!endif\r
+\r
 !ifeq USE_GUI 1\r
 $(OBJS)\monolib_radiocmn.obj :  .AUTODEPEND ..\..\src\common\radiocmn.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
@@ -10199,6 +10444,11 @@ $(OBJS)\monolib_rgncmn.obj :  .AUTODEPEND ..\..\src\common\rgncmn.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
 !endif\r
 \r
+!ifeq USE_GUI 1\r
+$(OBJS)\monolib_scrolbarcmn.obj :  .AUTODEPEND ..\..\src\common\scrolbarcmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
+!endif\r
+\r
 !ifeq USE_GUI 1\r
 $(OBJS)\monolib_settcmn.obj :  .AUTODEPEND ..\..\src\common\settcmn.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
@@ -10209,6 +10459,16 @@ $(OBJS)\monolib_sizer.obj :  .AUTODEPEND ..\..\src\common\sizer.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
 !endif\r
 \r
+!ifeq USE_GUI 1\r
+$(OBJS)\monolib_slidercmn.obj :  .AUTODEPEND ..\..\src\common\slidercmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
+$(OBJS)\monolib_spinbtncmn.obj :  .AUTODEPEND ..\..\src\common\spinbtncmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
+!endif\r
+\r
 !ifeq USE_GUI 1\r
 $(OBJS)\monolib_spinctrlcmn.obj :  .AUTODEPEND ..\..\src\common\spinctrlcmn.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
@@ -10224,6 +10484,21 @@ $(OBJS)\monolib_statbar.obj :  .AUTODEPEND ..\..\src\common\statbar.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
 !endif\r
 \r
+!ifeq USE_GUI 1\r
+$(OBJS)\monolib_statbmpcmn.obj :  .AUTODEPEND ..\..\src\common\statbmpcmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
+$(OBJS)\monolib_statboxcmn.obj :  .AUTODEPEND ..\..\src\common\statboxcmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
+$(OBJS)\monolib_statlinecmn.obj :  .AUTODEPEND ..\..\src\common\statlinecmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
+!endif\r
+\r
 !ifeq USE_GUI 1\r
 $(OBJS)\monolib_stattextcmn.obj :  .AUTODEPEND ..\..\src\common\stattextcmn.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
@@ -10479,11 +10754,6 @@ $(OBJS)\monolib_bmpcboxcmn.obj :  .AUTODEPEND ..\..\src\common\bmpcboxcmn.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
 !endif\r
 \r
-!ifeq USE_GUI 1\r
-$(OBJS)\monolib_calctrlcmn.obj :  .AUTODEPEND ..\..\src\common\calctrlcmn.cpp\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
-!endif\r
-\r
 !ifeq USE_GUI 1\r
 $(OBJS)\monolib_datavcmn.obj :  .AUTODEPEND ..\..\src\common\datavcmn.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
@@ -12032,6 +12302,11 @@ $(OBJS)\coredll_bmpbase.obj :  .AUTODEPEND ..\..\src\common\bmpbase.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
 !endif\r
 \r
+!ifeq USE_GUI 1\r
+$(OBJS)\coredll_bmpbtncmn.obj :  .AUTODEPEND ..\..\src\common\bmpbtncmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
+!endif\r
+\r
 !ifeq USE_GUI 1\r
 $(OBJS)\coredll_bookctrl.obj :  .AUTODEPEND ..\..\src\common\bookctrl.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
@@ -12047,6 +12322,21 @@ $(OBJS)\coredll_cairo.obj :  .AUTODEPEND ..\..\src\common\cairo.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
 !endif\r
 \r
+!ifeq USE_GUI 1\r
+$(OBJS)\coredll_calctrlcmn.obj :  .AUTODEPEND ..\..\src\common\calctrlcmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
+$(OBJS)\coredll_checkboxcmn.obj :  .AUTODEPEND ..\..\src\common\checkboxcmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
+$(OBJS)\coredll_checklstcmn.obj :  .AUTODEPEND ..\..\src\common\checklstcmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
+!endif\r
+\r
 !ifeq USE_GUI 1\r
 $(OBJS)\coredll_choiccmn.obj :  .AUTODEPEND ..\..\src\common\choiccmn.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
@@ -12127,6 +12417,11 @@ $(OBJS)\coredll_dcsvg.obj :  .AUTODEPEND ..\..\src\common\dcsvg.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
 !endif\r
 \r
+!ifeq USE_GUI 1\r
+$(OBJS)\coredll_dirctrlcmn.obj :  .AUTODEPEND ..\..\src\common\dirctrlcmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
+!endif\r
+\r
 !ifeq USE_GUI 1\r
 $(OBJS)\coredll_dlgcmn.obj :  .AUTODEPEND ..\..\src\common\dlgcmn.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
@@ -12257,6 +12552,11 @@ $(OBJS)\coredll_graphcmn.obj :  .AUTODEPEND ..\..\src\common\graphcmn.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
 !endif\r
 \r
+!ifeq USE_GUI 1\r
+$(OBJS)\coredll_gridcmn.obj :  .AUTODEPEND ..\..\src\common\gridcmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
+!endif\r
+\r
 !ifeq USE_GUI 1\r
 $(OBJS)\coredll_headercolcmn.obj :  .AUTODEPEND ..\..\src\common\headercolcmn.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
@@ -12377,6 +12677,11 @@ $(OBJS)\coredll_nbkbase.obj :  .AUTODEPEND ..\..\src\common\nbkbase.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
 !endif\r
 \r
+!ifeq USE_GUI 1\r
+$(OBJS)\coredll_odcombocmn.obj :  .AUTODEPEND ..\..\src\common\odcombocmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
+!endif\r
+\r
 !ifeq USE_GUI 1\r
 $(OBJS)\coredll_overlaycmn.obj :  .AUTODEPEND ..\..\src\common\overlaycmn.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
@@ -12392,6 +12697,11 @@ $(OBJS)\coredll_paper.obj :  .AUTODEPEND ..\..\src\common\paper.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
 !endif\r
 \r
+!ifeq USE_GUI 1\r
+$(OBJS)\coredll_panelcmn.obj :  .AUTODEPEND ..\..\src\common\panelcmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
+!endif\r
+\r
 !ifeq USE_GUI 1\r
 $(OBJS)\coredll_persist.obj :  .AUTODEPEND ..\..\src\common\persist.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
@@ -12417,6 +12727,11 @@ $(OBJS)\coredll_quantize.obj :  .AUTODEPEND ..\..\src\common\quantize.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
 !endif\r
 \r
+!ifeq USE_GUI 1\r
+$(OBJS)\coredll_radiobtncmn.obj :  .AUTODEPEND ..\..\src\common\radiobtncmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
+!endif\r
+\r
 !ifeq USE_GUI 1\r
 $(OBJS)\coredll_radiocmn.obj :  .AUTODEPEND ..\..\src\common\radiocmn.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
@@ -12437,6 +12752,11 @@ $(OBJS)\coredll_rgncmn.obj :  .AUTODEPEND ..\..\src\common\rgncmn.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
 !endif\r
 \r
+!ifeq USE_GUI 1\r
+$(OBJS)\coredll_scrolbarcmn.obj :  .AUTODEPEND ..\..\src\common\scrolbarcmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
+!endif\r
+\r
 !ifeq USE_GUI 1\r
 $(OBJS)\coredll_settcmn.obj :  .AUTODEPEND ..\..\src\common\settcmn.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
@@ -12447,6 +12767,16 @@ $(OBJS)\coredll_sizer.obj :  .AUTODEPEND ..\..\src\common\sizer.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
 !endif\r
 \r
+!ifeq USE_GUI 1\r
+$(OBJS)\coredll_slidercmn.obj :  .AUTODEPEND ..\..\src\common\slidercmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
+$(OBJS)\coredll_spinbtncmn.obj :  .AUTODEPEND ..\..\src\common\spinbtncmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
+!endif\r
+\r
 !ifeq USE_GUI 1\r
 $(OBJS)\coredll_spinctrlcmn.obj :  .AUTODEPEND ..\..\src\common\spinctrlcmn.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
@@ -12462,6 +12792,21 @@ $(OBJS)\coredll_statbar.obj :  .AUTODEPEND ..\..\src\common\statbar.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
 !endif\r
 \r
+!ifeq USE_GUI 1\r
+$(OBJS)\coredll_statbmpcmn.obj :  .AUTODEPEND ..\..\src\common\statbmpcmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
+$(OBJS)\coredll_statboxcmn.obj :  .AUTODEPEND ..\..\src\common\statboxcmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
+$(OBJS)\coredll_statlinecmn.obj :  .AUTODEPEND ..\..\src\common\statlinecmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
+!endif\r
+\r
 !ifeq USE_GUI 1\r
 $(OBJS)\coredll_stattextcmn.obj :  .AUTODEPEND ..\..\src\common\stattextcmn.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
@@ -13347,6 +13692,11 @@ $(OBJS)\corelib_bmpbase.obj :  .AUTODEPEND ..\..\src\common\bmpbase.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
 !endif\r
 \r
+!ifeq USE_GUI 1\r
+$(OBJS)\corelib_bmpbtncmn.obj :  .AUTODEPEND ..\..\src\common\bmpbtncmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
+!endif\r
+\r
 !ifeq USE_GUI 1\r
 $(OBJS)\corelib_bookctrl.obj :  .AUTODEPEND ..\..\src\common\bookctrl.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
@@ -13362,6 +13712,21 @@ $(OBJS)\corelib_cairo.obj :  .AUTODEPEND ..\..\src\common\cairo.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
 !endif\r
 \r
+!ifeq USE_GUI 1\r
+$(OBJS)\corelib_calctrlcmn.obj :  .AUTODEPEND ..\..\src\common\calctrlcmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
+$(OBJS)\corelib_checkboxcmn.obj :  .AUTODEPEND ..\..\src\common\checkboxcmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
+$(OBJS)\corelib_checklstcmn.obj :  .AUTODEPEND ..\..\src\common\checklstcmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
+!endif\r
+\r
 !ifeq USE_GUI 1\r
 $(OBJS)\corelib_choiccmn.obj :  .AUTODEPEND ..\..\src\common\choiccmn.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
@@ -13442,6 +13807,11 @@ $(OBJS)\corelib_dcsvg.obj :  .AUTODEPEND ..\..\src\common\dcsvg.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
 !endif\r
 \r
+!ifeq USE_GUI 1\r
+$(OBJS)\corelib_dirctrlcmn.obj :  .AUTODEPEND ..\..\src\common\dirctrlcmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
+!endif\r
+\r
 !ifeq USE_GUI 1\r
 $(OBJS)\corelib_dlgcmn.obj :  .AUTODEPEND ..\..\src\common\dlgcmn.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
@@ -13572,6 +13942,11 @@ $(OBJS)\corelib_graphcmn.obj :  .AUTODEPEND ..\..\src\common\graphcmn.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
 !endif\r
 \r
+!ifeq USE_GUI 1\r
+$(OBJS)\corelib_gridcmn.obj :  .AUTODEPEND ..\..\src\common\gridcmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
+!endif\r
+\r
 !ifeq USE_GUI 1\r
 $(OBJS)\corelib_headercolcmn.obj :  .AUTODEPEND ..\..\src\common\headercolcmn.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
@@ -13692,6 +14067,11 @@ $(OBJS)\corelib_nbkbase.obj :  .AUTODEPEND ..\..\src\common\nbkbase.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
 !endif\r
 \r
+!ifeq USE_GUI 1\r
+$(OBJS)\corelib_odcombocmn.obj :  .AUTODEPEND ..\..\src\common\odcombocmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
+!endif\r
+\r
 !ifeq USE_GUI 1\r
 $(OBJS)\corelib_overlaycmn.obj :  .AUTODEPEND ..\..\src\common\overlaycmn.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
@@ -13707,6 +14087,11 @@ $(OBJS)\corelib_paper.obj :  .AUTODEPEND ..\..\src\common\paper.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
 !endif\r
 \r
+!ifeq USE_GUI 1\r
+$(OBJS)\corelib_panelcmn.obj :  .AUTODEPEND ..\..\src\common\panelcmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
+!endif\r
+\r
 !ifeq USE_GUI 1\r
 $(OBJS)\corelib_persist.obj :  .AUTODEPEND ..\..\src\common\persist.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
@@ -13732,6 +14117,11 @@ $(OBJS)\corelib_quantize.obj :  .AUTODEPEND ..\..\src\common\quantize.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
 !endif\r
 \r
+!ifeq USE_GUI 1\r
+$(OBJS)\corelib_radiobtncmn.obj :  .AUTODEPEND ..\..\src\common\radiobtncmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
+!endif\r
+\r
 !ifeq USE_GUI 1\r
 $(OBJS)\corelib_radiocmn.obj :  .AUTODEPEND ..\..\src\common\radiocmn.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
@@ -13752,6 +14142,11 @@ $(OBJS)\corelib_rgncmn.obj :  .AUTODEPEND ..\..\src\common\rgncmn.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
 !endif\r
 \r
+!ifeq USE_GUI 1\r
+$(OBJS)\corelib_scrolbarcmn.obj :  .AUTODEPEND ..\..\src\common\scrolbarcmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
+!endif\r
+\r
 !ifeq USE_GUI 1\r
 $(OBJS)\corelib_settcmn.obj :  .AUTODEPEND ..\..\src\common\settcmn.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
@@ -13762,6 +14157,16 @@ $(OBJS)\corelib_sizer.obj :  .AUTODEPEND ..\..\src\common\sizer.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
 !endif\r
 \r
+!ifeq USE_GUI 1\r
+$(OBJS)\corelib_slidercmn.obj :  .AUTODEPEND ..\..\src\common\slidercmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
+$(OBJS)\corelib_spinbtncmn.obj :  .AUTODEPEND ..\..\src\common\spinbtncmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
+!endif\r
+\r
 !ifeq USE_GUI 1\r
 $(OBJS)\corelib_spinctrlcmn.obj :  .AUTODEPEND ..\..\src\common\spinctrlcmn.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
@@ -13777,6 +14182,21 @@ $(OBJS)\corelib_statbar.obj :  .AUTODEPEND ..\..\src\common\statbar.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
 !endif\r
 \r
+!ifeq USE_GUI 1\r
+$(OBJS)\corelib_statbmpcmn.obj :  .AUTODEPEND ..\..\src\common\statbmpcmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
+$(OBJS)\corelib_statboxcmn.obj :  .AUTODEPEND ..\..\src\common\statboxcmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
+$(OBJS)\corelib_statlinecmn.obj :  .AUTODEPEND ..\..\src\common\statlinecmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
+!endif\r
+\r
 !ifeq USE_GUI 1\r
 $(OBJS)\corelib_stattextcmn.obj :  .AUTODEPEND ..\..\src\common\stattextcmn.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
index a8b526d99690e10eb1659df520014982c876bda6..07296167504886f4cb27ae31b5a816505f08911a 100644 (file)
@@ -1455,6 +1455,10 @@ SOURCE=..\..\include\wx\regex.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\include\wx\rtti.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\include\wx\scopedarray.h\r
 # End Source File\r
 # Begin Source File\r
@@ -1655,10 +1659,26 @@ SOURCE=..\..\include\wx\xti.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\include\wx\xtictor.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\xtihandler.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\xtiprop.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\include\wx\xtistrm.h\r
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\include\wx\xtitypes.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\include\wx\zipstrm.h\r
 # End Source File\r
 # Begin Source File\r
index c6ae284ca66e3fd14756efa72b7971de92605dc0..c4b6d2e12e4fdd9c87aa7de33ab64b91d2bf089d 100644 (file)
@@ -276,6 +276,10 @@ SOURCE=..\..\src\common\bmpbase.cpp
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\src\common\bmpbtncmn.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\src\common\bookctrl.cpp\r
 # End Source File\r
 # Begin Source File\r
@@ -288,6 +292,18 @@ SOURCE=..\..\src\common\cairo.cpp
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\src\common\calctrlcmn.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\common\checkboxcmn.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\common\checklstcmn.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\src\common\choiccmn.cpp\r
 # End Source File\r
 # Begin Source File\r
@@ -352,6 +368,10 @@ SOURCE=..\..\src\common\dcsvg.cpp
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\src\common\dirctrlcmn.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\src\common\dlgcmn.cpp\r
 # End Source File\r
 # Begin Source File\r
@@ -466,6 +486,10 @@ SOURCE=..\..\src\common\graphcmn.cpp
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\src\common\gridcmn.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\src\common\headercolcmn.cpp\r
 # End Source File\r
 # Begin Source File\r
@@ -566,6 +590,10 @@ SOURCE=..\..\src\common\nbkbase.cpp
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\src\common\odcombocmn.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\src\common\overlaycmn.cpp\r
 # End Source File\r
 # Begin Source File\r
@@ -574,6 +602,10 @@ SOURCE=..\..\src\common\ownerdrwcmn.cpp
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\src\common\panelcmn.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\src\common\paper.cpp\r
 # End Source File\r
 # Begin Source File\r
@@ -598,6 +630,10 @@ SOURCE=..\..\src\common\quantize.cpp
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\src\common\radiobtncmn.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\src\common\radiocmn.cpp\r
 # End Source File\r
 # Begin Source File\r
@@ -614,6 +650,10 @@ SOURCE=..\..\src\common\rgncmn.cpp
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\src\common\scrolbarcmn.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\src\common\settcmn.cpp\r
 # End Source File\r
 # Begin Source File\r
@@ -622,6 +662,14 @@ SOURCE=..\..\src\common\sizer.cpp
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\src\common\slidercmn.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\common\spinbtncmn.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\src\common\spinctrlcmn.cpp\r
 # End Source File\r
 # Begin Source File\r
@@ -634,6 +682,18 @@ SOURCE=..\..\src\common\statbar.cpp
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\src\common\statbmpcmn.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\common\statboxcmn.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\common\statlinecmn.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\src\common\stattextcmn.cpp\r
 # End Source File\r
 # Begin Source File\r
index 5a0cb518e044cea0e14b196292e889220b7cd5b3..dc7b035939eb16b695bd49b02fae4a58b5e3c86c 100644 (file)
                        <File\r
                                RelativePath="..\..\include\wx\regex.h">\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\rtti.h">\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\scopedarray.h">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\xti.h">\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xtictor.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xtihandler.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xtiprop.h">\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\xtistrm.h">\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xtitypes.h">\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\zipstrm.h">\r
                        </File>\r
index 1e7264a86ca33b1e65ea664b61563aafe90df7ce..a13707176772633d3a0d86e059264c08d3288247 100644 (file)
                        <File\r
                                RelativePath="..\..\src\common\bmpbase.cpp">\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\bmpbtncmn.cpp">\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\common\bookctrl.cpp">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\common\cairo.cpp">\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\calctrlcmn.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\checkboxcmn.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\checklstcmn.cpp">\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\common\choiccmn.cpp">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\common\dcsvg.cpp">\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\dirctrlcmn.cpp">\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\common\dlgcmn.cpp">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\common\graphcmn.cpp">\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\gridcmn.cpp">\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\common\headercolcmn.cpp">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\common\nbkbase.cpp">\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\odcombocmn.cpp">\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\common\overlaycmn.cpp">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\common\ownerdrwcmn.cpp">\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\panelcmn.cpp">\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\common\paper.cpp">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\common\quantize.cpp">\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\radiobtncmn.cpp">\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\common\radiocmn.cpp">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\common\rgncmn.cpp">\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\scrolbarcmn.cpp">\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\common\settcmn.cpp">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\common\sizer.cpp">\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\slidercmn.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\spinbtncmn.cpp">\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\common\spinctrlcmn.cpp">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\common\statbar.cpp">\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\statbmpcmn.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\statboxcmn.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\statlinecmn.cpp">\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\common\stattextcmn.cpp">\r
                        </File>\r
index bc510ea6ecaed60914826f391aeab53ef412f8eb..0c8af84704ed984e21918140561b49bb8b142a0b 100644 (file)
                                RelativePath="..\..\include\wx\regex.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\rtti.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\scopedarray.h"\r
                                >\r
                                RelativePath="..\..\include\wx\xti.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xtictor.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xtihandler.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xtiprop.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\xtistrm.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xtitypes.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\zipstrm.h"\r
                                >\r
index d0215bf8489244c1ab159d85981a3f210fdefc3e..1c1586ee31ded1f846fbc4e00639b590b74a9344 100644 (file)
                                RelativePath="..\..\src\common\bmpbase.cpp"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\bmpbtncmn.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\common\bookctrl.cpp"\r
                                >\r
                                RelativePath="..\..\src\common\cairo.cpp"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\calctrlcmn.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\checkboxcmn.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\checklstcmn.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\common\choiccmn.cpp"\r
                                >\r
                                RelativePath="..\..\src\common\dcsvg.cpp"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\dirctrlcmn.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\common\dlgcmn.cpp"\r
                                >\r
                                RelativePath="..\..\src\common\graphcmn.cpp"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\gridcmn.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\common\headercolcmn.cpp"\r
                                >\r
                                RelativePath="..\..\src\common\nbkbase.cpp"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\odcombocmn.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\common\overlaycmn.cpp"\r
                                >\r
                                RelativePath="..\..\src\common\ownerdrwcmn.cpp"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\panelcmn.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\common\paper.cpp"\r
                                >\r
                                RelativePath="..\..\src\common\quantize.cpp"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\radiobtncmn.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\common\radiocmn.cpp"\r
                                >\r
                                RelativePath="..\..\src\common\rgncmn.cpp"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\scrolbarcmn.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\common\settcmn.cpp"\r
                                >\r
                                RelativePath="..\..\src\common\sizer.cpp"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\slidercmn.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\spinbtncmn.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\common\spinctrlcmn.cpp"\r
                                >\r
                                RelativePath="..\..\src\common\statbar.cpp"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\statbmpcmn.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\statboxcmn.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\statlinecmn.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\common\stattextcmn.cpp"\r
                                >\r
index ebbe7e76690af3abca26cdf99d4903037052e0d2..652986914857cdce0bf6e0e1b832a32ee8a03d25 100644 (file)
                                RelativePath="..\..\include\wx\regex.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\rtti.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\scopedarray.h"\r
                                >\r
                                RelativePath="..\..\include\wx\xti.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xtictor.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xtihandler.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xtiprop.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\xtistrm.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xtitypes.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\zipstrm.h"\r
                                >\r
index ed98e2162dabd033ca0b782b651c665aad9bf4d1..cab5f59b3df6c12f1448ddc4c87c4be8b59eb515 100644 (file)
                                RelativePath="..\..\src\common\bmpbase.cpp"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\bmpbtncmn.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\common\bookctrl.cpp"\r
                                >\r
                                RelativePath="..\..\src\common\cairo.cpp"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\calctrlcmn.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\checkboxcmn.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\checklstcmn.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\common\choiccmn.cpp"\r
                                >\r
                                RelativePath="..\..\src\common\dcsvg.cpp"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\dirctrlcmn.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\common\dlgcmn.cpp"\r
                                >\r
                                RelativePath="..\..\src\common\graphcmn.cpp"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\gridcmn.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\common\headercolcmn.cpp"\r
                                >\r
                                RelativePath="..\..\src\common\nbkbase.cpp"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\odcombocmn.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\common\overlaycmn.cpp"\r
                                >\r
                                RelativePath="..\..\src\common\ownerdrwcmn.cpp"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\panelcmn.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\common\paper.cpp"\r
                                >\r
                                RelativePath="..\..\src\common\quantize.cpp"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\radiobtncmn.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\common\radiocmn.cpp"\r
                                >\r
                                RelativePath="..\..\src\common\rgncmn.cpp"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\scrolbarcmn.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\common\settcmn.cpp"\r
                                >\r
                                RelativePath="..\..\src\common\sizer.cpp"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\slidercmn.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\spinbtncmn.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\common\spinctrlcmn.cpp"\r
                                >\r
                                RelativePath="..\..\src\common\statbar.cpp"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\statbmpcmn.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\statboxcmn.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\statlinecmn.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\common\stattextcmn.cpp"\r
                                >\r
index cd23f910209769fe1b7737b57b8ec2cfed401199..1e31dee1ba1b14475c2a6b1a2acfc3b1970f2cd1 100644 (file)
@@ -1439,6 +1439,95 @@ typedef double wxDouble;
     #endif
 #endif
 
+/*  ---------------------------------------------------------------------------- */
+/*  XTI workarounds for dummy compilers */
+/*  ---------------------------------------------------------------------------- */
+
+#if defined(__GNUC__) && !wxCHECK_GCC_VERSION( 3, 4 )
+    // GCC <= 3.4 has buggy template support
+#  define wxUSE_MEMBER_TEMPLATES 0
+#endif
+
+#if defined(_MSC_VER) && _MSC_VER <= 1200
+    // MSVC <= 6.0 has buggy template support
+#  define wxUSE_MEMBER_TEMPLATES 0
+#  define wxUSE_FUNC_TEMPLATE_POINTER 0
+#endif
+
+#ifndef wxUSE_MEMBER_TEMPLATES
+#  define wxUSE_MEMBER_TEMPLATES 1
+#endif
+
+#ifndef wxUSE_FUNC_TEMPLATE_POINTER
+#  define wxUSE_FUNC_TEMPLATE_POINTER 1
+#endif
+
+#if wxUSE_MEMBER_TEMPLATES
+#  define wxTEMPLATED_MEMBER_CALL( method, type ) method<type>()
+#  define wxTEMPLATED_MEMBER_FIX( type )
+#else
+#  define wxTEMPLATED_MEMBER_CALL( method, type ) method((type*)NULL)
+#  define wxTEMPLATED_MEMBER_FIX( type ) type* =NULL
+#endif
+
+#if defined(_MSC_VER) && _MSC_VER <= 1200
+#  define wxTEMPLATED_FUNCTION_FIX( type ), wxTEMPLATED_MEMBER_FIX(type)
+#  define wxINFUNC_CLASS_TYPE_FIX( type ) typedef type type;
+#else
+#  define wxTEMPLATED_FUNCTION_FIX( type )
+#  define wxINFUNC_CLASS_TYPE_FIX( type )
+#endif
+
+#if wxUSE_FUNC_TEMPLATE_POINTER
+#  define wxTO_STRING(type) wxToStringConverter<type>
+#  define wxTO_STRING_IMP(type)
+#  define wxFROM_STRING(type) wxFromStringConverter<type>
+#  define wxFROM_STRING_IMP(type)
+#else
+#  define wxTO_STRING(type) ToString##type
+#  define wxTO_STRING_IMP(type) \
+    inline void ToString##type( const wxVariantBase& data, wxString &result ) \
+        { wxToStringConverter<type>(data, result); }
+
+#  define wxFROM_STRING(type) FromString##type
+#  define wxFROM_STRING_IMP(type) \
+    inline void FromString##type( const wxString& data, wxVariantBase &result ) \
+        { wxFromStringConverter<type>(data, result); }
+#endif
+
+// XTI helper macro. This one is used both by xti.h and rtti.h and
+// thus needs to go in a common header to avoid redundancy.
+#define wxDECLARE_CLASS_INFO_ITERATORS()                                     \
+    class WXDLLIMPEXP_BASE const_iterator                                    \
+    {                                                                        \
+        typedef wxHashTable_Node Node;                                       \
+    public:                                                                  \
+        typedef const wxClassInfo* value_type;                               \
+        typedef const value_type& const_reference;                           \
+        typedef const_iterator itor;                                         \
+        typedef value_type* ptr_type;                                        \
+                                                                             \
+        Node* m_node;                                                        \
+        wxHashTable* m_table;                                                \
+    public:                                                                  \
+        typedef const_reference reference_type;                              \
+        typedef ptr_type pointer_type;                                       \
+                                                                             \
+        const_iterator(Node* node, wxHashTable* table)                       \
+            : m_node(node), m_table(table) { }                               \
+        const_iterator() : m_node(NULL), m_table(NULL) { }                   \
+        value_type operator*() const;                                        \
+        itor& operator++();                                                  \
+        const itor operator++(int);                                          \
+        bool operator!=(const itor& it) const                                \
+            { return it.m_node != m_node; }                                  \
+        bool operator==(const itor& it) const                                \
+            { return it.m_node == m_node; }                                  \
+    };                                                                       \
+                                                                             \
+    static const_iterator begin_classinfo();                                 \
+    static const_iterator end_classinfo();
+
 /*  ---------------------------------------------------------------------------- */
 /*  Geometric flags */
 /*  ---------------------------------------------------------------------------- */
index def2feb0d848c3169b999036cfe296c9550ded42..0b2ffe8dc8cbea9b43b6197d3aacbbe13db14fd1 100644 (file)
@@ -153,7 +153,9 @@ private :
     unsigned long m_data;
 };
 
-#define WX_DEFINE_FLAGS( flags ) \
+#if wxUSE_EXTENDED_RTTI
+
+#define wxDEFINE_FLAGS( flags ) \
     class WXDLLIMPEXP_BASE flags \
     {\
     public : \
@@ -162,4 +164,14 @@ private :
         bool operator ==(const flags &rhs) const { return m_data == rhs.m_data; }\
     } ;
 
+#else
+
+#define wxDEFINE_FLAGS( flags )
+
+#endif
+
+#if WXWIN_COMPATIBILITY_2_8
+    #define WX_DEFINE_FLAGS     wxDEFINE_FLAGS
+#endif
+
 #endif
index accb6f1d7ea8b32a3bb247c7b4c1ba0bafba00a7..50bdda27969a08301369743fbbc11dea250ff298 100644 (file)
@@ -392,6 +392,39 @@ protected:
     wxDECLARE_NO_COPY_CLASS(wxMenuBase);
 };
 
+#if wxUSE_EXTENDED_RTTI    
+
+// ----------------------------------------------------------------------------
+// XTI accessor
+// ----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxMenuInfo : public wxObject
+{
+public:
+    wxMenuInfo() { m_menu = NULL; }
+    virtual ~wxMenuInfo() { }
+    
+    bool Create( wxMenu *menu, const wxString &title )
+    { 
+        m_menu = menu; 
+        m_title = title; 
+        return true;
+    }
+    
+    wxMenu* GetMenu() const { return m_menu; }
+    wxString GetTitle() const { return m_title; }
+    
+private:
+    wxMenu *m_menu;
+    wxString m_title;
+    
+    DECLARE_DYNAMIC_CLASS(wxMenuInfo)
+};
+
+WX_DECLARE_EXPORTED_LIST(wxMenuInfo, wxMenuInfoList );
+
+#endif
+
 // ----------------------------------------------------------------------------
 // wxMenuBar
 // ----------------------------------------------------------------------------
@@ -508,6 +541,13 @@ public:
 
     virtual bool CanBeOutsideClientArea() const { return true; }
 
+#if wxUSE_EXTENDED_RTTI    
+    // XTI helpers:
+    bool AppendMenuInfo( const wxMenuInfo *info )
+    { return Append( info->GetMenu(), info->GetTitle() ); }
+    const wxMenuInfoList& GetMenuInfos() const;
+#endif
+    
 #if WXWIN_COMPATIBILITY_2_8
     // get or change the label of the menu at given position
     // Deprecated in favour of SetMenuLabel
@@ -520,6 +560,11 @@ protected:
     // the list of all our menus
     wxMenuList m_menus;
 
+#if wxUSE_EXTENDED_RTTI    
+    // used by XTI
+    wxMenuInfoList m_menuInfos;
+#endif
+    
     // the frame we are attached to (may be NULL)
     wxFrame *m_menuBarFrame;
 
index 7810274385e339b43c913e90ed4bc4f750b4be12..23111563923702c386a8388d6ab5638a5aab1ae0 100644 (file)
@@ -56,6 +56,48 @@ typedef wxWindow wxNotebookPage;  // so far, any window can be a page
 
 extern WXDLLIMPEXP_DATA_CORE(const char) wxNotebookNameStr[];
 
+#if wxUSE_EXTENDED_RTTI
+
+// ----------------------------------------------------------------------------
+// XTI accessor
+// ----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxNotebookPageInfo : public wxObject
+{
+public:
+    wxNotebookPageInfo() { m_page = NULL; m_imageId = -1; m_selected = false; }
+    virtual ~wxNotebookPageInfo() { }
+    
+    bool Create(wxNotebookPage *page,
+                const wxString& text,
+                bool selected,
+                int imageId)
+    {
+        m_page = page;
+        m_text = text;
+        m_selected = selected;
+        m_imageId = imageId;
+        return true;
+    }
+    
+    wxNotebookPage* GetPage() const { return m_page; }
+    wxString GetText() const { return m_text; }
+    bool GetSelected() const { return m_selected; }
+    int GetImageId() const { return m_imageId; }
+    
+private:
+    wxNotebookPage *m_page;
+    wxString m_text;
+    bool m_selected;
+    int m_imageId;
+    
+    DECLARE_DYNAMIC_CLASS(wxNotebookPageInfo)
+};
+
+WX_DECLARE_EXPORTED_LIST(wxNotebookPageInfo, wxNotebookPageInfoList );
+
+#endif
+
 // ----------------------------------------------------------------------------
 // wxNotebookBase: define wxNotebook interface
 // ----------------------------------------------------------------------------
@@ -103,7 +145,16 @@ public:
     // focus because we have tabs
     virtual bool AcceptsFocus() const { return wxControl::AcceptsFocus(); }
 
+#if wxUSE_EXTENDED_RTTI    
+    // XTI accessors
+    virtual void AddPageInfo( wxNotebookPageInfo* info );
+    virtual const wxNotebookPageInfoList& GetPageInfos() const;
+#endif
+        
 protected:
+#if wxUSE_EXTENDED_RTTI    
+    wxNotebookPageInfoList m_pageInfos;
+#endif    
     wxDECLARE_NO_COPY_CLASS(wxNotebookBase);
 };
 
index 5c14734fdd78646455b28bdfe037086f2f097451..26bfc5b1e4f5ef426aae3852bba8228f3c55c1f6 100644 (file)
 
 #include "wx/memory.h"
 
-class WXDLLIMPEXP_FWD_BASE wxObject;
-class WXDLLIMPEXP_FWD_BASE wxString;
-
-#ifndef wxUSE_EXTENDED_RTTI
-#define wxUSE_EXTENDED_RTTI 0
-#endif
-
-#define wxDECLARE_CLASS_INFO_ITERATORS()                                     \
-    class WXDLLIMPEXP_BASE const_iterator                                    \
-    {                                                                        \
-        typedef wxHashTable_Node Node;                                       \
-    public:                                                                  \
-        typedef const wxClassInfo* value_type;                               \
-        typedef const value_type& const_reference;                           \
-        typedef const_iterator itor;                                         \
-        typedef value_type* ptr_type;                                        \
-                                                                             \
-        Node* m_node;                                                        \
-        wxHashTable* m_table;                                                \
-    public:                                                                  \
-        typedef const_reference reference_type;                              \
-        typedef ptr_type pointer_type;                                       \
-                                                                             \
-        const_iterator(Node* node, wxHashTable* table)                       \
-            : m_node(node), m_table(table) { }                               \
-        const_iterator() : m_node(NULL), m_table(NULL) { }                   \
-        value_type operator*() const;                                        \
-        itor& operator++();                                                  \
-        const itor operator++(int);                                          \
-        bool operator!=(const itor& it) const                                \
-            { return it.m_node != m_node; }                                  \
-        bool operator==(const itor& it) const                                \
-            { return it.m_node == m_node; }                                  \
-    };                                                                       \
-                                                                             \
-    static const_iterator begin_classinfo();                                 \
-    static const_iterator end_classinfo()
-
-#if wxUSE_EXTENDED_RTTI
+// based on the value of wxUSE_EXTENDED_RTTI symbol,
+// only one of the RTTI system will be compiled:
+// - the "old" one (defined by rtti.h) or
+// - the "new" one (defined by xti.h)
 #include "wx/xti.h"
-#else
-
-// ----------------------------------------------------------------------------
-// conditional compilation
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_FWD_BASE wxClassInfo;
-class WXDLLIMPEXP_FWD_BASE wxHashTable;
-class WXDLLIMPEXP_FWD_BASE wxObject;
-class WXDLLIMPEXP_FWD_BASE wxPluginLibrary;
-class WXDLLIMPEXP_FWD_BASE wxHashTable_Node;
-
-// ----------------------------------------------------------------------------
-// wxClassInfo
-// ----------------------------------------------------------------------------
-
-typedef wxObject *(*wxObjectConstructorFn)(void);
-
-class WXDLLIMPEXP_BASE wxClassInfo
-{
-    friend class WXDLLIMPEXP_FWD_BASE wxObject;
-    friend WXDLLIMPEXP_BASE wxObject *wxCreateDynamicObject(const wxString& name);
-public:
-    wxClassInfo( const wxChar *className,
-                 const wxClassInfo *baseInfo1,
-                 const wxClassInfo *baseInfo2,
-                 int size,
-                 wxObjectConstructorFn ctor )
-        : m_className(className)
-        , m_objectSize(size)
-        , m_objectConstructor(ctor)
-        , m_baseInfo1(baseInfo1)
-        , m_baseInfo2(baseInfo2)
-        , m_next(sm_first)
-        {
-            sm_first = this;
-            Register();
-        }
-
-    ~wxClassInfo();
-
-    wxObject *CreateObject() const
-        { return m_objectConstructor ? (*m_objectConstructor)() : 0; }
-    bool IsDynamic() const { return (NULL != m_objectConstructor); }
-
-    const wxChar       *GetClassName() const { return m_className; }
-    const wxChar       *GetBaseClassName1() const
-        { return m_baseInfo1 ? m_baseInfo1->GetClassName() : NULL; }
-    const wxChar       *GetBaseClassName2() const
-        { return m_baseInfo2 ? m_baseInfo2->GetClassName() : NULL; }
-    const wxClassInfo  *GetBaseClass1() const { return m_baseInfo1; }
-    const wxClassInfo  *GetBaseClass2() const { return m_baseInfo2; }
-    int                 GetSize() const { return m_objectSize; }
-
-    wxObjectConstructorFn      GetConstructor() const
-        { return m_objectConstructor; }
-    static const wxClassInfo  *GetFirst() { return sm_first; }
-    const wxClassInfo         *GetNext() const { return m_next; }
-    static wxClassInfo        *FindClass(const wxString& className);
-
-        // Climb upwards through inheritance hierarchy.
-        // Dual inheritance is catered for.
-
-    bool IsKindOf(const wxClassInfo *info) const
-    {
-        return info != 0 &&
-               ( info == this ||
-                 ( m_baseInfo1 && m_baseInfo1->IsKindOf(info) ) ||
-                 ( m_baseInfo2 && m_baseInfo2->IsKindOf(info) ) );
-    }
-
-    wxDECLARE_CLASS_INFO_ITERATORS();
-
-private:
-    const wxChar            *m_className;
-    int                      m_objectSize;
-    wxObjectConstructorFn    m_objectConstructor;
-
-        // Pointers to base wxClassInfos
-
-    const wxClassInfo       *m_baseInfo1;
-    const wxClassInfo       *m_baseInfo2;
-
-        // class info object live in a linked list:
-        // pointers to its head and the next element in it
-
-    static wxClassInfo      *sm_first;
-    wxClassInfo             *m_next;
-
-    static wxHashTable      *sm_classTable;
-
-protected:
-    // registers the class
-    void Register();
-    void Unregister();
-
-    wxDECLARE_NO_COPY_CLASS(wxClassInfo);
-};
-
-WXDLLIMPEXP_BASE wxObject *wxCreateDynamicObject(const wxString& name);
-
-// ----------------------------------------------------------------------------
-// Dynamic class macros
-// ----------------------------------------------------------------------------
-
-#define wxDECLARE_ABSTRACT_CLASS(name)                                        \
-    public:                                                                   \
-        static wxClassInfo ms_classInfo;                                      \
-        virtual wxClassInfo *GetClassInfo() const
-
-#define wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(name)                               \
-    wxDECLARE_NO_ASSIGN_CLASS(name);                                          \
-    wxDECLARE_DYNAMIC_CLASS(name)
-
-#define wxDECLARE_DYNAMIC_CLASS_NO_COPY(name)                                 \
-    wxDECLARE_NO_COPY_CLASS(name);                                            \
-    wxDECLARE_DYNAMIC_CLASS(name)
-
-#define wxDECLARE_DYNAMIC_CLASS(name)                                         \
-    wxDECLARE_ABSTRACT_CLASS(name);                                           \
-    static wxObject* wxCreateObject()
-
-#define wxDECLARE_CLASS(name)                                                 \
-    wxDECLARE_DYNAMIC_CLASS(name)
-
-
-// common part of the macros below
-#define wxIMPLEMENT_CLASS_COMMON(name, basename, baseclsinfo2, func)          \
-    wxClassInfo name::ms_classInfo(wxT(#name),                                \
-            &basename::ms_classInfo,                                          \
-            baseclsinfo2,                                                     \
-            (int) sizeof(name),                                               \
-            func);                                                            \
-                                                                              \
-    wxClassInfo *name::GetClassInfo() const                                   \
-        { return &name::ms_classInfo; }
-
-#define wxIMPLEMENT_CLASS_COMMON1(name, basename, func)                       \
-    wxIMPLEMENT_CLASS_COMMON(name, basename, NULL, func)
-
-#define wxIMPLEMENT_CLASS_COMMON2(name, basename1, basename2, func)           \
-    wxIMPLEMENT_CLASS_COMMON(name, basename1, &basename2::ms_classInfo, func)
-
-// -----------------------------------
-// for concrete classes
-// -----------------------------------
-
-    // Single inheritance with one base class
-#define wxIMPLEMENT_DYNAMIC_CLASS(name, basename)                             \
-    wxIMPLEMENT_CLASS_COMMON1(name, basename, name::wxCreateObject)           \
-    wxObject* name::wxCreateObject()                                          \
-        { return new name; }
-
-    // Multiple inheritance with two base classes
-#define wxIMPLEMENT_DYNAMIC_CLASS2(name, basename1, basename2)                \
-    wxIMPLEMENT_CLASS_COMMON2(name, basename1, basename2,                     \
-                              name::wxCreateObject)                           \
-    wxObject* name::wxCreateObject()                                          \
-        { return new name; }
-
-// -----------------------------------
-// for abstract classes
-// -----------------------------------
-
-    // Single inheritance with one base class
-#define wxIMPLEMENT_ABSTRACT_CLASS(name, basename)                            \
-    wxIMPLEMENT_CLASS_COMMON1(name, basename, NULL)
-
-    // Multiple inheritance with two base classes
-#define wxIMPLEMENT_ABSTRACT_CLASS2(name, basename1, basename2)               \
-    wxIMPLEMENT_CLASS_COMMON2(name, basename1, basename2, NULL)
-
-#define wxIMPLEMENT_CLASS(name, basename)                                     \
-    wxIMPLEMENT_ABSTRACT_CLASS(name, basename)
-
-#define wxIMPLEMENT_CLASS2(name, basename1, basename2)                        \
-    IMPLEMENT_ABSTRACT_CLASS2(name, basename1, basename2)
-
-#endif // !wxUSE_EXTENDED_RTTI
-
+#include "wx/rtti.h"
 
 // -----------------------------------
 // for pluggable classes
index 45e474fa7c442fcebce3775cf322afe594673a20..75da3785c8c1659a43a7305facbaa174a35da90c 100644 (file)
@@ -2,7 +2,7 @@
 // Name:        wx/xti.h
 // Purpose:     runtime metadata information (extended class info)
 // Author:      Stefan Csomor
-// Modified by:
+// Modified by: Francesco Montorsi
 // Created:     27/07/03
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997 Julian Smart
 // This means we have the following domains :
 //
 // - Type Information for categorizing built in types as well as custom types
-// this includes information about enums, their values and names
-// - Type safe value storage : a kind of wxVariant, called right now wxxVariant
-// which will be merged with wxVariant
+//   this includes information about enums, their values and names
+// - Type safe value storage : a kind of wxVariant, called right now wxVariantBase
+//   which will be merged with wxVariant
 // - Property Information and Property Accessors providing access to a class'
-// values and exposed event delegates
+//   values and exposed event delegates
 // - Information about event handlers
 // - extended Class Information for accessing all these
 
 // ----------------------------------------------------------------------------
 
 #include "wx/defs.h"
-#include "wx/memory.h"
-#include "wx/flags.h"
-#include "wx/string.h"
-#include "wx/arrstr.h"
-#include "wx/hashmap.h"
-#include "wx/log.h"
-#include  "wx/intl.h"
-
-#include <typeinfo>
-
-// we will move this later to defs.h
-
-#if defined(__GNUC__) && !wxCHECK_GCC_VERSION( 3 , 4 )
-#  define wxUSE_MEMBER_TEMPLATES 0
-#endif
-
-#if defined(_MSC_VER) && _MSC_VER <= 1200
-#  define wxUSE_MEMBER_TEMPLATES 0
-#  define wxUSE_FUNC_TEMPLATE_POINTER 0
-#endif
-
-#ifndef wxUSE_MEMBER_TEMPLATES
-#  define wxUSE_MEMBER_TEMPLATES 1
-#endif
-
-#ifndef wxUSE_FUNC_TEMPLATE_POINTER
-#  define wxUSE_FUNC_TEMPLATE_POINTER 1
-#endif
-
-#if wxUSE_MEMBER_TEMPLATES
-#  define wxTEMPLATED_MEMBER_CALL( method , type ) method<type>()
-#  define wxTEMPLATED_MEMBER_FIX( type )
-#else
-#  define wxTEMPLATED_MEMBER_CALL( method , type ) method(NULL)
-#  define wxTEMPLATED_MEMBER_FIX( type ) type* =NULL
-#endif
-
-#if defined(_MSC_VER) && _MSC_VER <= 1200
-#  define wxTEMPLATED_FUNCTION_FIX( type ) , wxTEMPLATED_MEMBER_FIX(type)
-#  define wxINFUNC_CLASS_TYPE_FIX( type ) typedef type type;
-#else
-#  define wxTEMPLATED_FUNCTION_FIX( type )
-#  define wxINFUNC_CLASS_TYPE_FIX( type )
-#endif
-
-#define EMPTY_MACROVALUE /**/
-
-class WXDLLIMPEXP_FWD_BASE wxObject;
-class WXDLLIMPEXP_FWD_BASE wxClassInfo;
-class WXDLLIMPEXP_FWD_BASE wxDynamicClassInfo;
-class WXDLLIMPEXP_FWD_BASE wxHashTable;
-class WXDLLIMPEXP_FWD_BASE wxHashTable_Node;
-class WXDLLIMPEXP_FWD_BASE wxObjectRefData;
-class WXDLLIMPEXP_FWD_BASE wxEvent;
-class WXDLLIMPEXP_FWD_BASE wxEvtHandler;
-
-typedef void (wxObject::*wxObjectEventFunction)(wxEvent&);
-
-#if wxUSE_FUNC_TEMPLATE_POINTER
-#  define wxTO_STRING(type) wxToStringConverter<type>
-#  define wxTO_STRING_IMP(type)
-#  define wxFROM_STRING(type) wxFromStringConverter<type>
-#  define wxFROM_STRING_IMP(type)
-#else
-#  define wxTO_STRING(type) ToString##type
-#  define wxTO_STRING_IMP(type) inline void ToString##type( const wxxVariant& data , wxString &result ) { wxToStringConverter<type>(data, result); }
-#  define wxFROM_STRING(type) FromString##type
-#  define wxFROM_STRING_IMP(type) inline void FromString##type( const wxString& data , wxxVariant &result ) { wxFromStringConverter<type>(data, result); }
-#endif
 
-// ----------------------------------------------------------------------------
-// Enum Support
-//
-// In the header files there would no change from pure c++ code, in the
-// implementation, an enum would have
-// to be enumerated eg :
-//
-// wxBEGIN_ENUM( wxFlavor )
-//   wxENUM_MEMBER( Vanilla )
-//   wxENUM_MEMBER( Chocolate )
-//   wxENUM_MEMBER( Strawberry )
-// wxEND_ENUM( wxFlavor )
-// ----------------------------------------------------------------------------
-
-struct WXDLLIMPEXP_BASE wxEnumMemberData
-{
-    const wxChar*   m_name;
-    int             m_value;
-};
-
-class WXDLLIMPEXP_BASE wxEnumData
-{
-public :
-    wxEnumData( wxEnumMemberData* data ) ;
-
-    // returns true if the member has been found and sets the int value
-    // pointed to accordingly (if ptr != null )
-    // if not found returns false, value left unchanged
-    bool HasEnumMemberValue( const wxChar *name , int *value = NULL ) const ;
-
-    // returns the value of the member, if not found in debug mode an
-    // assert is issued, in release 0 is returned
-    int GetEnumMemberValue(const wxChar *name ) const ;
-
-    // returns the name of the enum member having the passed in value
-    // returns an emtpy string if not found
-    const wxChar *GetEnumMemberName(int value) const ;
-
-    // returns the number of members in this enum
-    int GetEnumCount() const { return m_count ; }
-
-    // returns the value of the nth member
-    int GetEnumMemberValueByIndex( int n ) const ;
-
-    // returns the value of the nth member
-    const wxChar *GetEnumMemberNameByIndex( int n ) const ;
-private :
-    wxEnumMemberData *m_members;
-    int m_count ;
-};
-
-#define wxBEGIN_ENUM( e ) \
-    wxEnumMemberData s_enumDataMembers##e[] = {
-
-#define wxENUM_MEMBER( v ) { wxT(#v), v } ,
-
-#define wxEND_ENUM( e ) { NULL , 0 } } ; \
-    wxEnumData s_enumData##e( s_enumDataMembers##e ) ; \
-    wxEnumData *wxGetEnumData(e) { return &s_enumData##e ; } \
-    template<>  void wxStringReadValue(const wxString& s , e &data ) \
-{ \
-    data = (e) s_enumData##e.GetEnumMemberValue(s) ; \
-} \
-    template<>  void wxStringWriteValue(wxString &s , const e &data ) \
-{ \
-    s =  s_enumData##e.GetEnumMemberName((int)data) ; \
-} \
-    void FromLong##e( long data , wxxVariant& result ) { result = wxxVariant((e)data) ;} \
-    void ToLong##e( const wxxVariant& data , long &result ) { result = (long) data.wxTEMPLATED_MEMBER_CALL(Get , e) ;} \
-    wxTO_STRING_IMP( e ) \
-    wxFROM_STRING_IMP( e ) \
-    wxEnumTypeInfo s_typeInfo##e(wxT_ENUM , &s_enumData##e , &wxTO_STRING( e ) , &wxFROM_STRING( e ) , &ToLong##e , &FromLong##e , typeid(e).name() ) ;
-
-// ----------------------------------------------------------------------------
-// Set Support
-//
-// in the header :
-//
-// enum wxFlavor
-// {
-//  Vanilla,
-//  Chocolate,
-//  Strawberry,
-// };
-//
-// typedef wxBitset<wxFlavor> wxCoupe ;
-//
-// in the implementation file :
-//
-// wxBEGIN_ENUM( wxFlavor )
-//  wxENUM_MEMBER( Vanilla )
-//  wxENUM_MEMBER( Chocolate )
-//  wxENUM_MEMBER( Strawberry )
-// wxEND_ENUM( wxFlavor )
-//
-// wxIMPLEMENT_SET_STREAMING( wxCoupe , wxFlavor )
-//
-// implementation note : no partial specialization for streaming, but a delegation to a
-// different class
-//
-// ----------------------------------------------------------------------------
-
-// in order to remove dependancy on string tokenizer
-void WXDLLIMPEXP_BASE wxSetStringToArray( const wxString &s , wxArrayString &array ) ;
-
-template<typename e>
-void wxSetFromString(const wxString &s , wxBitset<e> &data )
-{
-    wxEnumData* edata = wxGetEnumData((e) 0) ;
-    data.reset() ;
-
-    wxArrayString array ;
-    wxSetStringToArray( s , array ) ;
-    wxString flag;
-    for ( int i = 0 ; i < array.Count() ; ++i )
-    {
-        flag = array[i] ;
-        int ivalue ;
-        if ( edata->HasEnumMemberValue( flag , &ivalue ) )
-        {
-            data.set( (e) ivalue ) ;
-        }
-    }
-}
-
-template<typename e>
-void wxSetToString( wxString &s , const wxBitset<e> &data )
-{
-    wxEnumData* edata = wxGetEnumData((e) 0) ;
-    int count = edata->GetEnumCount() ;
-    int i ;
-    s.Clear() ;
-    for ( i = 0 ; i < count ; i++ )
-    {
-        e value = (e) edata->GetEnumMemberValueByIndex(i) ;
-        if ( data.test( value ) )
-        {
-            // this could also be done by the templated calls
-            if ( !s.empty() )
-                s +=wxT("|") ;
-            s += edata->GetEnumMemberNameByIndex(i) ;
-        }
-    }
-}
-
-#define wxIMPLEMENT_SET_STREAMING(SetName,e) \
-    template<>  void wxStringReadValue(const wxString &s , wxBitset<e> &data ) \
-{ \
-    wxSetFromString( s , data ) ; \
-} \
-    template<>  void wxStringWriteValue( wxString &s , const wxBitset<e> &data ) \
-{ \
-    wxSetToString( s , data ) ; \
-} \
-    void FromLong##SetName( long data , wxxVariant& result ) { result = wxxVariant(SetName((unsigned long)data)) ;} \
-    void ToLong##SetName( const wxxVariant& data , long &result ) { result = (long) data.wxTEMPLATED_MEMBER_CALL(Get , SetName).to_ulong() ;} \
-    wxTO_STRING_IMP( SetName ) \
-    wxFROM_STRING_IMP( SetName ) \
-    wxEnumTypeInfo s_typeInfo##SetName(wxT_SET , &s_enumData##e , &wxTO_STRING( SetName ) , &wxFROM_STRING( SetName ) , &ToLong##SetName , &FromLong##SetName, typeid(SetName).name() ) ;  \
-}
-
-template<typename e>
-void wxFlagsFromString(const wxString &s , e &data )
-{
-    wxEnumData* edata = wxGetEnumData((e*) 0) ;
-    data.m_data = 0 ;
-
-    wxArrayString array ;
-    wxSetStringToArray( s , array ) ;
-    wxString flag;
-    for ( size_t i = 0 ; i < array.Count() ; ++i )
-    {
-        flag = array[i] ;
-        int ivalue ;
-        if ( edata->HasEnumMemberValue( flag , &ivalue ) )
-        {
-            data.m_data |= ivalue ;
-        }
-    }
-}
-
-template<typename e>
-void wxFlagsToString( wxString &s , const e& data )
-{
-    wxEnumData* edata = wxGetEnumData((e*) 0) ;
-    int count = edata->GetEnumCount() ;
-    int i ;
-    s.Clear() ;
-    long dataValue = data.m_data ;
-    for ( i = 0 ; i < count ; i++ )
-    {
-        int value = edata->GetEnumMemberValueByIndex(i) ;
-        // make this to allow for multi-bit constants to work
-        if ( value && ( dataValue & value ) == value )
-        {
-            // clear the flags we just set
-            dataValue &= ~value ;
-            // this could also be done by the templated calls
-            if ( !s.empty() )
-                s +=wxT("|") ;
-            s += edata->GetEnumMemberNameByIndex(i) ;
-        }
-    }
-}
-
-#define wxBEGIN_FLAGS( e ) \
-    wxEnumMemberData s_enumDataMembers##e[] = {
-
-#define wxFLAGS_MEMBER( v ) { wxT(#v), v } ,
-
-#define wxEND_FLAGS( e ) { NULL , 0 } } ; \
-    wxEnumData s_enumData##e( s_enumDataMembers##e ) ; \
-    wxEnumData *wxGetEnumData(e*) { return &s_enumData##e ; } \
-    template<>  void wxStringReadValue(const wxString &s , e &data ) \
-{ \
-    wxFlagsFromString<e>( s , data ) ; \
-} \
-    template<>  void wxStringWriteValue( wxString &s , const e& data ) \
-{ \
-    wxFlagsToString<e>( s , data ) ; \
-} \
-    void FromLong##e( long data , wxxVariant& result ) { result = wxxVariant(e(data)) ;} \
-    void ToLong##e( const wxxVariant& data , long &result ) { result = (long) data.wxTEMPLATED_MEMBER_CALL(Get , e).m_data ;} \
-    wxTO_STRING_IMP( e ) \
-    wxFROM_STRING_IMP( e ) \
-    wxEnumTypeInfo s_typeInfo##e(wxT_SET , &s_enumData##e , &wxTO_STRING( e ) , &wxFROM_STRING( e ) , &ToLong##e , &FromLong##e, typeid(e).name()  ) ;
-// ----------------------------------------------------------------------------
-// Type Information
-// ----------------------------------------------------------------------------
-//
-//
-//  All data exposed by the RTTI is characterized using the following classes.
-//  The first characterization is done by wxTypeKind. All enums up to and including
-//  wxT_CUSTOM represent so called simple types. These cannot be divided any further.
-//  They can be converted to and from wxStrings, that's all.
-
-
-enum wxTypeKind
-{
-    wxT_VOID = 0, // unknown type
-    wxT_BOOL,
-    wxT_CHAR,
-    wxT_UCHAR,
-    wxT_INT,
-    wxT_UINT,
-    wxT_LONG,
-    wxT_ULONG,
-    wxT_FLOAT,
-    wxT_DOUBLE,
-    wxT_STRING, // must be wxString
-    wxT_SET, // must be wxBitset<> template
-    wxT_ENUM,
-    wxT_CUSTOM, // user defined type (e.g. wxPoint)
-
-    wxT_LAST_SIMPLE_TYPE_KIND = wxT_CUSTOM ,
-
-    wxT_OBJECT_PTR, // object reference
-    wxT_OBJECT , // embedded object
-    wxT_COLLECTION , // collection
-
-    wxT_DELEGATE , // for connecting against an event source
-
-    wxT_LAST_TYPE_KIND = wxT_DELEGATE // sentinel for bad data, asserts, debugging
-};
-
-class WXDLLIMPEXP_FWD_BASE wxxVariant ;
-class WXDLLIMPEXP_FWD_BASE wxTypeInfo ;
-
-WX_DECLARE_STRING_HASH_MAP_WITH_DECL( wxTypeInfo* , wxTypeInfoMap , class WXDLLIMPEXP_BASE ) ;
-
-class WXDLLIMPEXP_BASE wxTypeInfo
-{
-public :
-    typedef void (*converterToString_t)( const wxxVariant& data , wxString &result ) ;
-    typedef void (*converterFromString_t)( const wxString& data , wxxVariant &result ) ;
-
-    wxTypeInfo(wxTypeKind kind,
-               converterToString_t to = NULL, converterFromString_t from = NULL,
-               const wxString &name = wxEmptyString):
-            m_toString(to), m_fromString(from), m_kind(kind), m_name(name)
-    {
-        Register();
-    }
-#if wxUSE_UNICODE
-    wxTypeInfo(wxTypeKind kind,
-               converterToString_t to, converterFromString_t from,
-               const char *name):
-            m_toString(to), m_fromString(from), m_kind(kind), m_name(wxString::FromAscii(name))
-    {
-        Register();
-    }
-#endif
-
-    virtual ~wxTypeInfo()
-    {
-        Unregister() ;
-    }
-
-    // return the kind of this type (wxT_... constants)
-    wxTypeKind GetKind() const { return m_kind ; }
-
-    // returns the unique name of this type
-    const wxString& GetTypeName() const { return m_name ; }
-
-    // is this type a delegate type
-    bool IsDelegateType() const { return m_kind == wxT_DELEGATE ; }
-
-    // is this type a custom type
-    bool IsCustomType() const { return m_kind == wxT_CUSTOM ; }
-
-    // is this type an object type
-    bool IsObjectType() const { return m_kind == wxT_OBJECT || m_kind == wxT_OBJECT_PTR ; }
-
-    // can the content of this type be converted to and from strings ?
-    bool HasStringConverters() const { return m_toString != NULL && m_fromString != NULL ; }
-
-    // convert a wxxVariant holding data of this type into a string
-    void ConvertToString( const wxxVariant& data , wxString &result ) const
-
-    { if ( m_toString ) (*m_toString)( data , result ) ; else wxLogError( wxGetTranslation(wxT("String conversions not supported")) ) ; }
-
-    // convert a string into a wxxVariant holding the corresponding data in this type
-    void ConvertFromString( const wxString& data , wxxVariant &result ) const
-    { if( m_fromString ) (*m_fromString)( data , result ) ; else wxLogError( wxGetTranslation(wxT("String conversions not supported")) ) ; }
-
-#if wxUSE_UNICODE
-    static wxTypeInfo        *FindType(const char *typeName) { return FindType( wxString::FromAscii(typeName) ) ; }
-#endif
-    static wxTypeInfo        *FindType(const wxChar *typeName);
-    static wxTypeInfo        *FindType(const wxString typeName)
-    {
-#if wxUSE_UNICODE
-        return FindType( typeName.wchar_str() );
-#else
-        return FindType( typeName.char_str() );
-#endif
-    }
-
-private :
-
-    void Register();
-    void Unregister();
-
-    converterToString_t m_toString ;
-    converterFromString_t m_fromString ;
-
-    static wxTypeInfoMap*      ms_typeTable ;
-
-    wxTypeKind m_kind;
-    wxString m_name;
-};
-
-class WXDLLIMPEXP_BASE wxBuiltInTypeInfo : public wxTypeInfo
-{
-public :
-    wxBuiltInTypeInfo( wxTypeKind kind , converterToString_t to = NULL , converterFromString_t from = NULL , const wxString &name = wxEmptyString ) :
-       wxTypeInfo( kind , to , from , name )
-       { wxASSERT_MSG( GetKind() < wxT_SET , wxT("Illegal Kind for Base Type") ) ; }
-#if wxUSE_UNICODE
-    wxBuiltInTypeInfo( wxTypeKind kind , converterToString_t to  , converterFromString_t from  , const char *name  ) :
-       wxTypeInfo( kind , to , from , name )
-       { wxASSERT_MSG( GetKind() < wxT_SET , wxT("Illegal Kind for Base Type") ) ; }
-#endif
-} ;
-
-class WXDLLIMPEXP_BASE wxCustomTypeInfo : public wxTypeInfo
-{
-public :
-    wxCustomTypeInfo( const wxString &name , converterToString_t to , converterFromString_t from ) :
-       wxTypeInfo( wxT_CUSTOM , to , from , name )
-       {}
-#if wxUSE_UNICODE
-    wxCustomTypeInfo( const char *name  , converterToString_t to , converterFromString_t from ) :
-       wxTypeInfo( wxT_CUSTOM , to , from , name )
-       {}
-#endif
-} ;
-
-class WXDLLIMPEXP_BASE wxEnumTypeInfo : public wxTypeInfo
-{
-public :
-    typedef void (*converterToLong_t)( const wxxVariant& data , long &result ) ;
-    typedef void (*converterFromLong_t)( long data , wxxVariant &result ) ;
-
-    wxEnumTypeInfo( wxTypeKind kind , wxEnumData* enumInfo , converterToString_t to , converterFromString_t from ,
-        converterToLong_t toLong , converterFromLong_t fromLong , const wxString &name  ) :
-    wxTypeInfo( kind , to , from , name ) , m_toLong( toLong ) , m_fromLong( fromLong )
-    { wxASSERT_MSG( kind == wxT_ENUM || kind == wxT_SET , wxT("Illegal Kind for Enum Type")) ; m_enumInfo = enumInfo ;}
-
-#if wxUSE_UNICODE
-    wxEnumTypeInfo( wxTypeKind kind , wxEnumData* enumInfo , converterToString_t to , converterFromString_t from ,
-        converterToLong_t toLong , converterFromLong_t fromLong , const char * name   ) :
-    wxTypeInfo( kind , to , from , name ) , m_toLong( toLong ) , m_fromLong( fromLong )
-    { wxASSERT_MSG( kind == wxT_ENUM || kind == wxT_SET , wxT("Illegal Kind for Enum Type")) ; m_enumInfo = enumInfo ;}
-#endif
-    const wxEnumData* GetEnumData() const { return m_enumInfo ; }
-
-    // convert a wxxVariant holding data of this type into a long
-    void ConvertToLong( const wxxVariant& data , long &result ) const
-
-    { if( m_toLong ) (*m_toLong)( data , result ) ; else wxLogError( wxGetTranslation(wxT("Long Conversions not supported")) ) ; }
-
-    // convert a long into a wxxVariant holding the corresponding data in this type
-    void ConvertFromLong( long data , wxxVariant &result ) const
-    { if( m_fromLong ) (*m_fromLong)( data , result ) ; else wxLogError( wxGetTranslation(wxT("Long Conversions not supported")) ) ;}
-
-private :
-    converterToLong_t m_toLong ;
-    converterFromLong_t m_fromLong ;
-
-    wxEnumData *m_enumInfo; // Kind == wxT_ENUM or Kind == wxT_SET
-} ;
-
-class WXDLLIMPEXP_BASE wxClassTypeInfo : public wxTypeInfo
-{
-public :
-    wxClassTypeInfo( wxTypeKind kind , wxClassInfo* classInfo , converterToString_t to = NULL , converterFromString_t from = NULL , const wxString &name = wxEmptyString) ;
-#if wxUSE_UNICODE
-    wxClassTypeInfo( wxTypeKind kind , wxClassInfo* classInfo , converterToString_t to  , converterFromString_t from  , const char *name ) ;
-#endif
-    const wxClassInfo *GetClassInfo() const { return m_classInfo ; }
-private :
-    wxClassInfo *m_classInfo; // Kind == wxT_OBJECT - could be NULL
-} ;
-
-class WXDLLIMPEXP_BASE wxCollectionTypeInfo : public wxTypeInfo
-{
-public :
-    wxCollectionTypeInfo( const wxString &elementName , converterToString_t to , converterFromString_t from  , const wxString &name) :
-       wxTypeInfo( wxT_COLLECTION , to , from , name )
-       { m_elementTypeName = elementName ; m_elementType = NULL ;}
-#if wxUSE_UNICODE
-    wxCollectionTypeInfo( const char *elementName , converterToString_t to , converterFromString_t from  , const char *name ) :
-       wxTypeInfo( wxT_COLLECTION , to , from , name )
-       { m_elementTypeName = wxString::FromAscii( elementName ) ; m_elementType = NULL ;}
-#endif
-       const wxTypeInfo* GetElementType() const
-       {
-           if ( m_elementType == NULL )
-               m_elementType = wxTypeInfo::FindType( m_elementTypeName ) ;
-           return m_elementType ; }
-private :
-    mutable wxTypeInfo * m_elementType ;
-    wxString    m_elementTypeName ;
-} ;
-
-// a delegate is an exposed event source
-
-class WXDLLIMPEXP_BASE wxDelegateTypeInfo : public wxTypeInfo
-{
-public :
-    wxDelegateTypeInfo( int eventType , wxClassInfo* eventClass , converterToString_t to = NULL , converterFromString_t from = NULL ) ;
-    wxDelegateTypeInfo( int eventType , int lastEventType, wxClassInfo* eventClass , converterToString_t to = NULL , converterFromString_t from = NULL ) ;
-    int GetEventType() const { return m_eventType ; }
-    int GetLastEventType() const { return m_lastEventType ; }
-    const wxClassInfo* GetEventClass() const { return m_eventClass ; }
-private :
-    const wxClassInfo *m_eventClass; // (extended will merge into classinfo)
-    int m_eventType ;
-    int m_lastEventType ;
-} ;
-
-template<typename T> const wxTypeInfo* wxGetTypeInfo( T * ) { return wxTypeInfo::FindType(typeid(T).name()) ; }
-
-// this macro is for usage with custom, non-object derived classes and structs, wxPoint is such a custom type
-
-#if wxUSE_FUNC_TEMPLATE_POINTER
-#define wxCUSTOM_TYPE_INFO( e , toString , fromString ) \
-    wxCustomTypeInfo s_typeInfo##e(typeid(e).name() , &toString , &fromString) ;
-#else
-#define wxCUSTOM_TYPE_INFO( e , toString , fromString ) \
-    void ToString##e( const wxxVariant& data , wxString &result ) { toString(data, result); } \
-    void FromString##e( const wxString& data , wxxVariant &result ) { fromString(data, result); } \
-    wxCustomTypeInfo s_typeInfo##e(typeid(e).name() , &ToString##e , &FromString##e) ;
-#endif
-
-#define wxCOLLECTION_TYPE_INFO( element , collection ) \
-    wxCollectionTypeInfo s_typeInfo##collection( typeid(element).name() , NULL , NULL , typeid(collection).name() ) ;
-
-// sometimes a compiler invents specializations that are nowhere called, use this macro to satisfy the refs, currently
-// we don't have to play tricks, but if we will have to according to the compiler, we will use that macro for that
-
-#define wxILLEGAL_TYPE_SPECIALIZATION( a )
-
-// ----------------------------------------------------------------------------
-// wxxVariant as typesafe data holder
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_BASE wxxVariantData
-{
-public:
-    virtual ~wxxVariantData() {}
-
-    // return a heap allocated duplicate
-    virtual wxxVariantData* Clone() const = 0 ;
-
-    // returns the type info of the contentc
-    virtual const wxTypeInfo* GetTypeInfo() const = 0 ;
-} ;
-
-template<typename T> class wxxVariantDataT : public wxxVariantData
-{
-public:
-    wxxVariantDataT(const T& d) : m_data(d) {}
-    virtual ~wxxVariantDataT() {}
-
-    // get a ref to the stored data
-    T & Get() { return m_data; }
-
-    // get a const ref to the stored data
-    const T & Get() const { return m_data; }
-
-    // set the data
-    void Set(const T& d) { m_data =  d; }
-
-    // return a heap allocated duplicate
-    virtual wxxVariantData* Clone() const { return new wxxVariantDataT<T>( Get() ) ; }
-
-    // returns the type info of the contentc
-    virtual const wxTypeInfo* GetTypeInfo() const { return wxGetTypeInfo( NULL ) ; }
-
-private:
-    T m_data;
-};
-
-class WXDLLIMPEXP_BASE wxxVariant
-{
-public :
-    wxxVariant() { m_data = NULL ; }
-    wxxVariant( wxxVariantData* data , const wxString& name = wxEmptyString ) : m_data(data) , m_name(name) {}
-    wxxVariant( const wxxVariant &d ) { if ( d.m_data ) m_data = d.m_data->Clone() ; else m_data = NULL ; m_name = d.m_name ; }
-
-    template<typename T> wxxVariant( const T& data , const wxString& name = wxEmptyString ) :
-    m_data(new wxxVariantDataT<T>(data) ), m_name(name) {}
-
-    ~wxxVariant() { delete m_data ; }
-
-    // get a ref to the stored data
-    template<typename T> T& Get(wxTEMPLATED_MEMBER_FIX(T))
-    {
-        wxxVariantDataT<T> *dataptr = dynamic_cast<wxxVariantDataT<T>*> (m_data) ;
-        wxASSERT_MSG( dataptr , wxString::Format(wxT("Cast to %s not possible"), typeid(T).name()) ) ;
-        return dataptr->Get() ;
-    }
-
-    // get a ref to the stored data
-    template<typename T> const T& Get(wxTEMPLATED_MEMBER_FIX(T)) const
-    {
-        const wxxVariantDataT<T> *dataptr = dynamic_cast<const wxxVariantDataT<T>*> (m_data) ;
-        wxASSERT_MSG( dataptr , wxString::Format(wxT("Cast to %s not possible"), typeid(T).name()) ) ;
-        return dataptr->Get() ;
-    }
-
-    bool IsEmpty() const { return m_data == NULL ; }
-
-    template<typename T> bool HasData(wxTEMPLATED_MEMBER_FIX(T)) const
-    {
-        const wxxVariantDataT<T> *dataptr = dynamic_cast<const wxxVariantDataT<T>*> (m_data) ;
-        return dataptr != NULL ;
-    }
-
-    // stores the data
-    template<typename T> void Set(const T& data) const
-    {
-        delete m_data ;
-        m_data = new wxxVariantDataT<T>(data) ;
-    }
-
-    wxxVariant& operator=(const wxxVariant &d)
-    {
-        delete m_data;
-        m_data = d.m_data ? d.m_data->Clone() : NULL ;
-        m_name = d.m_name ;
-        return *this ;
-    }
-
-    // gets the stored data casted to a wxObject* , returning NULL if cast is not possible
-    wxObject* GetAsObject() ;
-
-    // get the typeinfo of the stored object
-    const wxTypeInfo* GetTypeInfo() const { return m_data->GetTypeInfo() ; }
-
-    // returns this value as string
-    wxString GetAsString() const
-    {
-        wxString s ;
-        GetTypeInfo()->ConvertToString( *this , s ) ;
-        return s ;
-    }
-    const wxString& GetName() const { return m_name ; }
-private :
-    wxxVariantData* m_data ;
-    wxString m_name ;
-} ;
-
-#include "wx/dynarray.h"
-
-WX_DECLARE_OBJARRAY_WITH_DECL(wxxVariant, wxxVariantArray, class WXDLLIMPEXP_BASE);
-
-// templated streaming, every type must have their specialization for these methods
-
-template<typename T>
-void wxStringReadValue( const wxString &s , T &data );
-
-template<typename T>
-void wxStringWriteValue( wxString &s , const T &data);
-
-template<typename T>
-void wxToStringConverter( const wxxVariant &v, wxString &s wxTEMPLATED_FUNCTION_FIX(T)) { wxStringWriteValue( s , v.wxTEMPLATED_MEMBER_CALL(Get , T) ) ; }
-
-template<typename T>
-void wxFromStringConverter( const wxString &s, wxxVariant &v wxTEMPLATED_FUNCTION_FIX(T)) { T d ; wxStringReadValue( s , d ) ; v = wxxVariant(d) ; }
-
-// ----------------------------------------------------------------------------
-// Property Support
-//
-// wxPropertyInfo is used to inquire of the property by name.  It doesn't
-// provide access to the property, only information about it.  If you
-// want access, look at wxPropertyAccessor.
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_BASE wxSetter
-{
-public:
-    wxSetter( const wxString name ) { m_name = name ; }
-    virtual ~wxSetter() {}
-    virtual void Set( wxObject *object, const wxxVariant &variantValue ) const = 0;
-    const wxString& GetName() const { return m_name ; }
-private:
-    wxString m_name;
-};
-
-class WXDLLIMPEXP_BASE wxGetter
-{
-public:
-    wxGetter( const wxString name ) { m_name = name ; }
-    virtual ~wxGetter() {}
-    virtual void Get( const wxObject *object , wxxVariant& result) const = 0;
-    const wxString& GetName() const { return m_name ; }
-private:
-    wxString m_name;
-};
-
-class WXDLLIMPEXP_BASE wxCollectionGetter
-{
-public :
-    wxCollectionGetter( const wxString name ) { m_name = name ; }
-    virtual ~wxCollectionGetter() {}
-    virtual void Get( const wxObject *object , wxxVariantArray& result) const = 0;
-    const wxString& GetName() const { return m_name ; }
-private :
-    wxString m_name ;
-} ;
-
-template<typename coll_t> void WXDLLIMPEXP_BASE wxCollectionToVariantArray( const coll_t& coll , wxxVariantArray& result ) ;
-
-class WXDLLIMPEXP_BASE wxAdder
-{
-public :
-    wxAdder( const wxString name ) { m_name = name ; }
-    virtual ~wxAdder() {}
-    virtual void Add( wxObject *object, const wxxVariant &variantValue ) const= 0;
-    const wxString& GetName() const { return m_name ; }
-private :
-    wxString m_name ;
-} ;
-
-
-#define wxSETTER( property, Klass, valueType, setterMethod ) \
-class wxSetter##property : public wxSetter \
-{ \
-public: \
-    wxINFUNC_CLASS_TYPE_FIX(Klass) \
-    wxSetter##property() : wxSetter( wxT(#setterMethod) ) {} \
-    virtual ~wxSetter##property() {} \
-    void Set( wxObject *object, const wxxVariant &variantValue ) const \
-{ \
-    Klass *obj = dynamic_cast<Klass*>(object) ;  \
-    if ( variantValue.wxTEMPLATED_MEMBER_CALL(HasData, valueType) ) \
-    obj->setterMethod(variantValue.wxTEMPLATED_MEMBER_CALL(Get , valueType)) ; \
-            else \
-            obj->setterMethod(*variantValue.wxTEMPLATED_MEMBER_CALL(Get , valueType*)) ; \
-} \
-} ;
-
-#define wxGETTER( property, Klass, valueType , gettermethod ) \
-class wxGetter##property : public wxGetter \
-{ \
-public : \
-    wxINFUNC_CLASS_TYPE_FIX(Klass) \
-    wxGetter##property() : wxGetter( wxT(#gettermethod) ) {} \
-    virtual ~wxGetter##property() {} \
-    void Get( const wxObject *object , wxxVariant &result) const \
-{ \
-    const Klass *obj = dynamic_cast<const Klass*>(object) ;  \
-    result = wxxVariant( obj->gettermethod() ) ; \
-} \
-} ;
-
-#define wxADDER( property, Klass, valueType , addermethod ) \
-class wxAdder##property : public wxAdder \
-{ \
-public: \
-    wxINFUNC_CLASS_TYPE_FIX(Klass) \
-    wxAdder##property() : wxAdder( wxT(#addermethod) ) {} \
-    virtual ~wxAdder##property() {} \
-    void Add( wxObject *object, const wxxVariant &variantValue ) const \
-{ \
-    Klass *obj = dynamic_cast<Klass*>(object) ;  \
-    if ( variantValue.wxTEMPLATED_MEMBER_CALL(HasData, valueType) ) \
-    obj->addermethod(variantValue.wxTEMPLATED_MEMBER_CALL(Get , valueType)) ; \
-            else \
-            obj->addermethod(*variantValue.wxTEMPLATED_MEMBER_CALL(Get , valueType*)) ; \
-} \
-} ;
-
-#define wxCOLLECTION_GETTER( property, Klass, valueType , gettermethod ) \
-class wxCollectionGetter##property : public wxCollectionGetter \
-{ \
-public : \
-    wxINFUNC_CLASS_TYPE_FIX(Klass) \
-    wxCollectionGetter##property() : wxCollectionGetter( wxT(#gettermethod) ) {} \
-    virtual ~wxCollectionGetter##property() {} \
-    void Get( const wxObject *object , wxxVariantArray &result) const \
-{ \
-    const Klass *obj = dynamic_cast<const Klass*>(object) ;  \
-    wxCollectionToVariantArray( obj->gettermethod() , result ) ; \
-} \
-} ;
-
-class WXDLLIMPEXP_BASE wxPropertyAccessor
-{
-public :
-    wxPropertyAccessor( wxSetter *setter , wxGetter *getter , wxAdder *adder , wxCollectionGetter *collectionGetter )
-    { m_setter = setter ; m_getter = getter ; m_adder = adder ; m_collectionGetter = collectionGetter ;}
-
-    virtual ~wxPropertyAccessor() {}
-
-    // Setting a simple property (non-collection)
-    virtual void SetProperty(wxObject *object, const wxxVariant &value) const
-    { if ( m_setter ) m_setter->Set( object , value ) ; else wxLogError( wxGetTranslation(wxT("SetProperty called w/o valid setter")) ) ;}
-
-    // Getting a simple property (non-collection)
-    virtual void GetProperty(const wxObject *object, wxxVariant &result) const
-    { if ( m_getter ) m_getter->Get( object , result ) ; else wxLogError( wxGetTranslation(wxT("GetProperty called w/o valid getter")) ) ;}
-
-    // Adding an element to a collection property
-    virtual void AddToPropertyCollection(wxObject *object, const wxxVariant &value) const
-    { if ( m_adder ) m_adder->Add( object , value ) ; else wxLogError( wxGetTranslation(wxT("AddToPropertyCollection called w/o valid adder")) ) ;}
-
-    // Getting a collection property
-    virtual void GetPropertyCollection( const wxObject *obj, wxxVariantArray &result) const
-    { if ( m_collectionGetter ) m_collectionGetter->Get( obj , result) ; else wxLogError( wxGetTranslation(wxT("GetPropertyCollection called w/o valid collection getter")) ) ;}
-
-    virtual bool HasSetter() const { return m_setter != NULL ; }
-    virtual bool HasCollectionGetter() const { return m_collectionGetter != NULL ; }
-    virtual bool HasGetter() const { return m_getter != NULL ; }
-    virtual bool HasAdder() const { return m_adder != NULL ; }
-
-    virtual const wxString& GetCollectionGetterName() const
-    { return m_collectionGetter->GetName() ; }
-    virtual const wxString&  GetGetterName() const
-    { return m_getter->GetName() ; }
-    virtual const wxString& GetSetterName() const
-    { return m_setter->GetName() ; }
-    virtual const wxString& GetAdderName() const
-    { return m_adder->GetName() ; }
-
-protected :
-    wxSetter *m_setter ;
-    wxAdder *m_adder ;
-    wxGetter *m_getter ;
-    wxCollectionGetter* m_collectionGetter ;
-};
+#if wxUSE_EXTENDED_RTTI
 
-class WXDLLIMPEXP_BASE wxGenericPropertyAccessor : public wxPropertyAccessor
-{
-public :
-    wxGenericPropertyAccessor( const wxString &propName ) ;
-    virtual ~wxGenericPropertyAccessor() ;
-
-    void RenameProperty( const wxString& WXUNUSED_UNLESS_DEBUG(oldName),
-        const wxString& newName )
-    {
-        wxASSERT( oldName == m_propertyName ) ; m_propertyName = newName ;
-    }
-    virtual bool HasSetter() const { return true ; }
-    virtual bool HasGetter() const { return true ; }
-    virtual bool HasAdder() const { return false ; }
-    virtual bool HasCollectionGetter() const { return false ; }
-
-    virtual const wxString&  GetGetterName() const
-    { return m_getterName ; }
-    virtual const wxString& GetSetterName() const
-    { return m_setterName ; }
-
-    virtual void SetProperty(wxObject *object, const wxxVariant &value) const ;
-    virtual void GetProperty(const wxObject *object, wxxVariant &value) const ;
-
-    // Adding an element to a collection property
-    virtual void AddToPropertyCollection(wxObject *WXUNUSED(object), const wxxVariant &WXUNUSED(value)) const
-    { wxLogError( wxGetTranslation(wxT("AddToPropertyCollection called on a generic accessor")) ) ;}
-
-    // Getting a collection property
-    virtual void GetPropertyCollection( const wxObject *WXUNUSED(obj), wxxVariantArray &WXUNUSED(result)) const
-    { wxLogError ( wxGetTranslation(wxT("GetPropertyCollection called on a generic accessor")) ) ;}
-private :
-    struct wxGenericPropertyAccessorInternal ;
-    wxGenericPropertyAccessorInternal* m_data ;
-    wxString m_propertyName ;
-    wxString m_setterName ;
-    wxString m_getterName ;
-} ;
-
-typedef long wxPropertyInfoFlags ;
-enum {
-    // will be removed in future releases
-    wxPROP_DEPRECATED       = 0x00000001 ,
-    // object graph property, will be streamed with priority (after constructor properties)
-    wxPROP_OBJECT_GRAPH     = 0x00000002 ,
-    // this will only be streamed out and in as enum/set, the internal representation is still a long
-    wxPROP_ENUM_STORE_LONG  = 0x00000004 ,
-    // don't stream out this property, needed eg to avoid streaming out children that are always created by their parents
-    wxPROP_DONT_STREAM = 0x00000008 ,
-}  ;
-
-class WXDLLIMPEXP_BASE wxPropertyInfo
-{
-    friend class WXDLLIMPEXP_FWD_BASE wxDynamicClassInfo ;
-public :
-    wxPropertyInfo(wxPropertyInfo* &iter,
-                   wxClassInfo* itsClass,
-                   const wxString& name,
-                   const wxString& typeName,
-                   wxPropertyAccessor *accessor,
-                   wxxVariant dv,
-                   wxPropertyInfoFlags flags = 0,
-                   const wxString& helpString = wxEmptyString,
-                   const wxString& groupString = wxEmptyString) :
-                   m_itsClass(itsClass),
-           m_name(name),
-           m_typeInfo(NULL),
-           m_typeName(typeName) ,
-           m_collectionElementTypeInfo(NULL),
-           m_accessor(accessor),
-           m_defaultValue(dv),
-           m_flags(flags),
-           m_helpString(helpString),
-           m_groupString(groupString)
-       {
-           Insert(iter);
-       }
-
-#if wxUSE_UNICODE
-    wxPropertyInfo(wxPropertyInfo* &iter,
-                   wxClassInfo* itsClass,
-                   const wxString& name,
-                   const char* typeName,
-                   wxPropertyAccessor *accessor,
-                   wxxVariant dv,
-                   wxPropertyInfoFlags flags = 0,
-                   const wxString& helpString = wxEmptyString,
-                   const wxString& groupString = wxEmptyString) :
-                   m_itsClass(itsClass),
-           m_name(name),
-           m_typeInfo(NULL),
-           m_typeName(wxString::FromAscii(typeName)) ,
-           m_collectionElementTypeInfo(NULL),
-           m_accessor(accessor),
-           m_defaultValue(dv),
-           m_flags(flags),
-           m_helpString(helpString),
-           m_groupString(groupString)
-       {
-           Insert(iter);
-       }
-#endif
-    wxPropertyInfo(wxPropertyInfo* &iter,
-                   wxClassInfo* itsClass,
-                   const wxString& name,
-                   wxDelegateTypeInfo* type,
-                   wxPropertyAccessor *accessor,
-                   wxxVariant dv,
-                   wxPropertyInfoFlags flags = 0,
-                   const wxString& helpString = wxEmptyString,
-                   const wxString& groupString = wxEmptyString) :
-           m_itsClass(itsClass),
-           m_name(name),
-           m_typeInfo(type),
-           m_collectionElementTypeInfo(NULL),
-           m_accessor(accessor),
-           m_defaultValue(dv),
-           m_flags(flags),
-           m_helpString(helpString),
-           m_groupString(groupString)
-       {
-           Insert(iter);
-       }
-
-       wxPropertyInfo(wxPropertyInfo* &iter,
-                      wxClassInfo* itsClass, const wxString& name,
-                      const wxString& collectionTypeName,
-                      const wxString& elementTypeName,
-                      wxPropertyAccessor *accessor,
-                      wxPropertyInfoFlags flags = 0,
-                      const wxString& helpString = wxEmptyString,
-                      const wxString& groupString = wxEmptyString) :
-           m_itsClass(itsClass),
-           m_name(name),
-           m_typeInfo(NULL),
-           m_typeName(collectionTypeName) ,
-           m_collectionElementTypeInfo(NULL),
-           m_collectionElementTypeName(elementTypeName),
-           m_accessor(accessor) ,
-           m_flags(flags),
-           m_helpString(helpString),
-           m_groupString(groupString)
-       {
-           Insert(iter);
-       }
-
-#if wxUSE_UNICODE
-              wxPropertyInfo(wxPropertyInfo* &iter,
-                      wxClassInfo* itsClass, const wxString& name,
-                      const char* collectionTypeName,
-                      const char* elementTypeName,
-                      wxPropertyAccessor *accessor,
-                      wxPropertyInfoFlags flags = 0,
-                      const wxString& helpString = wxEmptyString,
-                      const wxString& groupString = wxEmptyString) :
-           m_itsClass(itsClass),
-           m_name(name),
-           m_typeInfo(NULL),
-           m_typeName(wxString::FromAscii(collectionTypeName)) ,
-           m_collectionElementTypeInfo(NULL),
-           m_collectionElementTypeName(wxString::FromAscii(elementTypeName)),
-           m_accessor(accessor) ,
-           m_flags(flags),
-           m_helpString(helpString),
-           m_groupString(groupString)
-       {
-           Insert(iter);
-       }
-#endif
-       ~wxPropertyInfo() ;
-
-       // return the class this property is declared in
-       const wxClassInfo*  GetDeclaringClass() const { return m_itsClass ; }
-
-       // return the name of this property
-       const wxString&     GetName() const { return m_name ; }
-
-       // returns the flags of this property
-       wxPropertyInfoFlags GetFlags() const { return m_flags ;}
-
-       // returns the short help string of this property
-       const wxString&     GetHelpString() const { return m_helpString ; }
-
-       // returns the group string of this property
-       const wxString&     GetGroupString() const { return m_groupString ; }
-
-       // return the element type info of this property (for collections, otherwise NULL)
-       const wxTypeInfo *  GetCollectionElementTypeInfo() const
-       {
-           if ( m_collectionElementTypeInfo == NULL )
-               m_collectionElementTypeInfo = wxTypeInfo::FindType(m_collectionElementTypeName) ;
-           return m_collectionElementTypeInfo ;
-       }
-
-       // return the type info of this property
-       const wxTypeInfo *  GetTypeInfo() const
-       {
-           if ( m_typeInfo == NULL )
-               m_typeInfo = wxTypeInfo::FindType(m_typeName) ;
-           return m_typeInfo ;
-       }
-
-       // return the accessor for this property
-       wxPropertyAccessor* GetAccessor() const { return m_accessor ; }
-
-       // returns NULL if this is the last property of this class
-       wxPropertyInfo*     GetNext() const { return m_next ; }
-
-       // returns the default value of this property, its kind may be wxT_VOID if it is not valid
-       wxxVariant          GetDefaultValue() const { return m_defaultValue ; }
-private :
-    void Insert(wxPropertyInfo* &iter)
-    {
-        m_next = NULL ;
-        if ( iter == NULL )
-            iter = this ;
-        else
-        {
-            wxPropertyInfo* i = iter ;
-            while( i->m_next )
-                i = i->m_next ;
-
-            i->m_next = this ;
-        }
-    }
-
-    wxClassInfo*        m_itsClass ;
-    wxString            m_name ;
-    mutable wxTypeInfo*         m_typeInfo ;
-    wxString            m_typeName ;
-    mutable wxTypeInfo*         m_collectionElementTypeInfo ;
-    wxString            m_collectionElementTypeName ;
-    wxPropertyAccessor* m_accessor ;
-    wxxVariant          m_defaultValue;
-    wxPropertyInfoFlags m_flags ;
-    wxString            m_helpString ;
-    wxString            m_groupString ;
-    // string representation of the default value
-    //  to be assigned by the designer to the property
-    //  when the component is dropped on the container.
-    wxPropertyInfo*     m_next ;
-};
-
-WX_DECLARE_STRING_HASH_MAP_WITH_DECL( wxPropertyInfo* , wxPropertyInfoMap , class WXDLLIMPEXP_BASE ) ;
-
-#define wxBEGIN_PROPERTIES_TABLE(theClass) \
-    wxPropertyInfo *theClass::GetPropertiesStatic()  \
-{  \
-    typedef theClass class_t; \
-    static wxPropertyInfo* first = NULL ;
-
-#define wxEND_PROPERTIES_TABLE() \
-    return first ; }
-
-#define wxHIDE_PROPERTY( pname ) \
-    static wxPropertyInfo _propertyInfo##pname( first , class_t::GetClassInfoStatic() , wxT(#pname) , typeid(void).name() ,NULL , wxxVariant() , wxPROP_DONT_STREAM , wxEmptyString , wxEmptyString ) ;
-
-#define wxPROPERTY( pname , type , setter , getter , defaultValue , flags , help , group) \
-    wxSETTER( pname , class_t , type , setter ) \
-    static wxSetter##pname _setter##pname ; \
-    wxGETTER( pname , class_t , type , getter ) \
-    static wxGetter##pname _getter##pname ; \
-    static wxPropertyAccessor _accessor##pname( &_setter##pname , &_getter##pname , NULL , NULL ) ; \
-    static wxPropertyInfo _propertyInfo##pname( first , class_t::GetClassInfoStatic() , wxT(#pname) , typeid(type).name() ,&_accessor##pname , wxxVariant(defaultValue) , flags , group , help ) ;
-
-#define wxPROPERTY_FLAGS( pname , flags , type , setter , getter ,defaultValue , pflags , help , group) \
-    wxSETTER( pname , class_t , type , setter ) \
-    static wxSetter##pname _setter##pname ; \
-    wxGETTER( pname , class_t , type , getter ) \
-    static wxGetter##pname _getter##pname ; \
-    static wxPropertyAccessor _accessor##pname( &_setter##pname , &_getter##pname , NULL , NULL ) ; \
-    static wxPropertyInfo _propertyInfo##pname( first , class_t::GetClassInfoStatic() , wxT(#pname) , typeid(flags).name() ,&_accessor##pname , wxxVariant(defaultValue), wxPROP_ENUM_STORE_LONG | pflags , help , group ) ;
-
-#define wxREADONLY_PROPERTY( pname , type , getter ,defaultValue , flags , help , group) \
-    wxGETTER( pname , class_t , type , getter ) \
-    static wxGetter##pname _getter##pname ; \
-    static wxPropertyAccessor _accessor##pname( NULL , &_getter##pname , NULL , NULL ) ; \
-    static wxPropertyInfo _propertyInfo##pname( first , class_t::GetClassInfoStatic() , wxT(#pname) , typeid(type).name() ,&_accessor##pname , wxxVariant(defaultValue), flags , help , group ) ;
-
-#define wxREADONLY_PROPERTY_FLAGS( pname , flags , type , getter ,defaultValue , pflags , help , group) \
-    wxGETTER( pname , class_t , type , getter ) \
-    static wxGetter##pname _getter##pname ; \
-    static wxPropertyAccessor _accessor##pname( NULL , &_getter##pname , NULL , NULL ) ; \
-    static wxPropertyInfo _propertyInfo##pname( first , class_t::GetClassInfoStatic() , wxT(#pname) , typeid(flags).name() ,&_accessor##pname , wxxVariant(defaultValue), wxPROP_ENUM_STORE_LONG | pflags , help , group ) ;
-
-#define wxPROPERTY_COLLECTION( pname , colltype , addelemtype , adder , getter , flags , help , group ) \
-    wxADDER( pname , class_t , addelemtype , adder ) \
-    static wxAdder##pname _adder##pname ; \
-    wxCOLLECTION_GETTER( pname , class_t , colltype , getter ) \
-    static wxCollectionGetter##pname _collectionGetter##pname ; \
-    static wxPropertyAccessor _accessor##pname( NULL , NULL ,&_adder##pname , &_collectionGetter##pname ) ; \
-    static wxPropertyInfo _propertyInfo##pname( first , class_t::GetClassInfoStatic() , wxT(#pname) , typeid(colltype).name() ,typeid(addelemtype).name() ,&_accessor##pname , flags , help , group ) ;
-
-#define wxREADONLY_PROPERTY_COLLECTION( pname , colltype , addelemtype , getter , flags , help , group) \
-    wxCOLLECTION_GETTER( pname , class_t , colltype , getter ) \
-    static wxCollectionGetter##pname _collectionGetter##pname ; \
-    static wxPropertyAccessor _accessor##pname( NULL , NULL , NULL , &_collectionGetter##pname ) ; \
-    static wxPropertyInfo _propertyInfo##pname( first ,class_t::GetClassInfoStatic() ,  wxT(#pname) , typeid(colltype).name() ,typeid(addelemtype).name() ,&_accessor##pname , flags , help , group  ) ;
-
-
-#define wxEVENT_PROPERTY( name , eventType , eventClass ) \
-    static wxDelegateTypeInfo _typeInfo##name( eventType , CLASSINFO( eventClass ) ) ; \
-    static wxPropertyInfo _propertyInfo##name( first ,class_t::GetClassInfoStatic() , wxT(#name) , &_typeInfo##name , NULL , wxxVariant() ) ; \
-
-#define wxEVENT_RANGE_PROPERTY( name , eventType , lastEventType , eventClass ) \
-    static wxDelegateTypeInfo _typeInfo##name( eventType , lastEventType , CLASSINFO( eventClass ) ) ; \
-    static wxPropertyInfo _propertyInfo##name( first , class_t::GetClassInfoStatic() , wxT(#name) , &_typeInfo##name , NULL , wxxVariant() ) ; \
-
-// ----------------------------------------------------------------------------
-// Implementation Helper for Simple Properties
-// ----------------------------------------------------------------------------
-
-#define wxIMPLEMENT_PROPERTY(name, type) \
-private:\
-    type m_##name; \
-public: \
-  void  Set##name( type const & p) { m_##name = p; } \
-  type const & Get##name() const  { return m_##name; }
-
-// ----------------------------------------------------------------------------
-// Handler Info
-//
-// this is describing an event sink
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_BASE wxHandlerInfo
-{
-    friend class WXDLLIMPEXP_FWD_BASE wxDynamicClassInfo ;
-public :
-    wxHandlerInfo(wxHandlerInfo* &iter,
-                   wxClassInfo* itsClass,
-                  const wxString& name,
-                  wxObjectEventFunction address,
-                  const wxClassInfo* eventClassInfo) :
-            m_eventFunction(address),
-            m_name(name),
-            m_eventClassInfo(eventClassInfo) ,
-            m_itsClass(itsClass)
-       {
-           m_next = NULL ;
-           if ( iter == NULL )
-               iter = this ;
-           else
-           {
-               wxHandlerInfo* i = iter ;
-               while( i->m_next )
-                   i = i->m_next ;
-
-               i->m_next = this ;
-           }
-       }
-
-       ~wxHandlerInfo() ;
-
-       // return the name of this handler
-       const wxString& GetName() const { return m_name ; }
-
-       // return the class info of the event
-       const wxClassInfo *GetEventClassInfo() const { return m_eventClassInfo ; }
-
-       // get the handler function pointer
-       wxObjectEventFunction GetEventFunction() const { return m_eventFunction ; }
-
-       // returns NULL if this is the last handler of this class
-       wxHandlerInfo*     GetNext() const { return m_next ; }
-
-       // return the class this property is declared in
-       const wxClassInfo*   GetDeclaringClass() const { return m_itsClass ; }
-
-private :
-    wxObjectEventFunction m_eventFunction ;
-    wxString            m_name;
-    const wxClassInfo*  m_eventClassInfo ;
-    wxHandlerInfo*      m_next ;
-    wxClassInfo*        m_itsClass ;
-};
-
-#define wxHANDLER(name,eventClassType) \
-    static wxHandlerInfo _handlerInfo##name( first , class_t::GetClassInfoStatic() , wxT(#name) , (wxObjectEventFunction) (wxEventFunction) &name , CLASSINFO( eventClassType ) ) ;
-
-#define wxBEGIN_HANDLERS_TABLE(theClass) \
-    wxHandlerInfo *theClass::GetHandlersStatic()  \
-{  \
-    typedef theClass class_t; \
-    static wxHandlerInfo* first = NULL ;
-
-#define wxEND_HANDLERS_TABLE() \
-    return first ; }
-
-// ----------------------------------------------------------------------------
-// Constructor Bridges
-//
-// allow to set up constructors with params during runtime
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_BASE wxConstructorBridge
-{
-public :
-    virtual ~wxConstructorBridge() {};
-    virtual void Create(wxObject * &o, wxxVariant *args) = 0;
-};
-
-// a direct constructor bridge calls the operator new for this class and
-// passes all params to the constructor. needed for classes that cannot be
-// instantiated using alloc-create semantics
-class WXDLLIMPEXP_BASE wxDirectConstructorBrigde : public wxConstructorBridge
-{
-public :
-    virtual void Create(wxObject * &o, wxxVariant *args) = 0;
-} ;
-
-// Creator Bridges for all Numbers of Params
-
-// no params
-
-template<typename Class>
-struct wxConstructorBridge_0 : public wxConstructorBridge
-{
-    void Create(wxObject * &o, wxxVariant *)
-    {
-        Class *obj = dynamic_cast<Class*>(o);
-        obj->Create();
-    }
-};
-
-struct wxConstructorBridge_Dummy : public wxConstructorBridge
-{
-    void Create(wxObject *&, wxxVariant *)
-    {
-    }
-} ;
-
-#define wxCONSTRUCTOR_0(klass) \
-    wxConstructorBridge_0<klass> constructor##klass ; \
-    wxConstructorBridge* klass::ms_constructor = &constructor##klass ; \
-    const wxChar *klass::ms_constructorProperties[] = { NULL } ; \
-    const int klass::ms_constructorPropertiesCount = 0 ;
-
-#define wxCONSTRUCTOR_DUMMY(klass) \
-    wxConstructorBridge_Dummy constructor##klass ; \
-    wxConstructorBridge* klass::ms_constructor = &constructor##klass ; \
-    const wxChar *klass::ms_constructorProperties[] = { NULL } ; \
-    const int klass::ms_constructorPropertiesCount = 0 ;
-
-// 1 param
-
-template<typename Class, typename T0>
-struct wxConstructorBridge_1 : public wxConstructorBridge
-{
-    void Create(wxObject * &o, wxxVariant *args)
-    {
-        Class *obj = dynamic_cast<Class*>(o);
-        obj->Create(
-            args[0].wxTEMPLATED_MEMBER_CALL(Get , T0)
-            );
-    }
-};
-
-#define wxCONSTRUCTOR_1(klass,t0,v0) \
-    wxConstructorBridge_1<klass,t0> constructor##klass ; \
-    wxConstructorBridge* klass::ms_constructor = &constructor##klass ; \
-    const wxChar *klass::ms_constructorProperties[] = { wxT(#v0) } ; \
-    const int klass::ms_constructorPropertiesCount = 1 ;
-
-// 2 params
-
-template<typename Class,
-typename T0, typename T1>
-struct wxConstructorBridge_2 : public wxConstructorBridge
-{
-    void Create(wxObject * &o, wxxVariant *args)
-    {
-        Class *obj = dynamic_cast<Class*>(o);
-        obj->Create(
-            args[0].wxTEMPLATED_MEMBER_CALL(Get , T0) ,
-            args[1].wxTEMPLATED_MEMBER_CALL(Get , T1)
-            );
-    }
-};
-
-#define wxCONSTRUCTOR_2(klass,t0,v0,t1,v1) \
-    wxConstructorBridge_2<klass,t0,t1> constructor##klass ; \
-    wxConstructorBridge* klass::ms_constructor = &constructor##klass ; \
-    const wxChar *klass::ms_constructorProperties[] = { wxT(#v0)  , wxT(#v1)  } ; \
-    const int klass::ms_constructorPropertiesCount = 2;
-
-// direct constructor version
-
-template<typename Class,
-typename T0, typename T1>
-struct wxDirectConstructorBridge_2 : public wxDirectConstructorBrigde
-{
-    void Create(wxObject * &o, wxxVariant *args)
-    {
-        o = new Class(
-            args[0].wxTEMPLATED_MEMBER_CALL(Get , T0) ,
-            args[1].wxTEMPLATED_MEMBER_CALL(Get , T1)
-            );
-    }
-};
-
-#define wxDIRECT_CONSTRUCTOR_2(klass,t0,v0,t1,v1) \
-    wxDirectConstructorBridge_2<klass,t0,t1> constructor##klass ; \
-    wxConstructorBridge* klass::ms_constructor = &constructor##klass ; \
-    const wxChar *klass::ms_constructorProperties[] = { wxT(#v0)  , wxT(#v1)  } ; \
-    const int klass::ms_constructorPropertiesCount = 2;
-
-
-// 3 params
-
-template<typename Class,
-typename T0, typename T1, typename T2>
-struct wxConstructorBridge_3 : public wxConstructorBridge
-{
-    void Create(wxObject * &o, wxxVariant *args)
-    {
-        Class *obj = dynamic_cast<Class*>(o);
-        obj->Create(
-            args[0].wxTEMPLATED_MEMBER_CALL(Get , T0) ,
-            args[1].wxTEMPLATED_MEMBER_CALL(Get , T1) ,
-            args[2].wxTEMPLATED_MEMBER_CALL(Get , T2)
-            );
-    }
-};
-
-#define wxCONSTRUCTOR_3(klass,t0,v0,t1,v1,t2,v2) \
-    wxConstructorBridge_3<klass,t0,t1,t2> constructor##klass ; \
-    wxConstructorBridge* klass::ms_constructor = &constructor##klass ; \
-    const wxChar *klass::ms_constructorProperties[] = { wxT(#v0)  , wxT(#v1)  , wxT(#v2)  } ; \
-    const int klass::ms_constructorPropertiesCount = 3 ;
-
-// direct constructor version
-
-template<typename Class,
-typename T0, typename T1, typename T2>
-struct wxDirectConstructorBridge_3 : public wxDirectConstructorBrigde
-{
-    void Create(wxObject * &o, wxxVariant *args)
-    {
-        o = new Class(
-            args[0].wxTEMPLATED_MEMBER_CALL(Get , T0) ,
-            args[1].wxTEMPLATED_MEMBER_CALL(Get , T1) ,
-            args[2].wxTEMPLATED_MEMBER_CALL(Get , T2)
-            );
-    }
-};
-
-#define wxDIRECT_CONSTRUCTOR_3(klass,t0,v0,t1,v1,t2,v2) \
-    wxDirectConstructorBridge_3<klass,t0,t1,t2> constructor##klass ; \
-    wxConstructorBridge* klass::ms_constructor = &constructor##klass ; \
-    const wxChar *klass::ms_constructorProperties[] = { wxT(#v0)  , wxT(#v1) , wxT(#v2) } ; \
-    const int klass::ms_constructorPropertiesCount = 3;
-
-// 4 params
-
-template<typename Class,
-typename T0, typename T1, typename T2, typename T3>
-struct wxConstructorBridge_4 : public wxConstructorBridge
-{
-    void Create(wxObject * &o, wxxVariant *args)
-    {
-        Class *obj = dynamic_cast<Class*>(o);
-        obj->Create(
-            args[0].wxTEMPLATED_MEMBER_CALL(Get , T0) ,
-            args[1].wxTEMPLATED_MEMBER_CALL(Get , T1) ,
-            args[2].wxTEMPLATED_MEMBER_CALL(Get , T2) ,
-            args[3].wxTEMPLATED_MEMBER_CALL(Get , T3)
-            );
-    }
-};
+// include definitions of other XTI structures
+#include "wx/variantbase.h"
+#include "wx/xtitypes.h"
+#include "wx/xtictor.h"
+#include "wx/xtiprop.h"
+#include "wx/xtihandler.h"
 
-#define wxCONSTRUCTOR_4(klass,t0,v0,t1,v1,t2,v2,t3,v3) \
-    wxConstructorBridge_4<klass,t0,t1,t2,t3> constructor##klass ; \
-    wxConstructorBridge* klass::ms_constructor = &constructor##klass ; \
-    const wxChar *klass::ms_constructorProperties[] = { wxT(#v0)  , wxT(#v1)  , wxT(#v2)  , wxT(#v3)  } ; \
-    const int klass::ms_constructorPropertiesCount = 4 ;
-
-// 5 params
-
-template<typename Class,
-typename T0, typename T1, typename T2, typename T3, typename T4>
-struct wxConstructorBridge_5 : public wxConstructorBridge
-{
-    void Create(wxObject * &o, wxxVariant *args)
-    {
-        Class *obj = dynamic_cast<Class*>(o);
-        obj->Create(
-            args[0].wxTEMPLATED_MEMBER_CALL(Get , T0) ,
-            args[1].wxTEMPLATED_MEMBER_CALL(Get , T1) ,
-            args[2].wxTEMPLATED_MEMBER_CALL(Get , T2) ,
-            args[3].wxTEMPLATED_MEMBER_CALL(Get , T3) ,
-            args[4].wxTEMPLATED_MEMBER_CALL(Get , T4)
-            );
-    }
-};
-
-#define wxCONSTRUCTOR_5(klass,t0,v0,t1,v1,t2,v2,t3,v3,t4,v4) \
-    wxConstructorBridge_5<klass,t0,t1,t2,t3,t4> constructor##klass ; \
-    wxConstructorBridge* klass::ms_constructor = &constructor##klass ; \
-    const wxChar *klass::ms_constructorProperties[] = { wxT(#v0)  , wxT(#v1)  , wxT(#v2)  , wxT(#v3)  , wxT(#v4)  } ; \
-    const int klass::ms_constructorPropertiesCount = 5;
-
-// 6 params
-
-template<typename Class,
-typename T0, typename T1, typename T2, typename T3, typename T4, typename T5>
-struct wxConstructorBridge_6 : public wxConstructorBridge
-{
-    void Create(wxObject * &o, wxxVariant *args)
-    {
-        Class *obj = dynamic_cast<Class*>(o);
-        obj->Create(
-            args[0].wxTEMPLATED_MEMBER_CALL(Get , T0) ,
-            args[1].wxTEMPLATED_MEMBER_CALL(Get , T1) ,
-            args[2].wxTEMPLATED_MEMBER_CALL(Get , T2) ,
-            args[3].wxTEMPLATED_MEMBER_CALL(Get , T3) ,
-            args[4].wxTEMPLATED_MEMBER_CALL(Get , T4) ,
-            args[5].wxTEMPLATED_MEMBER_CALL(Get , T5)
-            );
-    }
-};
-
-#define wxCONSTRUCTOR_6(klass,t0,v0,t1,v1,t2,v2,t3,v3,t4,v4,t5,v5) \
-    wxConstructorBridge_6<klass,t0,t1,t2,t3,t4,t5> constructor##klass ; \
-    wxConstructorBridge* klass::ms_constructor = &constructor##klass ; \
-    const wxChar *klass::ms_constructorProperties[] = { wxT(#v0)  , wxT(#v1)  , wxT(#v2)  , wxT(#v3)  , wxT(#v4)  , wxT(#v5)  } ; \
-    const int klass::ms_constructorPropertiesCount = 6;
-
-// direct constructor version
-
-template<typename Class,
-typename T0, typename T1, typename T2, typename T3, typename T4, typename T5>
-struct wxDirectConstructorBridge_6 : public wxDirectConstructorBrigde
-{
-    void Create(wxObject * &o, wxxVariant *args)
-    {
-        o = new Class(
-            args[0].wxTEMPLATED_MEMBER_CALL(Get , T0) ,
-            args[1].wxTEMPLATED_MEMBER_CALL(Get , T1) ,
-            args[2].wxTEMPLATED_MEMBER_CALL(Get , T2) ,
-            args[3].wxTEMPLATED_MEMBER_CALL(Get , T3) ,
-            args[4].wxTEMPLATED_MEMBER_CALL(Get , T4) ,
-            args[5].wxTEMPLATED_MEMBER_CALL(Get , T5)
-            );
-    }
-};
-
-#define wxDIRECT_CONSTRUCTOR_6(klass,t0,v0,t1,v1,t2,v2,t3,v3,t4,v4,t5,v5) \
-    wxDirectConstructorBridge_6<klass,t0,t1,t2,t3,t4,t5> constructor##klass ; \
-    wxConstructorBridge* klass::ms_constructor = &constructor##klass ; \
-    const wxChar *klass::ms_constructorProperties[] = { wxT(#v0)  , wxT(#v1)  , wxT(#v2)  , wxT(#v3)  , wxT(#v4)  , wxT(#v5)  } ; \
-    const int klass::ms_constructorPropertiesCount = 6;
-
-// 7 params
-
-template<typename Class,
-typename T0, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6>
-struct wxConstructorBridge_7 : public wxConstructorBridge
-{
-    void Create(wxObject * &o, wxxVariant *args)
-    {
-        Class *obj = dynamic_cast<Class*>(o);
-        obj->Create(
-            args[0].wxTEMPLATED_MEMBER_CALL(Get , T0) ,
-            args[1].wxTEMPLATED_MEMBER_CALL(Get , T1) ,
-            args[2].wxTEMPLATED_MEMBER_CALL(Get , T2) ,
-            args[3].wxTEMPLATED_MEMBER_CALL(Get , T3) ,
-            args[4].wxTEMPLATED_MEMBER_CALL(Get , T4) ,
-            args[5].wxTEMPLATED_MEMBER_CALL(Get , T5) ,
-            args[6].wxTEMPLATED_MEMBER_CALL(Get , T6)
-            );
-    }
-};
-
-#define wxCONSTRUCTOR_7(klass,t0,v0,t1,v1,t2,v2,t3,v3,t4,v4,t5,v5,t6,v6) \
-    wxConstructorBridge_7<klass,t0,t1,t2,t3,t4,t5,t6> constructor##klass ; \
-    wxConstructorBridge* klass::ms_constructor = &constructor##klass ; \
-    const wxChar *klass::ms_constructorProperties[] = { wxT(#v0)  , wxT(#v1)  , wxT(#v2)  , wxT(#v3)  , wxT(#v4)  , wxT(#v5)  , wxT(#v6) } ; \
-    const int klass::ms_constructorPropertiesCount = 7;
-
-// 8 params
-
-template<typename Class,
-typename T0, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7>
-struct wxConstructorBridge_8 : public wxConstructorBridge
-{
-    void Create(wxObject * &o, wxxVariant *args)
-    {
-        Class *obj = dynamic_cast<Class*>(o);
-        obj->Create(
-            args[0].wxTEMPLATED_MEMBER_CALL(Get , T0) ,
-            args[1].wxTEMPLATED_MEMBER_CALL(Get , T1) ,
-            args[2].wxTEMPLATED_MEMBER_CALL(Get , T2) ,
-            args[3].wxTEMPLATED_MEMBER_CALL(Get , T3) ,
-            args[4].wxTEMPLATED_MEMBER_CALL(Get , T4) ,
-            args[5].wxTEMPLATED_MEMBER_CALL(Get , T5) ,
-            args[6].wxTEMPLATED_MEMBER_CALL(Get , T6) ,
-            args[7].wxTEMPLATED_MEMBER_CALL(Get , T7)
-            );
-    }
-};
-
-#define wxCONSTRUCTOR_8(klass,t0,v0,t1,v1,t2,v2,t3,v3,t4,v4,t5,v5,t6,v6,t7,v7) \
-    wxConstructorBridge_8<klass,t0,t1,t2,t3,t4,t5,t6,t7> constructor##klass ; \
-    wxConstructorBridge* klass::ms_constructor = &constructor##klass ; \
-    const wxChar *klass::ms_constructorProperties[] = { wxT(#v0)  , wxT(#v1)  , wxT(#v2)  , wxT(#v3)  , wxT(#v4)  , wxT(#v5)  , wxT(#v6) , wxT(#v7) } ; \
-    const int klass::ms_constructorPropertiesCount = 8;
 // ----------------------------------------------------------------------------
 // wxClassInfo
 // ----------------------------------------------------------------------------
 
+class WXDLLIMPEXP_BASE wxObject;
+class WXDLLIMPEXP_BASE wxVariantBase;
+class WXDLLIMPEXP_BASE wxVariantBaseArray;
+
 typedef wxObject *(*wxObjectConstructorFn)(void);
-typedef wxObject* (*wxVariantToObjectConverter)( wxxVariant &data ) ;
-typedef wxxVariant (*wxObjectToVariantConverter)( wxObject* ) ;
+typedef wxObject* (*wxVariantToObjectConverter)( wxVariantBase &data );
+typedef wxVariantBase (*wxObjectToVariantConverter)( wxObject* );
 
-class WXDLLIMPEXP_FWD_BASE wxWriter;
-class WXDLLIMPEXP_FWD_BASE wxPersister;
+class WXDLLIMPEXP_BASE wxObjectWriter;
+class WXDLLIMPEXP_BASE wxObjectReaderCallback;
 
-typedef bool (*wxObjectStreamingCallback) ( const wxObject *, wxWriter * , wxPersister * , wxxVariantArray & ) ;
+typedef bool (*wxObjectStreamingCallback) ( const wxObject *, wxObjectWriter *, \
+                                            wxObjectReaderCallback *, wxVariantBaseArray & );
 
 class WXDLLIMPEXP_BASE wxClassInfo
 {
-    friend class WXDLLIMPEXP_FWD_BASE wxPropertyInfo ;
-    friend class WXDLLIMPEXP_FWD_BASE wxHandlerInfo ;
-    friend wxObject *wxCreateDynamicObject(const wxString& name);
+    friend class WXDLLIMPEXP_BASE wxPropertyInfo;
+    friend class WXDLLIMPEXP_BASE wxHandlerInfo;
+    friend wxObject *wxCreateDynamicObject(const wxChar *name);
+
 public:
     wxClassInfo(const wxClassInfo **_Parents,
-        const wxChar *_UnitName,
-        const wxChar *_ClassName,
-        int size,
-        wxObjectConstructorFn ctor ,
-        wxPropertyInfo *_Props ,
-        wxHandlerInfo *_Handlers ,
-        wxConstructorBridge* _Constructor ,
-        const wxChar ** _ConstructorProperties ,
-        const int _ConstructorPropertiesCount ,
-        wxVariantToObjectConverter _PtrConverter1 ,
-        wxVariantToObjectConverter _Converter2 ,
-        wxObjectToVariantConverter _Converter3 ,
-        wxObjectStreamingCallback _streamingCallback = NULL
-        ) :
-
+                const wxChar *_UnitName,
+                const wxChar *_ClassName,
+                int size,
+                wxObjectConstructorFn ctor,
+                wxPropertyInfo *_Props,
+                wxHandlerInfo *_Handlers,
+                wxObjectAllocatorAndCreator* _Constructor,
+                const wxChar ** _ConstructorProperties,
+                const int _ConstructorPropertiesCount,
+                wxVariantToObjectConverter _PtrConverter1,
+                wxVariantToObjectConverter _Converter2,
+                wxObjectToVariantConverter _Converter3,
+                wxObjectStreamingCallback _streamingCallback = NULL) :
             m_className(_ClassName),
             m_objectSize(size),
             m_objectConstructor(ctor),
@@ -1637,7 +99,7 @@ public:
             m_streamingCallback(_streamingCallback)
     {
         sm_first = this;
-        Register() ;
+        Register();
     }
 
     wxClassInfo(const wxChar *_UnitName, const wxChar *_ClassName,
@@ -1659,445 +121,494 @@ public:
             m_streamingCallback(NULL)
     {
         sm_first = this;
-        Register() ;
+        Register();
+    }
+
+    // ctor compatible with old RTTI system
+    wxClassInfo(const wxChar *_ClassName,
+                const wxClassInfo *_Parent1,
+                const wxClassInfo *_Parent2,
+                int size,
+                wxObjectConstructorFn ctor) :
+            m_className(_ClassName),
+            m_objectSize(size),
+            m_objectConstructor(ctor),
+            m_next(sm_first),
+            m_firstProperty(NULL),
+            m_firstHandler(NULL),
+            m_parents(NULL),
+            m_unitName(NULL),
+            m_constructor(NULL),
+            m_constructorProperties(NULL),
+            m_constructorPropertiesCount(0),
+            m_variantOfPtrToObjectConverter(NULL),
+            m_variantToObjectConverter(NULL),
+            m_objectToVariantConverter(NULL),
+            m_streamingCallback(NULL)
+    {
+        sm_first = this;
+        m_parents[0] = _Parent1;
+        m_parents[1] = _Parent2;
+        m_parents[2] = NULL;
+        Register();
     }
 
-    virtual ~wxClassInfo() ;
+    virtual ~wxClassInfo();
 
-    // allocates an instance of this class, this object does not have to be initialized or fully constructed
-    // as this call will be followed by a call to Create
-    virtual wxObject *AllocateObject() const { return m_objectConstructor ? (*m_objectConstructor)() : 0; }
+    // allocates an instance of this class, this object does not have to be 
+    // initialized or fully constructed as this call will be followed by a call to Create
+    virtual wxObject *AllocateObject() const 
+        { return m_objectConstructor ? (*m_objectConstructor)() : 0; }
 
     // 'old naming' for AllocateObject staying here for backward compatibility
-    wxObject *CreateObject() const { return AllocateObject() ; }
+    wxObject *CreateObject() const { return AllocateObject(); }
 
     // direct construction call for classes that cannot construct instances via alloc/create
-    wxObject *ConstructObject(int ParamCount, wxxVariant *Params) const
-    {
-        if ( ParamCount != m_constructorPropertiesCount )
-        {
-            wxLogError( wxGetTranslation(wxT("Illegal Parameter Count for ConstructObject Method")) ) ;
-            return NULL ;
-        }
-        wxObject *object = NULL ;
-        m_constructor->Create( object , Params ) ;
-        return object ;
-    }
+    wxObject *ConstructObject(int ParamCount, wxVariantBase *Params) const;
 
-    bool NeedsDirectConstruction() const { return dynamic_cast<wxDirectConstructorBrigde*>( m_constructor) != NULL ; }
+    bool NeedsDirectConstruction() const 
+        { return wx_dynamic_cast(wxObjectAllocator*, m_constructor) != NULL; }
 
-    const wxChar       *GetClassName() const { return m_className; }
+    const wxChar       *GetClassName() const 
+        { return m_className; }
     const wxChar       *GetBaseClassName1() const
         { return m_parents[0] ? m_parents[0]->GetClassName() : NULL; }
     const wxChar       *GetBaseClassName2() const
         { return (m_parents[0] && m_parents[1]) ? m_parents[1]->GetClassName() : NULL; }
-    const wxChar       *GetIncludeName() const { return m_unitName ; }
-    const wxClassInfo **GetParents() const { return m_parents; }
-    int                 GetSize() const { return m_objectSize; }
-    bool                IsDynamic() const { return (NULL != m_objectConstructor); }
 
-    wxObjectConstructorFn      GetConstructor() const { return m_objectConstructor; }
-    static const wxClassInfo  *GetFirst() { return sm_first; }
-    const wxClassInfo         *GetNext() const { return m_next; }
-    static wxClassInfo        *FindClass(const wxString& className);
+    const wxClassInfo  *GetBaseClass1() const
+        { return m_parents[0]; }
+    const wxClassInfo  *GetBaseClass2() const
+        { return m_parents[0] ? m_parents[1] : NULL; }
+
+    const wxChar       *GetIncludeName() const 
+        { return m_unitName; }
+    const wxClassInfo **GetParents() const 
+        { return m_parents; }
+    int                 GetSize() const 
+        { return m_objectSize; }
+    bool                IsDynamic() const 
+        { return (NULL != m_objectConstructor); }
+
+    wxObjectConstructorFn      GetConstructor() const 
+        { return m_objectConstructor; }
+    const wxClassInfo         *GetNext() const 
+        { return m_next; }
+
+    // statics:
+
+    static void                CleanUp();
+    static wxClassInfo        *FindClass(const wxChar *className);
+    static const wxClassInfo  *GetFirst() 
+        { return sm_first; }
+
 
     // Climb upwards through inheritance hierarchy.
     // Dual inheritance is catered for.
 
-    bool IsKindOf(const wxClassInfo *info) const
-    {
-        if ( info != 0 )
-        {
-            if ( info == this )
-                return true ;
-
-            for ( int i = 0 ; m_parents[i] ; ++ i )
-            {
-                if ( m_parents[i]->IsKindOf( info ) )
-                    return true ;
-            }
-        }
-        return false ;
-    }
+    bool IsKindOf(const wxClassInfo *info) const;
 
-    DECLARE_CLASS_INFO_ITERATORS()
+    wxDECLARE_CLASS_INFO_ITERATORS()
 
     // if there is a callback registered with that class it will be called
     // before this object will be written to disk, it can veto streaming out
     // this object by returning false, if this class has not registered a
     // callback, the search will go up the inheritance tree if no callback has
     // been registered true will be returned by default
-    bool BeforeWriteObject( const wxObject *obj, wxWriter *streamer , wxPersister *persister , wxxVariantArray &metadata) const  ;
+    bool BeforeWriteObject( const wxObject *obj, wxObjectWriter *streamer, \
+                            wxObjectReaderCallback *persister, wxVariantBaseArray &metadata) const;
 
     // gets the streaming callback from this class or any superclass
-    wxObjectStreamingCallback GetStreamingCallback() const ;
-
-    static void CleanUp();
+    wxObjectStreamingCallback GetStreamingCallback() const;
 
     // returns the first property
-    const wxPropertyInfo* GetFirstProperty() const { return m_firstProperty ; }
+    const wxPropertyInfo* GetFirstProperty() const 
+        { return m_firstProperty; }
 
     // returns the first handler
-    const wxHandlerInfo* GetFirstHandler() const { return m_firstHandler ; }
+    const wxHandlerInfo* GetFirstHandler() const 
+        { return m_firstHandler; }
 
     // Call the Create upon an instance of the class, in the end the object is fully
     // initialized
-    virtual void Create (wxObject *object, int ParamCount, wxxVariant *Params) const
-    {
-        if ( ParamCount != m_constructorPropertiesCount )
-        {
-            wxLogError( wxGetTranslation(wxT("Illegal Parameter Count for Create Method")) ) ;
-            return ;
-        }
-        m_constructor->Create( object , Params ) ;
-    }
+    virtual bool Create (wxObject *object, int ParamCount, wxVariantBase *Params) const;
 
     // get number of parameters for constructor
-    virtual int GetCreateParamCount() const { return m_constructorPropertiesCount; }
+    virtual int GetCreateParamCount() const 
+        { return m_constructorPropertiesCount; }
 
     // get n-th constructor parameter
-    virtual const wxChar* GetCreateParamName(int n) const { return m_constructorProperties[n] ; }
+    virtual const wxChar* GetCreateParamName(int n) const 
+        { return m_constructorProperties[n]; }
 
-    // Runtime access to objects for simple properties (get/set) by property name, and variant data
-    virtual void SetProperty (wxObject *object, const wxChar *propertyName, const wxxVariant &value) const ;
-    virtual wxxVariant GetProperty (wxObject *object, const wxChar *propertyName) const;
+    // Runtime access to objects for simple properties (get/set) by property 
+    // name and variant data
+    virtual void SetProperty (wxObject *object, const wxChar *propertyName, 
+                              const wxVariantBase &value) const;
+    virtual wxVariantBase GetProperty (wxObject *object, const wxChar *propertyName) const;
 
     // Runtime access to objects for collection properties by property name
-    virtual wxxVariantArray GetPropertyCollection(wxObject *object, const wxChar *propertyName) const ;
-    virtual void AddToPropertyCollection(wxObject *object, const wxChar *propertyName , const wxxVariant& value) const ;
+    virtual wxVariantBaseArray GetPropertyCollection(wxObject *object, 
+                                                  const wxChar *propertyName) const;
+    virtual void AddToPropertyCollection(wxObject *object, const wxChar *propertyName, 
+                                         const wxVariantBase& value) const;
 
-    // we must be able to cast variants to wxObject pointers, templates seem not to be suitable
-    wxObject* VariantToInstance( wxxVariant &data ) const
+    // we must be able to cast variants to wxObject pointers, templates seem 
+    // not to be suitable
+    wxObject* VariantToInstance( wxVariantBase &data ) const
     {
         if ( data.GetTypeInfo()->GetKind() == wxT_OBJECT )
-            return m_variantToObjectConverter( data ) ;
+            return m_variantToObjectConverter( data );
         else
-            return m_variantOfPtrToObjectConverter( data ) ;
+            return m_variantOfPtrToObjectConverter( data );
     }
 
-    wxxVariant InstanceToVariant( wxObject *object ) const { return m_objectToVariantConverter( object ) ; }
+    wxVariantBase InstanceToVariant( wxObject *object ) const 
+        { return m_objectToVariantConverter( object ); }
 
     // find property by name
-    virtual const wxPropertyInfo *FindPropertyInfo (const wxChar *PropertyName) const ;
+    virtual const wxPropertyInfo *FindPropertyInfo (const wxChar *PropertyName) const;
 
     // find handler by name
-    virtual const wxHandlerInfo *FindHandlerInfo (const wxChar *PropertyName) const ;
+    virtual const wxHandlerInfo *FindHandlerInfo (const wxChar *handlerName) const;
 
     // find property by name
-    virtual wxPropertyInfo *FindPropertyInfoInThisClass (const wxChar *PropertyName) const ;
+    virtual wxPropertyInfo *FindPropertyInfoInThisClass (const wxChar *PropertyName) const;
 
     // find handler by name
-    virtual wxHandlerInfo *FindHandlerInfoInThisClass (const wxChar *PropertyName) const ;
+    virtual wxHandlerInfo *FindHandlerInfoInThisClass (const wxChar *handlerName) const;
+
+    // puts all the properties of this class and its superclasses in the map, 
+    // as long as there is not yet an entry with the same name (overriding mechanism)
+    void GetProperties( wxPropertyInfoMap &map ) const;
 
-    // puts all the properties of this class and its superclasses in the map, as long as there is not yet
-    // an entry with the same name (overriding mechanism)
-    void GetProperties( wxPropertyInfoMap &map ) const ;
 private:
     const wxChar            *m_className;
     int                      m_objectSize;
-    wxObjectConstructorFn    m_objectConstructor;
+    wxObjectConstructorFn     m_objectConstructor;
 
     // class info object live in a linked list:
     // pointers to its head and the next element in it
 
     static wxClassInfo      *sm_first;
-    wxClassInfo             *m_next;
+    wxClassInfo              *m_next;
 
     static wxHashTable      *sm_classTable;
 
-protected :
-    wxPropertyInfo *         m_firstProperty ;
-    wxHandlerInfo *          m_firstHandler ;
+protected:
+    wxPropertyInfo *          m_firstProperty;
+    wxHandlerInfo *           m_firstHandler;
+
 private:
-    const wxClassInfo**      m_parents ;
-    const wxChar*            m_unitName;
-
-    wxConstructorBridge*     m_constructor ;
-    const wxChar **          m_constructorProperties ;
-    const int                m_constructorPropertiesCount ;
-    wxVariantToObjectConverter m_variantOfPtrToObjectConverter ;
-    wxVariantToObjectConverter m_variantToObjectConverter ;
-    wxObjectToVariantConverter m_objectToVariantConverter ;
-    wxObjectStreamingCallback m_streamingCallback ;
-    const wxPropertyAccessor *FindAccessor (const wxChar *propertyName) const ;
+    const wxClassInfo**       m_parents;
+    const wxChar*             m_unitName;
+
+    wxObjectAllocatorAndCreator*     m_constructor;
+    const wxChar **           m_constructorProperties;
+    const int                 m_constructorPropertiesCount;
+    wxVariantToObjectConverter m_variantOfPtrToObjectConverter;
+    wxVariantToObjectConverter m_variantToObjectConverter;
+    wxObjectToVariantConverter m_objectToVariantConverter;
+    wxObjectStreamingCallback  m_streamingCallback;
+
+    const wxPropertyAccessor *FindAccessor (const wxChar *propertyName) const;
 
 protected:
     // registers the class
     void Register();
     void Unregister();
 
-    wxDECLARE_NO_COPY_CLASS(wxClassInfo);
+    DECLARE_NO_COPY_CLASS(wxClassInfo)
 };
 
+WXDLLIMPEXP_BASE wxObject *wxCreateDynamicObject(const wxChar *name);
 
-WXDLLIMPEXP_BASE wxObject *wxCreateDynamicObject(const wxString& name);
 
 // ----------------------------------------------------------------------------
-// wxDynamicObject
+// wxDynamicClassInfo
 // ----------------------------------------------------------------------------
-//
+
 // this object leads to having a pure runtime-instantiation
 
 class WXDLLIMPEXP_BASE wxDynamicClassInfo : public wxClassInfo
 {
-    friend class WXDLLIMPEXP_FWD_BASE wxDynamicObject ;
-public :
-    wxDynamicClassInfo( const wxChar *_UnitName, const wxChar *_ClassName , const wxClassInfo* superClass ) ;
-    virtual ~wxDynamicClassInfo() ;
+    friend class WXDLLIMPEXP_BASE wxDynamicObject;
+
+public:
+    wxDynamicClassInfo( const wxChar *_UnitName, const wxChar *_ClassName, 
+                        const wxClassInfo* superClass );
+    virtual ~wxDynamicClassInfo();
 
     // constructs a wxDynamicObject with an instance
-    virtual wxObject *AllocateObject() const ;
+    virtual wxObject *AllocateObject() const;
 
     // Call the Create method for a class
-    virtual void Create (wxObject *object, int ParamCount, wxxVariant *Params) const ;
+    virtual bool Create (wxObject *object, int ParamCount, wxVariantBase *Params) const;
 
     // get number of parameters for constructor
-    virtual int GetCreateParamCount() const ;
+    virtual int GetCreateParamCount() const;
 
     // get i-th constructor parameter
-    virtual const wxChar* GetCreateParamName(int i) const ;
+    virtual const wxChar* GetCreateParamName(int i) const;
 
     // Runtime access to objects by property name, and variant data
-    virtual void SetProperty (wxObject *object, const wxChar *PropertyName, const wxxVariant &Value) const ;
-    virtual wxxVariant GetProperty (wxObject *object, const wxChar *PropertyName) const ;
+    virtual void SetProperty (wxObject *object, const wxChar *PropertyName, 
+                              const wxVariantBase &Value) const;
+    virtual wxVariantBase GetProperty (wxObject *object, const wxChar *PropertyName) const;
 
     // adds a property to this class at runtime
-    void AddProperty( const wxChar *propertyName , const wxTypeInfo* typeInfo ) ;
+    void AddProperty( const wxChar *propertyName, const wxTypeInfo* typeInfo );
 
     // removes an existing runtime-property
-    void RemoveProperty( const wxChar *propertyName ) ;
+    void RemoveProperty( const wxChar *propertyName );
 
     // renames an existing runtime-property
-    void RenameProperty( const wxChar *oldPropertyName , const wxChar *newPropertyName ) ;
+    void RenameProperty( const wxChar *oldPropertyName, const wxChar *newPropertyName );
 
     // as a handler to this class at runtime
-    void AddHandler( const wxChar *handlerName , wxObjectEventFunction address , const wxClassInfo* eventClassInfo ) ;
+    void AddHandler( const wxChar *handlerName, wxObjectEventFunction address, 
+                     const wxClassInfo* eventClassInfo );
 
     // removes an existing runtime-handler
-    void RemoveHandler( const wxChar *handlerName ) ;
+    void RemoveHandler( const wxChar *handlerName );
 
     // renames an existing runtime-handler
-    void RenameHandler( const wxChar *oldHandlerName , const wxChar *newHandlerName ) ;
-private :
-    struct wxDynamicClassInfoInternal ;
-    wxDynamicClassInfoInternal* m_data ;
-} ;
+    void RenameHandler( const wxChar *oldHandlerName, const wxChar *newHandlerName );
+
+private:
+    struct wxDynamicClassInfoInternal;
+    wxDynamicClassInfoInternal* m_data;
+};
+
 
 // ----------------------------------------------------------------------------
-// Dynamic class macros
+// wxDECLARE class macros
 // ----------------------------------------------------------------------------
 
-#define _DECLARE_DYNAMIC_CLASS(name)           \
- public:                                      \
- static wxClassInfo ms_classInfo;          \
- static const wxClassInfo* ms_classParents[] ; \
- static wxPropertyInfo* GetPropertiesStatic() ; \
- static wxHandlerInfo* GetHandlersStatic() ; \
- static wxClassInfo *GetClassInfoStatic()   \
-{ return &name::ms_classInfo; } \
-    virtual wxClassInfo *GetClassInfo() const   \
-{ return &name::ms_classInfo; }
-
-/*
-#define _DECLARE_DYNAMIC_CLASS(name)           \
- public:                                      \
- static wxClassInfo ms_class##name;          \
- static const wxClassInfo* ms_classParents##name[] ; \
- static wxPropertyInfo* GetPropertiesStatic() ; \
- static wxHandlerInfo* GetHandlersStatic() ; \
- static wxClassInfo *GetClassInfoStatic()   \
-{ return &name::ms_class##name; } \
-    virtual wxClassInfo *GetClassInfo() const   \
-{ return &name::ms_class##name; }
-*/
-#define DECLARE_DYNAMIC_CLASS(name)           \
-    static wxConstructorBridge* ms_constructor ; \
-    static const wxChar * ms_constructorProperties[] ; \
-    static const int ms_constructorPropertiesCount ; \
+#define _DECLARE_DYNAMIC_CLASS(name)                        \
+    public:                                                 \
+        static wxClassInfo ms_classInfo;                    \
+        static const wxClassInfo* ms_classParents[];        \
+        static wxPropertyInfo* GetPropertiesStatic();       \
+        static wxHandlerInfo* GetHandlersStatic();          \
+        static wxClassInfo *GetClassInfoStatic()            \
+            { return &name::ms_classInfo; }                 \
+        virtual wxClassInfo *GetClassInfo() const           \
+            { return &name::ms_classInfo; }
+
+#define wxDECLARE_DYNAMIC_CLASS(name)                       \
+    static wxObjectAllocatorAndCreator* ms_constructor;           \
+    static const wxChar * ms_constructorProperties[];       \
+    static const int ms_constructorPropertiesCount;         \
     _DECLARE_DYNAMIC_CLASS(name)
 
-#define DECLARE_DYNAMIC_CLASS_NO_ASSIGN(name)   \
-    DECLARE_NO_ASSIGN_CLASS(name)               \
-    DECLARE_DYNAMIC_CLASS(name)
+#define wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(name)             \
+    wxDECLARE_NO_ASSIGN_CLASS(name)                         \
+    wxDECLARE_DYNAMIC_CLASS(name)
 
-#define DECLARE_DYNAMIC_CLASS_NO_COPY(name)   \
-    DECLARE_NO_COPY_CLASS(name)               \
-    DECLARE_DYNAMIC_CLASS(name)
+#define wxDECLARE_DYNAMIC_CLASS_NO_COPY(name)               \
+    wxDECLARE_NO_COPY_CLASS(name)                           \
+    wxDECLARE_DYNAMIC_CLASS(name)
 
-#define DECLARE_ABSTRACT_CLASS(name) _DECLARE_DYNAMIC_CLASS(name)
-#define DECLARE_CLASS(name) DECLARE_DYNAMIC_CLASS(name)
+#define wxDECLARE_ABSTRACT_CLASS(name)    _DECLARE_DYNAMIC_CLASS(name)
+#define wxCLASSINFO(name)                 (&name::ms_classInfo)
 
-// -----------------------------------
-// for concrete classes
-// -----------------------------------
+
+// ----------------------------------------------------------------------------
+// wxIMPLEMENT class macros for concrete classes
+// ----------------------------------------------------------------------------
 
 // Single inheritance with one base class
 
-#define _TYPEINFO_CLASSES(n , toString , fromString ) \
-    wxClassTypeInfo s_typeInfo##n(wxT_OBJECT , &n::ms_classInfo , toString , fromString , typeid(n).name()) ; \
-    wxClassTypeInfo s_typeInfoPtr##n(wxT_OBJECT_PTR , &n::ms_classInfo , toString , fromString , typeid(n*).name()) ;
-
-#define _IMPLEMENT_DYNAMIC_CLASS(name, basename, unit , callback)                 \
-    wxObject* wxConstructorFor##name()                             \
-{ return new name; }                                          \
-    const wxClassInfo* name::ms_classParents[] = { &basename::ms_classInfo ,NULL } ; \
-    wxObject* wxVariantOfPtrToObjectConverter##name ( wxxVariant &data ) { return data.wxTEMPLATED_MEMBER_CALL(Get , name*) ; } \
-    wxxVariant wxObjectToVariantConverter##name ( wxObject *data ) { return wxxVariant( dynamic_cast<name*> (data)  ) ; } \
-    wxClassInfo name::ms_classInfo(name::ms_classParents , wxT(unit) , wxT(#name),   \
-    (int) sizeof(name),                              \
-    (wxObjectConstructorFn) wxConstructorFor##name   ,   \
-    name::GetPropertiesStatic(),name::GetHandlersStatic(),name::ms_constructor , name::ms_constructorProperties ,     \
-    name::ms_constructorPropertiesCount , wxVariantOfPtrToObjectConverter##name , NULL , wxObjectToVariantConverter##name , callback);
-
-#define _IMPLEMENT_DYNAMIC_CLASS_WITH_COPY(name, basename, unit, callback )                 \
-    wxObject* wxConstructorFor##name()                             \
-{ return new name; }                                          \
-    const wxClassInfo* name::ms_classParents[] = { &basename::ms_classInfo ,NULL } ; \
-    wxObject* wxVariantToObjectConverter##name ( wxxVariant &data ) { return &data.wxTEMPLATED_MEMBER_CALL(Get , name) ; } \
-    wxObject* wxVariantOfPtrToObjectConverter##name ( wxxVariant &data ) { return data.wxTEMPLATED_MEMBER_CALL(Get , name*) ; } \
-    wxxVariant wxObjectToVariantConverter##name ( wxObject *data ) { return wxxVariant( dynamic_cast<name*> (data)  ) ; } \
-    wxClassInfo name::ms_classInfo(name::ms_classParents , wxT(unit) , wxT(#name),   \
-    (int) sizeof(name),                              \
-    (wxObjectConstructorFn) wxConstructorFor##name   ,   \
-    name::GetPropertiesStatic(),name::GetHandlersStatic(),name::ms_constructor , name::ms_constructorProperties,     \
-    name::ms_constructorPropertiesCount , wxVariantOfPtrToObjectConverter##name , wxVariantToObjectConverter##name , wxObjectToVariantConverter##name, callback);
-
-#define IMPLEMENT_DYNAMIC_CLASS_WITH_COPY( name , basename ) \
-    _IMPLEMENT_DYNAMIC_CLASS_WITH_COPY( name , basename , "" , NULL ) \
-    _TYPEINFO_CLASSES(name, NULL , NULL) \
-    const wxPropertyInfo *name::GetPropertiesStatic() { return NULL ; } \
-    const wxHandlerInfo *name::GetHandlersStatic() { return NULL ; } \
+#define _TYPEINFO_CLASSES(n, toString, fromString )                           \
+    wxClassTypeInfo s_typeInfo##n(wxT_OBJECT, &n::ms_classInfo,               \
+                                  toString, fromString, typeid(n).name());    \
+    wxClassTypeInfo s_typeInfoPtr##n(wxT_OBJECT_PTR, &n::ms_classInfo,        \
+                                     toString, fromString, typeid(n*).name());
+
+#define _IMPLEMENT_DYNAMIC_CLASS(name, basename, unit, callback)                \
+    wxObject* wxConstructorFor##name()                                          \
+        { return new name; }                                                    \
+    wxObject* wxVariantOfPtrToObjectConverter##name ( wxVariantBase &data )        \
+        { return data.wxTEMPLATED_MEMBER_CALL(Get, name*); }                    \
+    wxVariantBase wxObjectToVariantConverter##name ( wxObject *data )              \
+        { return wxVariantBase( wx_dynamic_cast(name*, data)  ); }                 \
+                                                                                \
+    const wxClassInfo* name::ms_classParents[] =                                \
+        { &basename::ms_classInfo, NULL };                                      \
+    wxClassInfo name::ms_classInfo(name::ms_classParents, wxT(unit),            \
+        wxT(#name), (int) sizeof(name), (wxObjectConstructorFn) wxConstructorFor##name,   \
+        name::GetPropertiesStatic(), name::GetHandlersStatic(), name::ms_constructor,     \
+        name::ms_constructorProperties, name::ms_constructorPropertiesCount,              \
+        wxVariantOfPtrToObjectConverter##name, NULL, wxObjectToVariantConverter##name,    \
+        callback);
+
+#define _IMPLEMENT_DYNAMIC_CLASS_WITH_COPY(name, basename, unit, callback )         \
+    wxObject* wxConstructorFor##name()                                              \
+        { return new name; }                                                        \
+    wxObject* wxVariantToObjectConverter##name ( wxVariantBase &data )                 \
+        { return &data.wxTEMPLATED_MEMBER_CALL(Get, name); }                        \
+    wxObject* wxVariantOfPtrToObjectConverter##name ( wxVariantBase &data )            \
+        { return data.wxTEMPLATED_MEMBER_CALL(Get, name*); }                        \
+    wxVariantBase wxObjectToVariantConverter##name ( wxObject *data )                  \
+        { return wxVariantBase( wx_dynamic_cast(name*, data)  ); }                     \
+                                                                                    \
+    const wxClassInfo* name::ms_classParents[] = { &basename::ms_classInfo,NULL };  \
+    wxClassInfo name::ms_classInfo(name::ms_classParents, wxT(unit),                \
+        wxT(#name), (int) sizeof(name), (wxObjectConstructorFn) wxConstructorFor##name,  \
+        name::GetPropertiesStatic(),name::GetHandlersStatic(),name::ms_constructor,      \
+        name::ms_constructorProperties, name::ms_constructorPropertiesCount,             \
+        wxVariantOfPtrToObjectConverter##name, wxVariantToObjectConverter##name,         \
+        wxObjectToVariantConverter##name, callback);
+
+#define wxIMPLEMENT_DYNAMIC_CLASS_WITH_COPY( name, basename )                   \
+    _IMPLEMENT_DYNAMIC_CLASS_WITH_COPY( name, basename, "", NULL )              \
+    _TYPEINFO_CLASSES(name, NULL, NULL)                                         \
+    const wxPropertyInfo *name::GetPropertiesStatic()                           \
+        { return (wxPropertyInfo*) NULL; }                                      \
+    const wxHandlerInfo *name::GetHandlersStatic()                              \
+        { return (wxHandlerInfo*) NULL; }                                       \
     wxCONSTRUCTOR_DUMMY( name )
 
-#define IMPLEMENT_DYNAMIC_CLASS( name , basename ) \
-    _IMPLEMENT_DYNAMIC_CLASS( name , basename , "" , NULL ) \
-     _TYPEINFO_CLASSES(name, NULL , NULL) \
-   wxPropertyInfo *name::GetPropertiesStatic() { return NULL ; } \
-    wxHandlerInfo *name::GetHandlersStatic() { return NULL ; } \
+#define wxIMPLEMENT_DYNAMIC_CLASS( name, basename )                             \
+    _IMPLEMENT_DYNAMIC_CLASS( name, basename, "", NULL )                        \
+    _TYPEINFO_CLASSES(name, NULL, NULL)                                         \
+    wxPropertyInfo *name::GetPropertiesStatic()                                 \
+        { return (wxPropertyInfo*) NULL; }                                      \
+    wxHandlerInfo *name::GetHandlersStatic()                                    \
+        { return (wxHandlerInfo*) NULL; }                                       \
     wxCONSTRUCTOR_DUMMY( name )
 
-#define IMPLEMENT_DYNAMIC_CLASS_XTI( name , basename , unit ) \
-    _IMPLEMENT_DYNAMIC_CLASS( name , basename , unit , NULL ) \
-    _TYPEINFO_CLASSES(name, NULL , NULL)
+#define wxIMPLEMENT_DYNAMIC_CLASS_XTI( name, basename, unit )                   \
+    _IMPLEMENT_DYNAMIC_CLASS( name, basename, unit, NULL )                      \
+    _TYPEINFO_CLASSES(name, NULL, NULL)
 
-#define IMPLEMENT_DYNAMIC_CLASS_XTI_CALLBACK( name , basename , unit , callback ) \
-    _IMPLEMENT_DYNAMIC_CLASS( name , basename , unit , &callback ) \
-    _TYPEINFO_CLASSES(name, NULL , NULL)
+#define wxIMPLEMENT_DYNAMIC_CLASS_XTI_CALLBACK( name, basename, unit, callback )\
+    _IMPLEMENT_DYNAMIC_CLASS( name, basename, unit, &callback )                 \
+    _TYPEINFO_CLASSES(name, NULL, NULL)
 
-#define IMPLEMENT_DYNAMIC_CLASS_WITH_COPY_XTI( name , basename , unit ) \
-    _IMPLEMENT_DYNAMIC_CLASS_WITH_COPY( name , basename , unit , NULL  ) \
-    _TYPEINFO_CLASSES(name, NULL , NULL)
+#define wxIMPLEMENT_DYNAMIC_CLASS_WITH_COPY_XTI( name, basename, unit )         \
+    _IMPLEMENT_DYNAMIC_CLASS_WITH_COPY( name, basename, unit, NULL  )           \
+    _TYPEINFO_CLASSES(name, NULL, NULL)
 
-#define IMPLEMENT_DYNAMIC_CLASS_WITH_COPY_AND_STREAMERS_XTI( name , basename , unit , toString , fromString ) \
-    _IMPLEMENT_DYNAMIC_CLASS_WITH_COPY( name , basename , unit , NULL  ) \
-    _TYPEINFO_CLASSES(name, toString , fromString)
+#define wxIMPLEMENT_DYNAMIC_CLASS_WITH_COPY_AND_STREAMERS_XTI( name, basename,  \
+                                                             unit, toString,    \
+                                                             fromString )       \
+    _IMPLEMENT_DYNAMIC_CLASS_WITH_COPY( name, basename, unit, NULL  )           \
+    _TYPEINFO_CLASSES(name, toString, fromString)
 
-// this is for classes that do not derive from wxobject, there are no creators for these
+// this is for classes that do not derive from wxObject, there are no creators for these
 
-#define IMPLEMENT_DYNAMIC_CLASS_NO_WXOBJECT_NO_BASE_XTI( name , unit ) \
-    const wxClassInfo* name::ms_classParents[] = { NULL } ; \
-    wxClassInfo name::ms_classInfo(name::ms_classParents , wxEmptyString , wxT(#name),   \
-    (int) sizeof(name),                              \
-    (wxObjectConstructorFn) 0   ,   \
-    name::GetPropertiesStatic(),name::GetHandlersStatic(),0 , 0 ,     \
-    0 , 0 , 0 );    \
-    _TYPEINFO_CLASSES(name, NULL , NULL)
+#define wxIMPLEMENT_DYNAMIC_CLASS_NO_WXOBJECT_NO_BASE_XTI( name, unit )         \
+    const wxClassInfo* name::ms_classParents[] = { NULL };                      \
+    wxClassInfo name::ms_classInfo(name::ms_classParents, wxEmptyString,        \
+            wxT(#name), (int) sizeof(name), (wxObjectConstructorFn) 0,          \
+            name::GetPropertiesStatic(),name::GetHandlersStatic(), 0, 0,        \
+            0, 0, 0 );                                                          \
+    _TYPEINFO_CLASSES(name, NULL, NULL)
 
-// this is for subclasses that still do not derive from wxobject
+// this is for subclasses that still do not derive from wxObject
 
-#define IMPLEMENT_DYNAMIC_CLASS_NO_WXOBJECT_XTI( name , basename, unit ) \
-    const wxClassInfo* name::ms_classParents[] = { &basename::ms_classInfo ,NULL } ; \
-    wxClassInfo name::ms_classInfo(name::ms_classParents , wxEmptyString , wxT(#name),   \
-    (int) sizeof(name),                              \
-    (wxObjectConstructorFn) 0   ,   \
-    name::GetPropertiesStatic(),name::GetHandlersStatic(),0 , 0 ,     \
-    0 , 0 , 0 );    \
-    _TYPEINFO_CLASSES(name, NULL , NULL)
+#define wxIMPLEMENT_DYNAMIC_CLASS_NO_WXOBJECT_XTI( name, basename, unit )           \
+    const wxClassInfo* name::ms_classParents[] = { &basename::ms_classInfo, NULL }; \
+    wxClassInfo name::ms_classInfo(name::ms_classParents, wxEmptyString,            \
+            wxT(#name), (int) sizeof(name), (wxObjectConstructorFn) 0,              \
+            name::GetPropertiesStatic(),name::GetHandlersStatic(), 0, 0,            \
+            0, 0, 0 );                                                              \
+    _TYPEINFO_CLASSES(name, NULL, NULL)
 
 
 // Multiple inheritance with two base classes
 
-#define _IMPLEMENT_DYNAMIC_CLASS2(name, basename, basename2, unit, callback)                 \
-    wxObject* wxConstructorFor##name()                             \
-{ return new name; }                                          \
-    const wxClassInfo* name::ms_classParents[] = { &basename::ms_classInfo ,&basename2::ms_classInfo , NULL } ; \
-    wxObject* wxVariantOfPtrToObjectConverter##name ( wxxVariant &data ) { return data.wxTEMPLATED_MEMBER_CALL(Get , name*) ; } \
-    wxxVariant wxObjectToVariantConverter##name ( wxObject *data ) { return wxxVariant( dynamic_cast<name*> (data)  ) ; } \
-    wxClassInfo name::ms_classInfo(name::ms_classParents , wxT(unit) , wxT(#name),   \
-    (int) sizeof(name),                              \
-    (wxObjectConstructorFn) wxConstructorFor##name   ,   \
-    name::GetPropertiesStatic(),name::GetHandlersStatic(),name::ms_constructor , name::ms_constructorProperties ,     \
-    name::ms_constructorPropertiesCount , wxVariantOfPtrToObjectConverter##name , NULL , wxObjectToVariantConverter##name , callback);
-
-#define IMPLEMENT_DYNAMIC_CLASS2( name , basename , basename2) \
-    _IMPLEMENT_DYNAMIC_CLASS2( name , basename , basename2 , "", NULL) \
-    _TYPEINFO_CLASSES(name, NULL , NULL) \
-    wxPropertyInfo *name::GetPropertiesStatic() { return NULL ; } \
-    wxHandlerInfo *name::GetHandlersStatic() { return NULL ; } \
+#define _IMPLEMENT_DYNAMIC_CLASS2(name, basename, basename2, unit, callback)         \
+    wxObject* wxConstructorFor##name() { return new name; }                          \
+    wxObject* wxVariantOfPtrToObjectConverter##name ( wxVariantBase &data )             \
+        { return data.wxTEMPLATED_MEMBER_CALL(Get, name*); }                         \
+    wxVariantBase wxObjectToVariantConverter##name ( wxObject *data )                   \
+        { return wxVariantBase( wx_dynamic_cast(name*, data)  ); }                      \
+                                                                                     \
+    const wxClassInfo* name::ms_classParents[] =                                     \
+        { &basename::ms_classInfo,&basename2::ms_classInfo, NULL };                  \
+    wxClassInfo name::ms_classInfo(name::ms_classParents, wxT(unit),                 \
+        wxT(#name), (int) sizeof(name), (wxObjectConstructorFn) wxConstructorFor##name, \
+        name::GetPropertiesStatic(),name::GetHandlersStatic(),name::ms_constructor,     \
+        name::ms_constructorProperties, name::ms_constructorPropertiesCount,            \
+        wxVariantOfPtrToObjectConverter##name, NULL, wxObjectToVariantConverter##name,  \
+        callback);
+
+#define wxIMPLEMENT_DYNAMIC_CLASS2( name, basename, basename2)                      \
+    _IMPLEMENT_DYNAMIC_CLASS2( name, basename, basename2, "", NULL)                 \
+    _TYPEINFO_CLASSES(name, NULL, NULL)                                             \
+    wxPropertyInfo *name::GetPropertiesStatic() { return (wxPropertyInfo*) NULL; }  \
+    wxHandlerInfo *name::GetHandlersStatic() { return (wxHandlerInfo*) NULL; }      \
     wxCONSTRUCTOR_DUMMY( name )
 
-#define IMPLEMENT_DYNAMIC_CLASS2_XTI( name , basename , basename2, unit) \
-    _IMPLEMENT_DYNAMIC_CLASS2( name , basename , basename2 , unit, NULL) \
-    _TYPEINFO_CLASSES(name, NULL , NULL)
+#define wxIMPLEMENT_DYNAMIC_CLASS2_XTI( name, basename, basename2, unit) \
+    _IMPLEMENT_DYNAMIC_CLASS2( name, basename, basename2, unit, NULL)    \
+    _TYPEINFO_CLASSES(name, NULL, NULL)
 
 
-// -----------------------------------
-// for abstract classes
-// -----------------------------------
+
+// ----------------------------------------------------------------------------
+// wxIMPLEMENT class macros for abstract classes
+// ----------------------------------------------------------------------------
 
 // Single inheritance with one base class
 
-#define _IMPLEMENT_ABSTRACT_CLASS(name, basename)                \
-    const wxClassInfo* name::ms_classParents[] = { &basename::ms_classInfo ,NULL } ; \
-    wxObject* wxVariantToObjectConverter##name ( wxxVariant &data ) { return data.wxTEMPLATED_MEMBER_CALL(Get , name*) ; } \
-    wxObject* wxVariantOfPtrToObjectConverter##name ( wxxVariant &data ) { return data.wxTEMPLATED_MEMBER_CALL(Get , name*) ; } \
-    wxxVariant wxObjectToVariantConverter##name ( wxObject *data ) { return wxxVariant( dynamic_cast<name*> (data)  ) ; } \
-    wxClassInfo name::ms_classInfo(name::ms_classParents , wxEmptyString , wxT(#name),   \
-    (int) sizeof(name),                              \
-    (wxObjectConstructorFn) 0   ,   \
-    name::GetPropertiesStatic(),name::GetHandlersStatic(),0 , 0 ,     \
-    0 , wxVariantOfPtrToObjectConverter##name ,wxVariantToObjectConverter##name , wxObjectToVariantConverter##name);    \
-    _TYPEINFO_CLASSES(name, NULL , NULL)
-
-#define IMPLEMENT_ABSTRACT_CLASS( name , basename ) \
-    _IMPLEMENT_ABSTRACT_CLASS( name , basename ) \
-    wxHandlerInfo *name::GetHandlersStatic() { return NULL ; } \
-    wxPropertyInfo *name::GetPropertiesStatic() { return NULL ; }
+#define _IMPLEMENT_ABSTRACT_CLASS(name, basename)                               \
+    wxObject* wxVariantToObjectConverter##name ( wxVariantBase &data )             \
+        { return data.wxTEMPLATED_MEMBER_CALL(Get, name*); }                    \
+    wxObject* wxVariantOfPtrToObjectConverter##name ( wxVariantBase &data )        \
+        { return data.wxTEMPLATED_MEMBER_CALL(Get, name*); }                    \
+    wxVariantBase wxObjectToVariantConverter##name ( wxObject *data )              \
+        { return wxVariantBase( wx_dynamic_cast(name*, data)  ); }                 \
+                                                                                \
+    const wxClassInfo* name::ms_classParents[] =                                \
+        { &basename::ms_classInfo,NULL };                                       \
+    wxClassInfo name::ms_classInfo(name::ms_classParents, wxEmptyString,        \
+        wxT(#name), (int) sizeof(name), (wxObjectConstructorFn) 0,              \
+        name::GetPropertiesStatic(),name::GetHandlersStatic(), 0, 0,            \
+        0, wxVariantOfPtrToObjectConverter##name,wxVariantToObjectConverter##name, \
+        wxObjectToVariantConverter##name);                                         \
+    _TYPEINFO_CLASSES(name, NULL, NULL)
+
+#define wxIMPLEMENT_ABSTRACT_CLASS( name, basename )                            \
+    _IMPLEMENT_ABSTRACT_CLASS( name, basename )                                 \
+    wxHandlerInfo *name::GetHandlersStatic() { return (wxHandlerInfo*) NULL; }  \
+    wxPropertyInfo *name::GetPropertiesStatic() { return (wxPropertyInfo*) NULL; }
 
 // Multiple inheritance with two base classes
 
-#define IMPLEMENT_ABSTRACT_CLASS2(name, basename1, basename2)   \
-    wxClassInfo name::ms_classInfo(wxT(#name), wxT(#basename1),  \
-    wxT(#basename2), (int) sizeof(name),                \
-    (wxObjectConstructorFn) 0);
+#define wxIMPLEMENT_ABSTRACT_CLASS2(name, basename1, basename2)                 \
+    wxClassInfo name::ms_classInfo(wxT(#name), wxT(#basename1),                 \
+                                   wxT(#basename2), (int) sizeof(name),         \
+                                   (wxObjectConstructorFn) 0);
 
-#define IMPLEMENT_CLASS IMPLEMENT_ABSTRACT_CLASS
-#define IMPLEMENT_CLASS2 IMPLEMENT_ABSTRACT_CLASS2
 
-#define wxBEGIN_EVENT_TABLE( a , b ) BEGIN_EVENT_TABLE( a , b )
-#define wxEND_EVENT_TABLE() END_EVENT_TABLE()
 
 // --------------------------------------------------------------------------
 // Collection Support
 // --------------------------------------------------------------------------
 
-template<typename iter , typename collection_t > void wxListCollectionToVariantArray( const collection_t& coll , wxxVariantArray &value )
+template<typename iter, typename collection_t > void wxListCollectionToVariantArray( 
+    const collection_t& coll, wxVariantBaseArray &value )
 {
-    iter current = coll.GetFirst() ;
+    iter current = coll.GetFirst();
     while (current)
     {
-        value.Add( new wxxVariant(current->GetData()) ) ;
+        value.Add( new wxVariantBase(current->GetData()) );
         current = current->GetNext();
     }
 }
 
-template<typename collection_t> void wxArrayCollectionToVariantArray( const collection_t& coll , wxxVariantArray &value )
+template<typename collection_t> void wxArrayCollectionToVariantArray( 
+    const collection_t& coll, wxVariantBaseArray &value )
 {
-    for( size_t i = 0 ; i < coll.GetCount() ; i++ )
+    for( size_t i = 0; i < coll.GetCount(); i++ )
     {
-        value.Add( new wxxVariant(coll[i]) ) ;
+        value.Add( new wxVariantBase(coll[i]) );
     }
 }
 
-
+#endif  // wxUSE_EXTENDED_RTTI
 #endif // _WX_XTIH__
index 0f62e428c747ebab1f39ed7e339938e02f4e7a7c..acfce43942b735012a6d19f12a3fa773fb948e9f 100644 (file)
 #ifndef _WX_XTISTRMH__
 #define _WX_XTISTRMH__
 
-#include "wx/wx.h"
+#include "wx/defs.h"
 
 #if wxUSE_EXTENDED_RTTI
 
-const int wxInvalidObjectID = -2 ;
-const int wxNullObjectID = -3 ;
+#include "wx/string.h"
+#include "wx/object.h"
+
+const int wxInvalidObjectID = -2;
+const int wxNullObjectID = -3;
 
 // Filer contains the interfaces for streaming objects in and out of XML,
 // rendering them either to objects in memory, or to code.  Note:  We
@@ -27,73 +30,109 @@ const int wxNullObjectID = -3 ;
 // in mind when looking at the property streamers and callback interfaces
 // listed below.
 
-/*
-Main interfaces for streaming out objects.
-*/
 
 // ----------------------------------------------------------------------------
-// wxPersister
+// wxObjectReaderCallback
 //
 // This class will be asked during the streaming-out process about every single
 // property or object instance. It can veto streaming out by returning false
 // or modify the value before it is streamed-out.
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_FWD_BASE wxWriter ;
-class WXDLLIMPEXP_FWD_BASE wxReader ;
+class WXDLLIMPEXP_BASE wxObjectWriter;
+class WXDLLIMPEXP_BASE wxObjectReader;
+class WXDLLIMPEXP_BASE wxClassInfo;
+class WXDLLIMPEXP_BASE wxVariantBaseArray;
+class WXDLLIMPEXP_BASE wxPropertyInfo;
+class WXDLLIMPEXP_BASE wxVariantBase;
+class WXDLLIMPEXP_BASE wxObjectWriter;
+class WXDLLIMPEXP_BASE wxHandlerInfo;
 
-class WXDLLIMPEXP_BASE wxPersister
+class WXDLLIMPEXP_BASE wxObjectReaderCallback
 {
-public :
-    virtual ~wxPersister() {}
+public:
+    virtual ~wxObjectReaderCallback() {}
 
     // will be called before an object is written, may veto by returning false
-    virtual bool BeforeWriteObject( wxWriter *WXUNUSED(writer) , const wxObject *WXUNUSED(object) , const wxClassInfo *WXUNUSED(classInfo) , wxxVariantArray &WXUNUSED(metadata)) { return true ; }
-
-    // will be called after this object has been written, may be needed for adjusting stacks
-    virtual void AfterWriteObject( wxWriter *WXUNUSED(writer)  , const wxObject *WXUNUSED(object) , const wxClassInfo *WXUNUSED(classInfo) ) {}
-
-    // will be called before a property gets written, may change the value , eg replace a concrete wxSize by wxSize( wxDefaultCoord , wxDefaultCoord ) or veto
-    // writing that property at all by returning false
-    virtual bool BeforeWriteProperty( wxWriter *WXUNUSED(writer)  , const wxObject *WXUNUSED(object), const wxPropertyInfo *WXUNUSED(propInfo) , wxxVariant &WXUNUSED(value) )  { return true ; }
-
-    // will be called before a property gets written, may change the value , eg replace a concrete wxSize by wxSize( wxDefaultCoord , wxDefaultCoord ) or veto
-    // writing that property at all by returning false
-    virtual bool BeforeWriteProperty( wxWriter *WXUNUSED(writer)  , const wxObject *WXUNUSED(object), const wxPropertyInfo *WXUNUSED(propInfo) , wxxVariantArray &WXUNUSED(value) )  { return true ; }
-
-    // will be called after a property has been written out, may be needed for adjusting stacks
-    virtual void AfterWriteProperty( wxWriter *WXUNUSED(writer)  , const wxPropertyInfo *WXUNUSED(propInfo) ) {}
+    virtual bool BeforeWriteObject( wxObjectWriter *WXUNUSED(writer), 
+                                    const wxObject *WXUNUSED(object), 
+                                    const wxClassInfo *WXUNUSED(classInfo), 
+                                    wxVariantBaseArray &WXUNUSED(metadata)) 
+        { return true; }
+
+    // will be called after this object has been written, may be 
+    // needed for adjusting stacks
+    virtual void AfterWriteObject( wxObjectWriter *WXUNUSED(writer), 
+                                   const wxObject *WXUNUSED(object), 
+                                   const wxClassInfo *WXUNUSED(classInfo) ) 
+        {}
+
+    // will be called before a property gets written, may change the value, 
+    // eg replace a concrete wxSize by wxSize( wxDefaultCoord, wxDefaultCoord ) 
+    // or veto writing that property at all by returning false
+    virtual bool BeforeWriteProperty( wxObjectWriter *WXUNUSED(writer), 
+                                      const wxObject *WXUNUSED(object), 
+                                      const wxPropertyInfo *WXUNUSED(propInfo), 
+                                      wxVariantBase &WXUNUSED(value) )  
+        { return true; }
+
+    // will be called before a property gets written, may change the value, 
+    // eg replace a concrete wxSize by wxSize( wxDefaultCoord, wxDefaultCoord ) 
+    // or veto writing that property at all by returning false
+    virtual bool BeforeWriteProperty( wxObjectWriter *WXUNUSED(writer), 
+                                      const wxObject *WXUNUSED(object), 
+                                      const wxPropertyInfo *WXUNUSED(propInfo), 
+                                      wxVariantBaseArray &WXUNUSED(value) )  
+        { return true; }
+
+    // will be called after a property has been written out, may be needed 
+    // for adjusting stacks
+    virtual void AfterWriteProperty( wxObjectWriter *WXUNUSED(writer), 
+                                     const wxPropertyInfo *WXUNUSED(propInfo) ) 
+        {}
 
     // will be called before this delegate gets written
-    virtual bool BeforeWriteDelegate( wxWriter *WXUNUSED(writer) , const wxObject *WXUNUSED(object),  const wxClassInfo* WXUNUSED(classInfo) , const wxPropertyInfo *WXUNUSED(propInfo) ,
-        const wxObject *&WXUNUSED(eventSink) , const wxHandlerInfo* &WXUNUSED(handlerInfo) ) { return true ; }
-
-        virtual void AfterWriteDelegate( wxWriter *WXUNUSED(writer) , const wxObject *WXUNUSED(object),  const wxClassInfo* WXUNUSED(classInfo) , const wxPropertyInfo *WXUNUSED(propInfo) ,
-            const wxObject *&WXUNUSED(eventSink) , const wxHandlerInfo* &WXUNUSED(handlerInfo) ) { }
-} ;
+    virtual bool BeforeWriteDelegate( wxObjectWriter *WXUNUSED(writer), 
+                                      const wxObject *WXUNUSED(object),  
+                                      const wxClassInfo* WXUNUSED(classInfo), 
+                                      const wxPropertyInfo *WXUNUSED(propInfo),
+                                      const wxObject *&WXUNUSED(eventSink), 
+                                      const wxHandlerInfo* &WXUNUSED(handlerInfo) ) 
+        { return true; }
+
+    virtual void AfterWriteDelegate( wxObjectWriter *WXUNUSED(writer), 
+                                     const wxObject *WXUNUSED(object), 
+                                     const wxClassInfo* WXUNUSED(classInfo), 
+                                     const wxPropertyInfo *WXUNUSED(propInfo),
+                                     const wxObject *&WXUNUSED(eventSink), 
+                                     const wxHandlerInfo* &WXUNUSED(handlerInfo) ) 
+        { }
+};
 
-class WXDLLIMPEXP_BASE wxWriter : public wxObject
+class WXDLLIMPEXP_BASE wxObjectWriter: public wxObject
 {
-public :
-    wxWriter() ;
-    virtual ~wxWriter() ;
+public:
+    wxObjectWriter();
+    virtual ~wxObjectWriter();
 
     // with this call you start writing out a new top-level object
-    void WriteObject(const wxObject *object, const wxClassInfo *classInfo , wxPersister *persister , const wxString &name , wxxVariantArray &WXUNUSED(metadata)) ;
+    void WriteObject(const wxObject *object, const wxClassInfo *classInfo, 
+                     wxObjectReaderCallback *persister, const wxString &name, 
+                     wxVariantBaseArray &WXUNUSED(metadata));
 
-    //
     // Managing the object identity table a.k.a context
     //
-    // these methods make sure that no object gets written twice, because sometimes multiple calls to the WriteObject will be
-    // made without wanting to have duplicate objects written, the object identity table will be reset manually
-
-    virtual void ClearObjectContext() ;
+    // these methods make sure that no object gets written twice, 
+    // because sometimes multiple calls to the WriteObject will be
+    // made without wanting to have duplicate objects written, the 
+    // object identity table will be reset manually
+    virtual void ClearObjectContext();
 
     // gets the object Id for a passed in object in the context
-    int GetObjectID(const wxObject *obj) ;
+    int GetObjectID(const wxObject *obj);
 
     // returns true if this object has already been written in this context
-    bool IsObjectKnown( const wxObject *obj ) ;
+    bool IsObjectKnown( const wxObject *obj );
 
     //
     // streaming callbacks
@@ -101,71 +140,87 @@ public :
     // these callbacks really write out the values in the stream format
 
     // begins writing out a new toplevel entry which has the indicated unique name
-    virtual void DoBeginWriteTopLevelEntry( const wxString &name ) = 0 ;
+    virtual void DoBeginWriteTopLevelEntry( const wxString &name ) = 0;
 
     // ends writing out a new toplevel entry which has the indicated unique name
-    virtual void DoEndWriteTopLevelEntry( const wxString &name ) = 0 ;
+    virtual void DoEndWriteTopLevelEntry( const wxString &name ) = 0;
 
     // start of writing an object having the passed in ID
-    virtual void DoBeginWriteObject(const wxObject *object, const wxClassInfo *classInfo, int objectID , wxxVariantArray &metadata ) = 0 ;
+    virtual void DoBeginWriteObject(const wxObject *object, const wxClassInfo *classInfo, 
+                                    int objectID, wxVariantBaseArray &metadata ) = 0;
 
-    // end of writing an toplevel object name param is used for unique identification within the container
-    virtual void DoEndWriteObject(const wxObject *object, const wxClassInfo *classInfo, int objectID ) = 0 ;
+    // end of writing an toplevel object name param is used for unique 
+    // identification within the container
+    virtual void DoEndWriteObject(const wxObject *object, 
+                const wxClassInfo *classInfo, int objectID ) = 0;
 
     // writes a simple property in the stream format
-    virtual void DoWriteSimpleType( wxxVariant &value ) = 0 ;
+    virtual void DoWriteSimpleType( wxVariantBase &value ) = 0;
 
     // start of writing a complex property into the stream (
-    virtual void DoBeginWriteProperty( const wxPropertyInfo *propInfo ) = 0 ;
+    virtual void DoBeginWriteProperty( const wxPropertyInfo *propInfo ) = 0;
 
     // end of writing a complex property into the stream
     virtual void DoEndWriteProperty( const wxPropertyInfo *propInfo ) = 0;
 
-    virtual void DoBeginWriteElement() = 0 ;
-    virtual void DoEndWriteElement() = 0 ;
+    virtual void DoBeginWriteElement() = 0;
+    virtual void DoEndWriteElement() = 0;
     // insert an object reference to an already written object
-    virtual void DoWriteRepeatedObject( int objectID ) = 0 ;
+    virtual void DoWriteRepeatedObject( int objectID ) = 0;
 
     // insert a null reference
-    virtual void DoWriteNullObject() = 0 ;
+    virtual void DoWriteNullObject() = 0;
 
     // writes a delegate in the stream format
-    virtual void DoWriteDelegate( const wxObject *object,  const wxClassInfo* classInfo , const wxPropertyInfo *propInfo ,
-        const wxObject *eventSink , int sinkObjectID , const wxClassInfo* eventSinkClassInfo , const wxHandlerInfo* handlerIndo ) = 0;
-private :
+    virtual void DoWriteDelegate( const wxObject *object,  const wxClassInfo* classInfo, 
+                                  const wxPropertyInfo *propInfo, const wxObject *eventSink, 
+                                  int sinkObjectID, const wxClassInfo* eventSinkClassInfo,
+                                  const wxHandlerInfo* handlerIndo ) = 0;
+
+private:
+    struct wxObjectWriterInternal;
+    wxObjectWriterInternal* m_data;
+
+    struct wxObjectWriterInternalPropertiesData;
 
-    struct wxWriterInternal ;
-    wxWriterInternal* m_data ;
+    void WriteAllProperties( const wxObject * obj, const wxClassInfo* ci, 
+                             wxObjectReaderCallback *persister, 
+                             wxObjectWriterInternalPropertiesData * data );
 
-    struct wxWriterInternalPropertiesData ;
+    void WriteOneProperty( const wxObject *obj, const wxClassInfo* ci, 
+                           const wxPropertyInfo* pi, wxObjectReaderCallback *persister,
+                           wxObjectWriterInternalPropertiesData *data );
 
-    void WriteAllProperties( const wxObject * obj , const wxClassInfo* ci , wxPersister *persister, wxWriterInternalPropertiesData * data ) ;
-    void WriteOneProperty( const wxObject *obj , const wxClassInfo* ci , const wxPropertyInfo* pi , wxPersister *persister , wxWriterInternalPropertiesData *data ) ;
-    void WriteObject(const wxObject *object, const wxClassInfo *classInfo , wxPersister *persister , bool isEmbedded, wxxVariantArray &metadata ) ;
-    void FindConnectEntry(const wxEvtHandler * evSource,const wxDelegateTypeInfo* dti, const wxObject* &sink , const wxHandlerInfo *&handler) ;
-} ;
+    void WriteObject(const wxObject *object, const wxClassInfo *classInfo, 
+                     wxObjectReaderCallback *persister, bool isEmbedded, wxVariantBaseArray &metadata );
+
+    void FindConnectEntry(const wxEvtHandler * evSource,
+                          const wxEventSourceTypeInfo* dti, const wxObject* &sink, 
+                          const wxHandlerInfo *&handler);
+};
 
 
 /*
 Streaming callbacks for depersisting XML to code, or running objects
 */
 
-class WXDLLIMPEXP_FWD_BASE wxDepersister ;
+class WXDLLIMPEXP_BASE wxObjectWriterCallback;
 
 /*
-wxReader handles streaming in a class from a arbitrary format. While walking through
-it issues calls out to interfaces to depersist the guts from the underlying storage format.
+wxObjectReader handles streaming in a class from a arbitrary format. 
+While walking through it issues calls out to interfaces to depersist 
+the guts from the underlying storage format.
 */
 
-class WXDLLIMPEXP_BASE wxReader : public wxObject
+class WXDLLIMPEXP_BASE wxObjectReader: public wxObject
 {
-public :
-    wxReader() ;
-    virtual ~wxReader() ;
+public:
+    wxObjectReader();
+    virtual ~wxObjectReader();
 
-    // the only thing wxReader knows about is the class info by object ID
-    wxClassInfo *GetObjectClassInfo(int objectID) ;
-    bool HasObjectClassInfo( int objectID ) ;
+    // the only thing wxObjectReader knows about is the class info by object ID
+    wxClassInfo *GetObjectClassInfo(int objectID);
+    bool HasObjectClassInfo( int objectID );
     void SetObjectClassInfo(int objectID, wxClassInfo* classInfo);
 
     // Reads the component the reader is pointed at from the underlying format.
@@ -173,25 +228,26 @@ public :
     // then be used to ask the depersister about that object
     // if there was a problem you will get back wxInvalidObjectID and the current
     // error log will carry the problems encoutered
-    virtual int ReadObject( const wxString &name , wxDepersister *depersist ) = 0 ;
+    virtual int ReadObject( const wxString &name, wxObjectWriterCallback *depersist ) = 0;
 
-private :
-    struct wxReaderInternal;
-    wxReaderInternal *m_data;
-} ;
+private:
+    struct wxObjectReaderInternal;
+    wxObjectReaderInternal *m_data;
+};
 
 // This abstract class matches the allocate-init/create model of creation of objects.
 // At runtime, these will create actual instances, and manipulate them.
 // When generating code, these will just create statements of C++
 // code to create the objects.
 
-class WXDLLIMPEXP_BASE wxDepersister
+class WXDLLIMPEXP_BASE wxObjectWriterCallback
 {
-public :
-    virtual ~wxDepersister() {}
+public:
+    virtual ~wxObjectWriterCallback() {}
 
     // allocate the new object on the heap, that object will have the passed in ID
-    virtual void AllocateObject(int objectID, wxClassInfo *classInfo, wxxVariantArray &metadata) = 0;
+    virtual void AllocateObject(int objectID, wxClassInfo *classInfo, 
+                                wxVariantBaseArray &metadata) = 0;
 
     // initialize the already allocated object having the ID objectID with the Create method
     // creation parameters which are objects are having their Ids passed in objectIDValues
@@ -200,232 +256,146 @@ public :
     virtual void CreateObject(int objectID,
         const wxClassInfo *classInfo,
         int paramCount,
-        wxxVariant *VariantValues ,
-        int *objectIDValues ,
-        const wxClassInfo **objectClassInfos ,
-        wxxVariantArray &metadata) = 0;
+        wxVariantBase *VariantValues,
+        int *objectIDValues,
+        const wxClassInfo **objectClassInfos,
+        wxVariantBaseArray &metadata) = 0;
 
-    // construct the new object on the heap, that object will have the passed in ID (for objects that
-    // don't support allocate-create type of creation)
-    // creation parameters which are objects are having their Ids passed in objectIDValues
-    // having objectId <> wxInvalidObjectID
+    // construct the new object on the heap, that object will have the passed in ID 
+    // (for objects that don't support allocate-create type of creation)
+    // creation parameters which are objects are having their Ids passed in 
+    // objectIDValues having objectId <> wxInvalidObjectID
 
     virtual void ConstructObject(int objectID,
         const wxClassInfo *classInfo,
         int paramCount,
-        wxxVariant *VariantValues ,
-        int *objectIDValues ,
-        const wxClassInfo **objectClassInfos ,
-        wxxVariantArray &metadata) = 0;
-
-    // destroy the heap-allocated object having the ID objectID, this may be used if an object
-    // is embedded in another object and set via value semantics, so the intermediate
-    // object can be destroyed after safely
+        wxVariantBase *VariantValues,
+        int *objectIDValues,
+        const wxClassInfo **objectClassInfos,
+        wxVariantBaseArray &metadata) = 0;
+
+    // destroy the heap-allocated object having the ID objectID, this may be used 
+    // if an object is embedded in another object and set via value semantics, 
+    // so the intermediate object can be destroyed after safely
     virtual void DestroyObject(int objectID, wxClassInfo *classInfo) = 0;
 
     // set the corresponding property
     virtual void SetProperty(int objectID,
         const wxClassInfo *classInfo,
-        const wxPropertyInfo* propertyInfo ,
-        const wxxVariant &VariantValue) = 0;
+        const wxPropertyInfo* propertyInfo,
+        const wxVariantBase &VariantValue) = 0;
 
     // sets the corresponding property (value is an object)
     virtual void SetPropertyAsObject(int objectID,
         const wxClassInfo *classInfo,
-        const wxPropertyInfo* propertyInfo ,
+        const wxPropertyInfo* propertyInfo,
         int valueObjectId) = 0;
 
     // adds an element to a property collection
-    virtual void AddToPropertyCollection( int objectID ,
+    virtual void AddToPropertyCollection( int objectID,
         const wxClassInfo *classInfo,
-        const wxPropertyInfo* propertyInfo ,
-        const wxxVariant &VariantValue) = 0;
+        const wxPropertyInfo* propertyInfo,
+        const wxVariantBase &VariantValue) = 0;
 
     // sets the corresponding property (value is an object)
     virtual void AddToPropertyCollectionAsObject(int objectID,
         const wxClassInfo *classInfo,
-        const wxPropertyInfo* propertyInfo ,
+        const wxPropertyInfo* propertyInfo,
         int valueObjectId) = 0;
 
     // sets the corresponding event handler
     virtual void SetConnect(int EventSourceObjectID,
         const wxClassInfo *EventSourceClassInfo,
-        const wxPropertyInfo *delegateInfo ,
-        const wxClassInfo *EventSinkClassInfo ,
-        const wxHandlerInfo* handlerInfo ,
+        const wxPropertyInfo *delegateInfo,
+        const wxClassInfo *EventSinkClassInfo,
+        const wxHandlerInfo* handlerInfo,
         int EventSinkObjectID ) = 0;
 };
 
 /*
-wxRuntimeDepersister implements the callbacks that will depersist
+wxObjectRuntimeReaderCallback implements the callbacks that will depersist
 an object into a running memory image, as opposed to writing
 C++ initialization code to bring the object to life.
 */
 
-class WXDLLIMPEXP_BASE wxRuntimeDepersister : public wxDepersister
+class WXDLLIMPEXP_BASE wxObjectRuntimeReaderCallback: public wxObjectWriterCallback
 {
-    struct wxRuntimeDepersisterInternal ;
-    wxRuntimeDepersisterInternal * m_data ;
-public :
-    wxRuntimeDepersister();
-    virtual ~wxRuntimeDepersister();
+    struct wxObjectRuntimeReaderCallbackInternal;
+    wxObjectRuntimeReaderCallbackInternal * m_data;
+
+public:
+    wxObjectRuntimeReaderCallback();
+    virtual ~wxObjectRuntimeReaderCallback();
 
     // returns the object having the corresponding ID fully constructed
-    wxObject *GetObject(int objectID) ;
+    wxObject *GetObject(int objectID);
 
     // allocate the new object on the heap, that object will have the passed in ID
-    virtual void AllocateObject(int objectID, wxClassInfo *classInfo ,
-        wxxVariantArray &metadata) ;
+    virtual void AllocateObject(int objectID, wxClassInfo *classInfo,
+        wxVariantBaseArray &metadata);
 
-    // initialize the already allocated object having the ID objectID with the Create method
-    // creation parameters which are objects are having their Ids passed in objectIDValues
-    // having objectId <> wxInvalidObjectID
+    // initialize the already allocated object having the ID objectID with 
+    // the Create method creation parameters which are objects are having 
+    // their Ids passed in objectIDValues having objectId <> wxInvalidObjectID
 
     virtual void CreateObject(int objectID,
         const wxClassInfo *classInfo,
         int paramCount,
-        wxxVariant *VariantValues ,
+        wxVariantBase *VariantValues,
         int *objectIDValues,
-        const wxClassInfo **objectClassInfos ,
-        wxxVariantArray &metadata
-        ) ;
+        const wxClassInfo **objectClassInfos,
+        wxVariantBaseArray &metadata
+        );
 
-    // construct the new object on the heap, that object will have the passed in ID (for objects that
-    // don't support allocate-create type of creation)
-    // creation parameters which are objects are having their Ids passed in objectIDValues
-    // having objectId <> wxInvalidObjectID
+    // construct the new object on the heap, that object will have the 
+    // passed in ID (for objects that don't support allocate-create type of 
+    // creation) creation parameters which are objects are having their Ids 
+    // passed in objectIDValues having objectId <> wxInvalidObjectID
 
     virtual void ConstructObject(int objectID,
         const wxClassInfo *classInfo,
         int paramCount,
-        wxxVariant *VariantValues ,
-        int *objectIDValues ,
-        const wxClassInfo **objectClassInfos ,
-        wxxVariantArray &metadata) ;
-
-    // destroy the heap-allocated object having the ID objectID, this may be used if an object
-    // is embedded in another object and set via value semantics, so the intermediate
-    // object can be destroyed after safely
-    virtual void DestroyObject(int objectID, wxClassInfo *classInfo) ;
-
-    // set the corresponding property
-    virtual void SetProperty(int objectID,
-        const wxClassInfo *classInfo,
-        const wxPropertyInfo* propertyInfo ,
-        const wxxVariant &variantValue);
-
-    // sets the corresponding property (value is an object)
-    virtual void SetPropertyAsObject(int objectId,
-        const wxClassInfo *classInfo,
-        const wxPropertyInfo* propertyInfo ,
-        int valueObjectId) ;
-
-    // adds an element to a property collection
-    virtual void AddToPropertyCollection( int objectID ,
-        const wxClassInfo *classInfo,
-        const wxPropertyInfo* propertyInfo ,
-        const wxxVariant &VariantValue) ;
-
-    // sets the corresponding property (value is an object)
-    virtual void AddToPropertyCollectionAsObject(int objectID,
-        const wxClassInfo *classInfo,
-        const wxPropertyInfo* propertyInfo ,
-        int valueObjectId) ;
-
-    // sets the corresponding event handler
-    virtual void SetConnect(int eventSourceObjectID,
-        const wxClassInfo *eventSourceClassInfo,
-        const wxPropertyInfo *delegateInfo ,
-        const wxClassInfo *eventSinkClassInfo ,
-        const wxHandlerInfo* handlerInfo ,
-        int eventSinkObjectID ) ;
-};
-
-/*
-wxDepersisterCode implements the callbacks that will depersist
-an object into a C++ initialization function. this will move to
-a utility lib soon
-*/
-
-class WXDLLIMPEXP_FWD_BASE wxTextOutputStream ;
-
-class WXDLLIMPEXP_BASE wxCodeDepersister : public wxDepersister
-{
-private :
-    struct wxCodeDepersisterInternal ;
-    wxCodeDepersisterInternal * m_data ;
-    wxTextOutputStream *m_fp;
-    wxString ValueAsCode( const wxxVariant &param ) ;
-public:
-    wxCodeDepersister(wxTextOutputStream *out);
-    virtual ~wxCodeDepersister();
-
-    // allocate the new object on the heap, that object will have the passed in ID
-    virtual void AllocateObject(int objectID, wxClassInfo *classInfo ,
-        wxxVariantArray &metadata) ;
-
-    // initialize the already allocated object having the ID objectID with the Create method
-    // creation parameters which are objects are having their Ids passed in objectIDValues
-    // having objectId <> wxInvalidObjectID
-
-    virtual void CreateObject(int objectID,
-        const wxClassInfo *classInfo,
-        int paramCount,
-        wxxVariant *variantValues ,
+        wxVariantBase *VariantValues,
         int *objectIDValues,
-        const wxClassInfo **objectClassInfos ,
-        wxxVariantArray &metadata
-        ) ;
-
-     // construct the new object on the heap, that object will have the passed in ID (for objects that
-    // don't support allocate-create type of creation)
-    // creation parameters which are objects are having their Ids passed in objectIDValues
-    // having objectId <> wxInvalidObjectID
-
-    virtual void ConstructObject(int objectID,
-        const wxClassInfo *classInfo,
-        int paramCount,
-        wxxVariant *VariantValues ,
-        int *objectIDValues ,
-        const wxClassInfo **objectClassInfos ,
-        wxxVariantArray &metadata) ;
+        const wxClassInfo **objectClassInfos,
+        wxVariantBaseArray &metadata);
 
-    // destroy the heap-allocated object having the ID objectID, this may be used if an object
-    // is embedded in another object and set via value semantics, so the intermediate
-    // object can be destroyed after safely
-    virtual void DestroyObject(int objectID, wxClassInfo *classInfo) ;
+    // destroy the heap-allocated object having the ID objectID, this may be 
+    // used if an object is embedded in another object and set via value semantics, 
+    // so the intermediate object can be destroyed after safely
+    virtual void DestroyObject(int objectID, wxClassInfo *classInfo);
 
     // set the corresponding property
     virtual void SetProperty(int objectID,
         const wxClassInfo *classInfo,
-        const wxPropertyInfo* propertyInfo ,
-        const wxxVariant &variantValue);
+        const wxPropertyInfo* propertyInfo,
+        const wxVariantBase &variantValue);
 
     // sets the corresponding property (value is an object)
     virtual void SetPropertyAsObject(int objectId,
         const wxClassInfo *classInfo,
-        const wxPropertyInfo* propertyInfo ,
-        int valueObjectId) ;
+        const wxPropertyInfo* propertyInfo,
+        int valueObjectId);
 
     // adds an element to a property collection
-    virtual void AddToPropertyCollection( int objectID ,
+    virtual void AddToPropertyCollection( int objectID,
         const wxClassInfo *classInfo,
-        const wxPropertyInfo* propertyInfo ,
-        const wxxVariant &VariantValue) ;
+        const wxPropertyInfo* propertyInfo,
+        const wxVariantBase &VariantValue);
 
     // sets the corresponding property (value is an object)
     virtual void AddToPropertyCollectionAsObject(int objectID,
         const wxClassInfo *classInfo,
-        const wxPropertyInfo* propertyInfo ,
-        int valueObjectId) ;
+        const wxPropertyInfo* propertyInfo,
+        int valueObjectId);
 
     // sets the corresponding event handler
     virtual void SetConnect(int eventSourceObjectID,
         const wxClassInfo *eventSourceClassInfo,
-        const wxPropertyInfo *delegateInfo ,
-        const wxClassInfo *eventSinkClassInfo ,
-        const wxHandlerInfo* handlerInfo ,
-        int eventSinkObjectID ) ;
+        const wxPropertyInfo *delegateInfo,
+        const wxClassInfo *eventSinkClassInfo,
+        const wxHandlerInfo* handlerInfo,
+        int eventSinkObjectID );
 };
 
 #endif // wxUSE_EXTENDED_RTTI
index ce64af46ccdb4d418c2ac53a216f4d9c8f391711..f11b4ec0bea3c3ccd2c5464efa660577f35d7bb4 100644 (file)
 #ifndef _WX_XTIXMLH__
 #define _WX_XTIXMLH__
 
-#include "wx/wx.h"
+#include "wx/defs.h"
 
 #if wxUSE_EXTENDED_RTTI
 
+#include "wx/string.h"
 #include "wx/xtistrm.h"
 
-class WXDLLIMPEXP_FWD_XML wxXmlNode ;
+class WXDLLIMPEXP_XML wxXmlNode;
+class WXDLLIMPEXP_BASE wxPropertyInfo;
+class WXDLLIMPEXP_BASE wxObject;
+class WXDLLIMPEXP_BASE wxClassInfo;
+class WXDLLIMPEXP_BASE wxVariantBaseArray;
+class WXDLLIMPEXP_BASE wxHandlerInfo;
+class WXDLLIMPEXP_BASE wxObjectWriterCallback;
 
-class WXDLLIMPEXP_XML wxXmlWriter : public wxWriter
+class WXDLLIMPEXP_XML wxObjectXmlWriter: public wxObjectWriter
 {
-public :
+public:
 
-    wxXmlWriter( wxXmlNode * parent ) ;
-    virtual ~wxXmlWriter() ;
+    wxObjectXmlWriter( wxXmlNode * parent );
+    virtual ~wxObjectXmlWriter();
 
     //
     // streaming callbacks
@@ -39,66 +46,71 @@ public :
     // these callbacks really write out the values in the stream format
 
     // begins writing out a new toplevel entry which has the indicated unique name
-    virtual void DoBeginWriteTopLevelEntry( const wxString &name )  ;
+    virtual void DoBeginWriteTopLevelEntry( const wxString &name );
 
     // ends writing out a new toplevel entry which has the indicated unique name
-    virtual void DoEndWriteTopLevelEntry( const wxString &name )  ;
+    virtual void DoEndWriteTopLevelEntry( const wxString &name );
 
     // start of writing an object having the passed in ID
-    virtual void DoBeginWriteObject(const wxObject *object, const wxClassInfo *classInfo, int objectID , wxxVariantArray &metadata ) ;
+    virtual void DoBeginWriteObject(const wxObject *object, 
+        const wxClassInfo *classInfo, int objectID, wxVariantBaseArray &metadata );
 
-    // end of writing an toplevel object name param is used for unique identification within the container
-    virtual void DoEndWriteObject(const wxObject *object, const wxClassInfo *classInfo, int objectID ) ;
+    // end of writing an toplevel object name param is used for unique 
+    // identification within the container
+    virtual void DoEndWriteObject(const wxObject *object, 
+        const wxClassInfo *classInfo, int objectID );
 
     // writes a simple property in the stream format
-    virtual void DoWriteSimpleType( wxxVariant &value )  ;
+    virtual void DoWriteSimpleType( wxVariantBase &value );
 
     // start of writing a complex property into the stream (
-    virtual void DoBeginWriteProperty( const wxPropertyInfo *propInfo )  ;
+    virtual void DoBeginWriteProperty( const wxPropertyInfo *propInfo );
 
     // end of writing a complex property into the stream
-    virtual void DoEndWriteProperty( const wxPropertyInfo *propInfo ) ;
+    virtual void DoEndWriteProperty( const wxPropertyInfo *propInfo );
 
-    virtual void DoBeginWriteElement() ;
-    virtual void DoEndWriteElement() ;
+    virtual void DoBeginWriteElement();
+    virtual void DoEndWriteElement();
 
     // insert an object reference to an already written object
-    virtual void DoWriteRepeatedObject( int objectID )  ;
+    virtual void DoWriteRepeatedObject( int objectID );
 
     // insert a null reference
-    virtual void DoWriteNullObject()  ;
+    virtual void DoWriteNullObject();
 
     // writes a delegate in the stream format
-    virtual void DoWriteDelegate( const wxObject *object,  const wxClassInfo* classInfo , const wxPropertyInfo *propInfo ,
-        const wxObject *eventSink , int sinkObjectID , const wxClassInfo* eventSinkClassInfo , const wxHandlerInfo* handlerIndo ) ;
-private :
-    struct wxXmlWriterInternal ;
-    wxXmlWriterInternal* m_data ;
-} ;
+    virtual void DoWriteDelegate( const wxObject *object,  
+        const wxClassInfo* classInfo, const wxPropertyInfo *propInfo,
+        const wxObject *eventSink, int sinkObjectID, 
+        const wxClassInfo* eventSinkClassInfo, const wxHandlerInfo* handlerIndo );
+
+private:
+    struct wxObjectXmlWriterInternal;
+    wxObjectXmlWriterInternal* m_data;
+};
 
 /*
-wxXmlReader handles streaming in a class from XML
+wxObjectXmlReader handles streaming in a class from XML
 */
 
-class WXDLLIMPEXP_XML wxXmlReader : public wxReader
+class WXDLLIMPEXP_XML wxObjectXmlReader: public wxObjectReader
 {
 public:
-    wxXmlReader(wxXmlNode *parent) { m_parent = parent ; }
-    virtual ~wxXmlReader() {}
+    wxObjectXmlReader(wxXmlNode *parent) { m_parent = parent; }
+    virtual ~wxObjectXmlReader() {}
 
     // Reads a component from XML.  The return value is the root object ID, which can
     // then be used to ask the depersister about that object
 
-    virtual int ReadObject( const wxString &name , wxDepersister *depersist ) ;
+    virtual int ReadObject( const wxString &name, wxObjectWriterCallback *depersist );
 
-private :
-    int ReadComponent(wxXmlNode *parent, wxDepersister *callbacks);
+private:
+    int ReadComponent(wxXmlNode *parent, wxObjectWriterCallback *callbacks);
 
     // read the content of this node (simple type) and return the corresponding value
-    wxxVariant ReadValue(wxXmlNode *Node,
-        const wxTypeInfo *type );
+    wxVariantBase ReadValue(wxXmlNode *Node, const wxTypeInfo *type );
 
-    wxXmlNode * m_parent ;
+    wxXmlNode * m_parent;
 };
 
 #endif // wxUSE_EXTENDED_RTTI
index 4c12d488cacf6f7b8491ffa0d5926d7329edd9ed..e3ebb7fd0239227e412c655b7ce0c9080dfb44a6 100644 (file)
@@ -24,7 +24,6 @@
 #import <AppKit/NSButton.h>
 #import <Foundation/NSString.h>
 
-IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxControl)
 BEGIN_EVENT_TABLE(wxBitmapButton, wxBitmapButtonBase)
 END_EVENT_TABLE()
 WX_IMPLEMENT_COCOA_OWNER(wxBitmapButton,NSButton,NSControl,NSView)
index eba72f400c2be2afc463a0f749f837619007dade..373a1c4b338b2378072558ae9bbb7a41b3a9c62e 100644 (file)
@@ -26,7 +26,6 @@
 #import <AppKit/NSButton.h>
 #import <Foundation/NSString.h>
 
-IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl)
 BEGIN_EVENT_TABLE(wxCheckBox, wxCheckBoxBase)
 END_EVENT_TABLE()
 WX_IMPLEMENT_COCOA_OWNER(wxCheckBox,NSButton,NSControl,NSView)
index 30c9dab74ae2887a66e4450a141f81d85d6a74db..0bec755e0026652f78c05961939e444467a33945 100644 (file)
@@ -29,7 +29,6 @@
 #import <Foundation/NSNotification.h>
 #import <Foundation/NSDictionary.h>
 
-IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControlWithItems)
 BEGIN_EVENT_TABLE(wxChoice, wxChoiceBase)
 END_EVENT_TABLE()
 // WX_IMPLEMENT_COCOA_OWNER(wxChoice,NSButton,NSControl,NSView)
index d1dbbbe36c988ba5ce2e474aa889b68457195705..df7e25e0d054b1415f1b7894ba3c3c5d80205145 100644 (file)
@@ -22,8 +22,6 @@
 
 #import <AppKit/NSColor.h>
 
-IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
-
 void wxColour::Init()
 {
     m_cocoaNSColor = NULL;
index b34e2c8caed375143a22e74367d859c7a3eb207b..14c8d35532afba3ccc4ccd19c92a1232598bff65 100644 (file)
@@ -168,7 +168,6 @@ WX_IMPLEMENT_GET_OBJC_CLASS(wxPoserNSComboBox,NSComboBox)
 
 #import <AppKit/NSComboBox.h>
 
-IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)
 BEGIN_EVENT_TABLE(wxComboBox, wxControl)
 END_EVENT_TABLE()
 WX_IMPLEMENT_COCOA_OWNER(wxComboBox,NSComboBox,NSTextField,NSView)
index 3e791fa80155f88258b17aba067c760737145109..78b82d4f8c185f2a0f3965e6a99ef79f1636092c 100644 (file)
@@ -34,8 +34,6 @@
 BEGIN_EVENT_TABLE(wxFrame, wxFrameBase)
 END_EVENT_TABLE()
 
-IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow)
-
 void wxFrame::Init()
 {
     m_frameNSView = nil;
index 0f1c122ac4b46da5324932dc1c2920d6bdb22659..c2a48305f77b8befd78073c80911ce2df245b76f 100644 (file)
@@ -27,8 +27,6 @@
 
 #include <math.h>
 
-IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl)
-
 BEGIN_EVENT_TABLE(wxGauge, wxGaugeBase)
 END_EVENT_TABLE()
 // WX_IMPLEMENT_COCOA_OWNER(wxGauge,NSProgressIndicator,NSView,NSView)
index 1b95e7912f0ebcad53bbd6ddcb3617bf4bf8e6be..5f287ac195a915b96baa3a9e3f672b3a89b543b9 100644 (file)
@@ -68,7 +68,6 @@ static void _SetWidthOfTableColumnToFitItems(NSTableColumn *tableColumn, NSArray
 // class wxListBox
 // ============================================================================
 
-IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControlWithItems)
 BEGIN_EVENT_TABLE(wxListBox, wxListBoxBase)
 END_EVENT_TABLE()
 WX_IMPLEMENT_COCOA_OWNER(wxListBox,NSTableView,NSControl,NSView)
index 09fd5804d08d48125a1815a721a7d7ee223a8460..3a5d0553b0ce66be75a49a9716082eff57603cdd 100644 (file)
@@ -28,7 +28,6 @@
 
 WX_DEFINE_LIST(wxRadioButtonList);
 
-IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
 // wxRadioButtonBase == wxControl
 BEGIN_EVENT_TABLE(wxRadioButton, wxControl)
 END_EVENT_TABLE()
index 1ce04db251633851a2f94fa78ed1f3c0708d61fa..4ce46ec46277de9deaf7ef9cfbd6cf7679ef959c 100644 (file)
@@ -21,7 +21,6 @@
 
 #import <AppKit/NSScroller.h>
 
-IMPLEMENT_DYNAMIC_CLASS(wxScrollBar, wxControl)
 BEGIN_EVENT_TABLE(wxScrollBar, wxScrollBarBase)
 END_EVENT_TABLE()
 WX_IMPLEMENT_COCOA_OWNER(wxScrollBar,NSScroller,NSControl,NSView)
index b469a2a67f3c910692f8e65adb25e4f4081ac471..9610fc44bb28638a5f56519543e42e8de46779a3 100644 (file)
@@ -26,8 +26,7 @@
 #import <AppKit/NSEvent.h>
 #import <AppKit/NSWindow.h>
 
-IMPLEMENT_DYNAMIC_CLASS(wxSlider, wxControl)
-    BEGIN_EVENT_TABLE(wxSlider, wxSliderBase)
+BEGIN_EVENT_TABLE(wxSlider, wxSliderBase)
 END_EVENT_TABLE()
 WX_IMPLEMENT_COCOA_OWNER(wxSlider,NSSlider,NSControl,NSView)
 
index 2e3f8e9c4a02430b2719ac2888e178263acf1f14..1be9d4f1ba7836024d82fc624016daa7cd66ae48 100644 (file)
@@ -19,9 +19,6 @@
 
 #import <AppKit/NSStepper.h>
 
-IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent)
-
-IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl)
 BEGIN_EVENT_TABLE(wxSpinButton, wxSpinButtonBase)
 END_EVENT_TABLE()
 // WX_IMPLEMENT_COCOA_OWNER(wxSpinButton,NSStepper,NSControl,NSView)
index 653b81eafc83edcebc1ac80aa7b81c71252e8413..538c999181ea8f86946560c2f757dd30984339ce 100644 (file)
@@ -21,8 +21,6 @@
 
 #import <AppKit/NSImageView.h>
 
-IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
-
 BEGIN_EVENT_TABLE(wxStaticBitmap, wxControl)
 END_EVENT_TABLE()
 // WX_IMPLEMENT_COCOA_OWNER(wxStaticBitmap,NSTextField,NSControl,NSView)
index 51458f094e0772b70fc57ef4832ccc1fb761e8d8..ac443b5aa08a5c5f06d02b8f0a109a4dfd917244 100644 (file)
@@ -23,7 +23,6 @@
 #import <AppKit/NSBox.h>
 #import <Foundation/NSString.h>
 
-IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl)
 BEGIN_EVENT_TABLE(wxStaticBox, wxStaticBoxBase)
 END_EVENT_TABLE()
 WX_IMPLEMENT_COCOA_OWNER(wxStaticBox,NSBox,NSView,NSView)
index b77cc99f5bf72cc4cb51679941b15d058c070839..3caac1b864150f9659c61b505c9dcad34a52c4e6 100644 (file)
@@ -19,7 +19,6 @@
 
 #import <AppKit/NSBox.h>
 
-IMPLEMENT_DYNAMIC_CLASS(wxStaticLine, wxControl)
 BEGIN_EVENT_TABLE(wxStaticLine, wxStaticLineBase)
 END_EVENT_TABLE()
 // WX_IMPLEMENT_COCOA_OWNER(wxStaticLine,NSTextField,NSControl,NSView)
index 35baa0afdcc6370e1d2bc42c14ff8b579aff07fc..ba9028a6f3edf8fbc7ef69d28638f7fba8cb6450 100644 (file)
@@ -26,7 +26,6 @@
 #import <AppKit/NSTextField.h>
 #include <math.h>
 
-IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl)
 BEGIN_EVENT_TABLE(wxStaticText, wxControl)
 END_EVENT_TABLE()
 WX_IMPLEMENT_COCOA_OWNER(wxStaticText,NSTextField,NSControl,NSView)
index 3b1b5c1061f70611882c943c37a96e7a29f05f60..d60d41012303c4b853405a47348d3ecbe1ac3ca6 100644 (file)
@@ -29,7 +29,6 @@
 
 #include <math.h>
 
-IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxTextCtrlBase)
 BEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase)
 END_EVENT_TABLE()
 WX_IMPLEMENT_COCOA_OWNER(wxTextCtrl,NSTextField,NSControl,NSView)
index 6e41a2ce5d97620de6de629d6d65ed981172043e..c7e8c56b08e25a25b7e6c1bc8afa5e139c74e21c 100644 (file)
@@ -928,8 +928,6 @@ void wxWindowCocoaScrollView::Cocoa_FrameChanged(void)
 // normally the base classes aren't included, but wxWindow is special
 #ifdef __WXUNIVERSAL__
 IMPLEMENT_ABSTRACT_CLASS(wxWindowCocoa, wxWindowBase)
-#else
-IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowBase)
 #endif
 
 BEGIN_EVENT_TABLE(wxWindowCocoa, wxWindowBase)
index c0a943189bf2e3ae780499a0904ee48d1df163c5..fc96b645093d49a5579eb5cd8ccb5a3af23a2766 100644 (file)
     #include "wx/toplevel.h"
 #endif //WX_PRECOMP
 
+
+// ----------------------------------------------------------------------------
+// XTI
+// ----------------------------------------------------------------------------
+
+wxDEFINE_FLAGS( wxButtonStyle )
+wxBEGIN_FLAGS( wxButtonStyle )
+// new style border flags, we put them first to
+// use them for streaming out
+wxFLAGS_MEMBER(wxBORDER_SIMPLE)
+wxFLAGS_MEMBER(wxBORDER_SUNKEN)
+wxFLAGS_MEMBER(wxBORDER_DOUBLE)
+wxFLAGS_MEMBER(wxBORDER_RAISED)
+wxFLAGS_MEMBER(wxBORDER_STATIC)
+wxFLAGS_MEMBER(wxBORDER_NONE)
+
+// old style border flags
+wxFLAGS_MEMBER(wxSIMPLE_BORDER)
+wxFLAGS_MEMBER(wxSUNKEN_BORDER)
+wxFLAGS_MEMBER(wxDOUBLE_BORDER)
+wxFLAGS_MEMBER(wxRAISED_BORDER)
+wxFLAGS_MEMBER(wxSTATIC_BORDER)
+wxFLAGS_MEMBER(wxBORDER)
+
+// standard window styles
+wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
+wxFLAGS_MEMBER(wxCLIP_CHILDREN)
+wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
+wxFLAGS_MEMBER(wxWANTS_CHARS)
+wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
+wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
+wxFLAGS_MEMBER(wxVSCROLL)
+wxFLAGS_MEMBER(wxHSCROLL)
+
+wxFLAGS_MEMBER(wxBU_LEFT)
+wxFLAGS_MEMBER(wxBU_RIGHT)
+wxFLAGS_MEMBER(wxBU_TOP)
+wxFLAGS_MEMBER(wxBU_BOTTOM)
+wxFLAGS_MEMBER(wxBU_EXACTFIT)
+wxEND_FLAGS( wxButtonStyle )
+
+wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxButton, wxControl, "wx/button.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxButton)
+wxEVENT_PROPERTY( Click, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEvent )
+
+wxPROPERTY( Font, wxFont, SetFont, GetFont, wxEMPTY_PARAMETER_VALUE, \
+           0 /*flags*/, wxT("The font associated with the button label"), wxT("group"))
+wxPROPERTY( Label, wxString, SetLabel, GetLabel, wxString(), \
+           0 /*flags*/, wxT("The button label"), wxT("group") )
+
+wxPROPERTY_FLAGS( WindowStyle, wxButtonStyle, long, SetWindowStyleFlag, \
+                 GetWindowStyleFlag, wxEMPTY_PARAMETER_VALUE, 0 /*flags*/,     \
+                 wxT("The button style"), wxT("group")) // style
+wxEND_PROPERTIES_TABLE()
+
+wxEMPTY_HANDLERS_TABLE(wxButton)
+
+wxCONSTRUCTOR_6( wxButton, wxWindow*, Parent, wxWindowID, Id, wxString, \
+                Label, wxPoint, Position, wxSize, Size, long, WindowStyle )
+
+
 // ============================================================================
 // implementation
 // ============================================================================
index 9f1fd917c5ecd62aa1736cb8044d77fc18c3bd82..2f68eae14c6b16a8309db172e4a026981e67ae14 100644 (file)
@@ -29,6 +29,70 @@ wxDEFINE_EVENT(wxEVT_DATE_CHANGED, wxDateEvent);
 
 #include "wx/calctrl.h"
 
+// ----------------------------------------------------------------------------
+// XTI
+// ----------------------------------------------------------------------------
+
+wxDEFINE_FLAGS( wxCalendarCtrlStyle )
+wxBEGIN_FLAGS( wxCalendarCtrlStyle )
+// new style border flags, we put them first to
+// use them for streaming out
+wxFLAGS_MEMBER(wxBORDER_SIMPLE)
+wxFLAGS_MEMBER(wxBORDER_SUNKEN)
+wxFLAGS_MEMBER(wxBORDER_DOUBLE)
+wxFLAGS_MEMBER(wxBORDER_RAISED)
+wxFLAGS_MEMBER(wxBORDER_STATIC)
+wxFLAGS_MEMBER(wxBORDER_NONE)
+
+// old style border flags
+wxFLAGS_MEMBER(wxSIMPLE_BORDER)
+wxFLAGS_MEMBER(wxSUNKEN_BORDER)
+wxFLAGS_MEMBER(wxDOUBLE_BORDER)
+wxFLAGS_MEMBER(wxRAISED_BORDER)
+wxFLAGS_MEMBER(wxSTATIC_BORDER)
+wxFLAGS_MEMBER(wxBORDER)
+
+// standard window styles
+wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
+wxFLAGS_MEMBER(wxCLIP_CHILDREN)
+wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
+wxFLAGS_MEMBER(wxWANTS_CHARS)
+wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
+wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
+wxFLAGS_MEMBER(wxVSCROLL)
+wxFLAGS_MEMBER(wxHSCROLL)
+
+wxFLAGS_MEMBER(wxCAL_SUNDAY_FIRST)
+wxFLAGS_MEMBER(wxCAL_MONDAY_FIRST)
+wxFLAGS_MEMBER(wxCAL_SHOW_HOLIDAYS)
+wxFLAGS_MEMBER(wxCAL_NO_YEAR_CHANGE)
+wxFLAGS_MEMBER(wxCAL_NO_MONTH_CHANGE)
+wxFLAGS_MEMBER(wxCAL_SEQUENTIAL_MONTH_SELECTION)
+wxFLAGS_MEMBER(wxCAL_SHOW_SURROUNDING_WEEKS)
+
+wxEND_FLAGS( wxCalendarCtrlStyle )
+
+wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxCalendarCtrl, wxControl, "wx/calctrl.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxCalendarCtrl)
+wxEVENT_RANGE_PROPERTY( Updated, wxEVT_CALENDAR_SEL_CHANGED, \
+                       wxEVT_CALENDAR_WEEKDAY_CLICKED, wxCalendarEvent )
+
+wxHIDE_PROPERTY( Children )
+
+wxPROPERTY( Date,wxDateTime, SetDate, GetDate, wxEMPTY_PARAMETER_VALUE, \
+           0 /*flags*/, wxT("Helpstring"), wxT("group"))
+wxPROPERTY_FLAGS( WindowStyle, wxCalendarCtrlStyle, long, \
+                 SetWindowStyleFlag, GetWindowStyleFlag, \
+                 wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, wxT("Helpstring"), \
+                 wxT("group")) // style
+wxEND_PROPERTIES_TABLE()
+
+wxEMPTY_HANDLERS_TABLE(wxCalendarCtrl)
+
+wxCONSTRUCTOR_6( wxCalendarCtrl, wxWindow*, Parent, wxWindowID, Id, \
+                wxDateTime, Date, wxPoint, Position, wxSize, Size, long, WindowStyle )
+
 // ----------------------------------------------------------------------------
 // events
 // ----------------------------------------------------------------------------
index 64f8a92347e01da7d80b107e513fdde002f4ec48..5dd372a3188a1402dfb4ac116ce497bba4029319 100644 (file)
 
 const char wxChoiceNameStr[] = "choice";
 
+
+wxDEFINE_FLAGS( wxChoiceStyle )
+wxBEGIN_FLAGS( wxChoiceStyle )
+// new style border flags, we put them first to
+// use them for streaming out
+wxFLAGS_MEMBER(wxBORDER_SIMPLE)
+wxFLAGS_MEMBER(wxBORDER_SUNKEN)
+wxFLAGS_MEMBER(wxBORDER_DOUBLE)
+wxFLAGS_MEMBER(wxBORDER_RAISED)
+wxFLAGS_MEMBER(wxBORDER_STATIC)
+wxFLAGS_MEMBER(wxBORDER_NONE)
+
+// old style border flags
+wxFLAGS_MEMBER(wxSIMPLE_BORDER)
+wxFLAGS_MEMBER(wxSUNKEN_BORDER)
+wxFLAGS_MEMBER(wxDOUBLE_BORDER)
+wxFLAGS_MEMBER(wxRAISED_BORDER)
+wxFLAGS_MEMBER(wxSTATIC_BORDER)
+wxFLAGS_MEMBER(wxBORDER)
+
+// standard window styles
+wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
+wxFLAGS_MEMBER(wxCLIP_CHILDREN)
+wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
+wxFLAGS_MEMBER(wxWANTS_CHARS)
+wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
+wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
+wxFLAGS_MEMBER(wxVSCROLL)
+wxFLAGS_MEMBER(wxHSCROLL)
+
+wxEND_FLAGS( wxChoiceStyle )
+
+wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxChoice, wxControlWithItems, "wx/choice.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxChoice)
+wxEVENT_PROPERTY( Select, wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEvent )
+
+wxPROPERTY( Font, wxFont, SetFont, GetFont , wxEMPTY_PARAMETER_VALUE, \
+           0 /*flags*/, wxT("Helpstring"), wxT("group"))
+wxPROPERTY_COLLECTION( Choices, wxArrayString, wxString, AppendString, \
+                      GetStrings, 0 /*flags*/, wxT("Helpstring"), wxT("group"))
+wxPROPERTY( Selection,int, SetSelection, GetSelection, wxEMPTY_PARAMETER_VALUE, \
+           0 /*flags*/, wxT("Helpstring"), wxT("group"))
+
+/*
+ TODO PROPERTIES
+ selection (long)
+ content (list)
+ item
+ */
+
+wxPROPERTY_FLAGS( WindowStyle, wxChoiceStyle, long, SetWindowStyleFlag, \
+                 GetWindowStyleFlag, wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, \
+                 wxT("Helpstring"), wxT("group")) // style
+wxEND_PROPERTIES_TABLE()
+
+wxEMPTY_HANDLERS_TABLE(wxChoice)
+
+wxCONSTRUCTOR_4( wxChoice, wxWindow*, Parent, wxWindowID, Id, \
+                wxPoint, Position, wxSize, Size )
+
 // ============================================================================
 // implementation
 // ============================================================================
index 654f712564c6c13ff57f7ba95fda30f115963268..182d654f24428285eed4d82016e9f76dae590155 100644 (file)
 IMPLEMENT_VARIANT_OBJECT_EXPORTED(wxColour,WXDLLEXPORT)
 #endif
 
+
+// ----------------------------------------------------------------------------
+// XTI
+// ----------------------------------------------------------------------------
+
+#if wxUSE_EXTENDED_RTTI
+
+#include <string.h>
+
+template<> void wxStringReadValue(const wxString &s, wxColour &data )
+{
+    if ( !data.Set(s) )
+    {
+        wxLogError(_("String To Colour : Incorrect colour specification : %s"),
+                   s.c_str() );
+        data = wxNullColour;
+    }
+}
+
+template<> void wxStringWriteValue(wxString &s, const wxColour &data )
+{
+    s = data.GetAsString(wxC2S_HTML_SYNTAX);
+}
+
+wxTO_STRING_IMP( wxColour )
+wxFROM_STRING_IMP( wxColour )
+
+wxIMPLEMENT_DYNAMIC_CLASS_WITH_COPY_AND_STREAMERS_XTI( wxColour, wxObject,  \
+                                                      "wx/colour.h",  &wxTO_STRING( wxColour ), &wxFROM_STRING( wxColour ))
+
+wxBEGIN_PROPERTIES_TABLE(wxColour)
+wxREADONLY_PROPERTY( Red, unsigned char, Red, wxEMPTY_PARAMETER_VALUE, \
+                    0 /*flags*/, wxT("Helpstring"), wxT("group"))
+wxREADONLY_PROPERTY( Green, unsigned char, Green, wxEMPTY_PARAMETER_VALUE, \
+                    0 /*flags*/, wxT("Helpstring"), wxT("group"))
+wxREADONLY_PROPERTY( Blue, unsigned char, Blue, wxEMPTY_PARAMETER_VALUE, \
+                    0 /*flags*/, wxT("Helpstring"), wxT("group"))
+wxEND_PROPERTIES_TABLE()
+
+wxDIRECT_CONSTRUCTOR_3( wxColour, unsigned char, Red, \
+                       unsigned char, Green, unsigned char, Blue )
+
+wxEMPTY_HANDLERS_TABLE(wxColour)
+#else
+
+#if wxCOLOUR_IS_GDIOBJECT
+wxIMPLEMENT_DYNAMIC_CLASS(wxColour, wxGDIObject)
+#else
+wxIMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
+#endif
+
+#endif
+
 // ============================================================================
 // wxString <-> wxColour conversions
 // ============================================================================
index 0b3a518a1b22ec7331f01bca321b574773c0c7a0..3d0e5c5c48b215f04168ba8fb21d58605a5888d3 100644 (file)
 #include "wx/combo.h"
 
 
+// ----------------------------------------------------------------------------
+// XTI
+// ----------------------------------------------------------------------------
+
+wxDEFINE_FLAGS( wxComboBoxStyle )
+wxBEGIN_FLAGS( wxComboBoxStyle )
+// new style border flags, we put them first to
+// use them for streaming out
+wxFLAGS_MEMBER(wxBORDER_SIMPLE)
+wxFLAGS_MEMBER(wxBORDER_SUNKEN)
+wxFLAGS_MEMBER(wxBORDER_DOUBLE)
+wxFLAGS_MEMBER(wxBORDER_RAISED)
+wxFLAGS_MEMBER(wxBORDER_STATIC)
+wxFLAGS_MEMBER(wxBORDER_NONE)
+
+// old style border flags
+wxFLAGS_MEMBER(wxSIMPLE_BORDER)
+wxFLAGS_MEMBER(wxSUNKEN_BORDER)
+wxFLAGS_MEMBER(wxDOUBLE_BORDER)
+wxFLAGS_MEMBER(wxRAISED_BORDER)
+wxFLAGS_MEMBER(wxSTATIC_BORDER)
+wxFLAGS_MEMBER(wxBORDER)
+
+// standard window styles
+wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
+wxFLAGS_MEMBER(wxCLIP_CHILDREN)
+wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
+wxFLAGS_MEMBER(wxWANTS_CHARS)
+wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
+wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
+wxFLAGS_MEMBER(wxVSCROLL)
+wxFLAGS_MEMBER(wxHSCROLL)
+
+wxFLAGS_MEMBER(wxCB_SIMPLE)
+wxFLAGS_MEMBER(wxCB_SORT)
+wxFLAGS_MEMBER(wxCB_READONLY)
+wxFLAGS_MEMBER(wxCB_DROPDOWN)
+
+wxEND_FLAGS( wxComboBoxStyle )
+
+wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxComboBox, wxChoice, "wx/combobox.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxComboBox)
+wxEVENT_PROPERTY( Select, wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEvent )
+wxEVENT_PROPERTY( TextEnter, wxEVT_COMMAND_TEXT_ENTER, wxCommandEvent )
+
+// TODO DELEGATES
+wxPROPERTY( Font, wxFont, SetFont, GetFont, wxEMPTY_PARAMETER_VALUE, \
+           0 /*flags*/, wxT("Helpstring"), wxT("group"))
+wxPROPERTY_COLLECTION( Choices, wxArrayString, wxString, AppendString, \
+                      GetStrings, 0 /*flags*/, wxT("Helpstring"), wxT("group"))
+wxPROPERTY( Value,wxString, SetValue, GetValue, wxEMPTY_PARAMETER_VALUE, \
+           0 /*flags*/, wxT("Helpstring"), wxT("group"))
+wxPROPERTY( Selection,int, SetSelection, GetSelection, wxEMPTY_PARAMETER_VALUE, \
+           0 /*flags*/, wxT("Helpstring"), wxT("group"))
+
+wxPROPERTY_FLAGS( WindowStyle, wxComboBoxStyle, long, SetWindowStyleFlag, \
+                 GetWindowStyleFlag, wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, \
+                 wxT("Helpstring"), wxT("group")) // style
+wxEND_PROPERTIES_TABLE()
+
+wxEMPTY_HANDLERS_TABLE(wxComboBox)
+
+wxCONSTRUCTOR_5( wxComboBox, wxWindow*, Parent, wxWindowID, Id, \
+                wxString, Value, wxPoint, Position, wxSize, Size )
 
 // constants
 // ----------------------------------------------------------------------------
index 69e0180b8652c9e14c465b44935c60cfbafcc6e6..6ac7f13029ef7beace636147a98d58a1967379f8 100644 (file)
 #include "wx/display.h"
 #endif
 
+
+// ----------------------------------------------------------------------------
+// XTI
+// ----------------------------------------------------------------------------
+
+wxDEFINE_FLAGS( wxDialogStyle )
+wxBEGIN_FLAGS( wxDialogStyle )
+// new style border flags, we put them first to
+// use them for streaming out
+wxFLAGS_MEMBER(wxBORDER_SIMPLE)
+wxFLAGS_MEMBER(wxBORDER_SUNKEN)
+wxFLAGS_MEMBER(wxBORDER_DOUBLE)
+wxFLAGS_MEMBER(wxBORDER_RAISED)
+wxFLAGS_MEMBER(wxBORDER_STATIC)
+wxFLAGS_MEMBER(wxBORDER_NONE)
+
+// old style border flags
+wxFLAGS_MEMBER(wxSIMPLE_BORDER)
+wxFLAGS_MEMBER(wxSUNKEN_BORDER)
+wxFLAGS_MEMBER(wxDOUBLE_BORDER)
+wxFLAGS_MEMBER(wxRAISED_BORDER)
+wxFLAGS_MEMBER(wxSTATIC_BORDER)
+wxFLAGS_MEMBER(wxNO_BORDER)
+
+// standard window styles
+wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
+wxFLAGS_MEMBER(wxCLIP_CHILDREN)
+
+// dialog styles
+wxFLAGS_MEMBER(wxWS_EX_VALIDATE_RECURSIVELY)
+wxFLAGS_MEMBER(wxSTAY_ON_TOP)
+wxFLAGS_MEMBER(wxCAPTION)
+#if WXWIN_COMPATIBILITY_2_6
+wxFLAGS_MEMBER(wxTHICK_FRAME)
+#endif // WXWIN_COMPATIBILITY_2_6
+wxFLAGS_MEMBER(wxSYSTEM_MENU)
+wxFLAGS_MEMBER(wxRESIZE_BORDER)
+#if WXWIN_COMPATIBILITY_2_6
+wxFLAGS_MEMBER(wxRESIZE_BOX)
+#endif // WXWIN_COMPATIBILITY_2_6
+wxFLAGS_MEMBER(wxCLOSE_BOX)
+wxFLAGS_MEMBER(wxMAXIMIZE_BOX)
+wxFLAGS_MEMBER(wxMINIMIZE_BOX)
+wxEND_FLAGS( wxDialogStyle )
+
+wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxDialog, wxTopLevelWindow, "wx/dialog.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxDialog)
+wxPROPERTY( Title, wxString, SetTitle, GetTitle, wxString(), \
+           0 /*flags*/, wxT("Helpstring"), wxT("group"))
+
+wxPROPERTY_FLAGS( WindowStyle, wxDialogStyle, long, SetWindowStyleFlag, \
+                 GetWindowStyleFlag, wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, \
+                 wxT("Helpstring"), wxT("group")) // style
+wxEND_PROPERTIES_TABLE()
+
+wxEMPTY_HANDLERS_TABLE(wxDialog)
+
+wxCONSTRUCTOR_6( wxDialog, wxWindow*, Parent, wxWindowID, Id, \
+                wxString, Title, wxPoint, Position, wxSize, Size, long, WindowStyle)
+
 // ----------------------------------------------------------------------------
 // wxDialogBase
 // ----------------------------------------------------------------------------
index 27154e9953bb4354188639921f12e658568366cb..c6f2c50c6a51870f1255c229295c1adea820255d 100644 (file)
@@ -71,6 +71,56 @@ extern const char *wxDumpFont(const wxFont *font)
     return buf;
 }
 
+// ----------------------------------------------------------------------------
+// XTI
+// ----------------------------------------------------------------------------
+
+wxBEGIN_ENUM( wxFontFamily )
+wxENUM_MEMBER( wxDEFAULT )
+wxENUM_MEMBER( wxDECORATIVE )
+wxENUM_MEMBER( wxROMAN )
+wxENUM_MEMBER( wxSCRIPT )
+wxENUM_MEMBER( wxSWISS )
+wxENUM_MEMBER( wxMODERN )
+wxENUM_MEMBER( wxTELETYPE )
+wxEND_ENUM( wxFontFamily )
+
+wxBEGIN_ENUM( wxFontStyle )
+wxENUM_MEMBER( wxNORMAL )
+wxENUM_MEMBER( wxITALIC )
+wxENUM_MEMBER( wxSLANT )
+wxEND_ENUM( wxFontStyle )
+
+wxBEGIN_ENUM( wxFontWeight )
+wxENUM_MEMBER( wxNORMAL )
+wxENUM_MEMBER( wxLIGHT )
+wxENUM_MEMBER( wxBOLD )
+wxEND_ENUM( wxFontWeight )
+
+wxIMPLEMENT_DYNAMIC_CLASS_WITH_COPY_XTI(wxFont, wxGDIObject, "wx/font.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxFont)
+wxPROPERTY( Size,int, SetPointSize, GetPointSize, 12, 0 /*flags*/, \
+           wxT("Helpstring"), wxT("group"))
+wxPROPERTY( Family, int , SetFamily, GetFamily, (int)wxDEFAULT, \
+           0 /*flags*/, wxT("Helpstring"), wxT("group")) // wxFontFamily
+wxPROPERTY( Style, int, SetStyle, GetStyle, (int)wxNORMAL, 0 /*flags*/, \
+           wxT("Helpstring"), wxT("group")) // wxFontStyle
+wxPROPERTY( Weight, int, SetWeight, GetWeight, (int)wxNORMAL, 0 /*flags*/, \
+           wxT("Helpstring"), wxT("group")) // wxFontWeight
+wxPROPERTY( Underlined, bool, SetUnderlined, GetUnderlined, false, 0 /*flags*/, \
+           wxT("Helpstring"), wxT("group"))
+wxPROPERTY( Face, wxString, SetFaceName, GetFaceName, wxEMPTY_PARAMETER_VALUE, \
+           0 /*flags*/, wxT("Helpstring"), wxT("group"))
+wxPROPERTY( Encoding, wxFontEncoding, SetEncoding, GetEncoding, \
+           wxFONTENCODING_DEFAULT, 0 /*flags*/, wxT("Helpstring"), wxT("group"))
+wxEND_PROPERTIES_TABLE()
+
+wxCONSTRUCTOR_6( wxFont, int, Size, int, Family, int, Style, int, Weight, \
+                bool, Underlined, wxString, Face )
+
+wxEMPTY_HANDLERS_TABLE(wxFont)
+
 // ============================================================================
 // implementation
 // ============================================================================
index c1c8cb1e80cee56e0af4770146a0576869b29ef0..4f969fa5d4536bc68308f2848ab50693495278c2 100644 (file)
 
 #include "wx/encconv.h"
 
-#if wxUSE_EXTENDED_RTTI
+// ----------------------------------------------------------------------------
+// XTI
+// ----------------------------------------------------------------------------
 
 wxBEGIN_ENUM( wxFontEncoding )
-    wxENUM_MEMBER( wxFONTENCODING_SYSTEM )
-    wxENUM_MEMBER( wxFONTENCODING_DEFAULT )
-
-    wxENUM_MEMBER( wxFONTENCODING_ISO8859_1 )
-    wxENUM_MEMBER( wxFONTENCODING_ISO8859_2 )
-    wxENUM_MEMBER( wxFONTENCODING_ISO8859_3 )
-    wxENUM_MEMBER( wxFONTENCODING_ISO8859_4 )
-    wxENUM_MEMBER( wxFONTENCODING_ISO8859_5 )
-    wxENUM_MEMBER( wxFONTENCODING_ISO8859_6 )
-    wxENUM_MEMBER( wxFONTENCODING_ISO8859_7 )
-    wxENUM_MEMBER( wxFONTENCODING_ISO8859_8 )
-    wxENUM_MEMBER( wxFONTENCODING_ISO8859_9 )
-    wxENUM_MEMBER( wxFONTENCODING_ISO8859_10 )
-    wxENUM_MEMBER( wxFONTENCODING_ISO8859_11 )
-    wxENUM_MEMBER( wxFONTENCODING_ISO8859_12 )
-    wxENUM_MEMBER( wxFONTENCODING_ISO8859_13 )
-    wxENUM_MEMBER( wxFONTENCODING_ISO8859_14 )
-    wxENUM_MEMBER( wxFONTENCODING_ISO8859_15 )
-    wxENUM_MEMBER( wxFONTENCODING_ISO8859_MAX )
-    wxENUM_MEMBER( wxFONTENCODING_KOI8 )
-    wxENUM_MEMBER( wxFONTENCODING_KOI8_U )
-    wxENUM_MEMBER( wxFONTENCODING_ALTERNATIVE )
-    wxENUM_MEMBER( wxFONTENCODING_BULGARIAN )
-    wxENUM_MEMBER( wxFONTENCODING_CP437 )
-    wxENUM_MEMBER( wxFONTENCODING_CP850 )
-    wxENUM_MEMBER( wxFONTENCODING_CP852 )
-    wxENUM_MEMBER( wxFONTENCODING_CP855 )
-    wxENUM_MEMBER( wxFONTENCODING_CP866 )
-
-    wxENUM_MEMBER( wxFONTENCODING_CP874 )
-    wxENUM_MEMBER( wxFONTENCODING_CP932 )
-    wxENUM_MEMBER( wxFONTENCODING_CP936 )
-    wxENUM_MEMBER( wxFONTENCODING_CP949 )
-    wxENUM_MEMBER( wxFONTENCODING_CP950 )
-    wxENUM_MEMBER( wxFONTENCODING_CP1250 )
-    wxENUM_MEMBER( wxFONTENCODING_CP1251 )
-    wxENUM_MEMBER( wxFONTENCODING_CP1252 )
-    wxENUM_MEMBER( wxFONTENCODING_CP1253 )
-    wxENUM_MEMBER( wxFONTENCODING_CP1254 )
-    wxENUM_MEMBER( wxFONTENCODING_CP1255 )
-    wxENUM_MEMBER( wxFONTENCODING_CP1256 )
-    wxENUM_MEMBER( wxFONTENCODING_CP1257 )
-    wxENUM_MEMBER( wxFONTENCODING_CP12_MAX )
-    wxENUM_MEMBER( wxFONTENCODING_UTF7 )
-    wxENUM_MEMBER( wxFONTENCODING_UTF8 )
-    wxENUM_MEMBER( wxFONTENCODING_GB2312 )
-    wxENUM_MEMBER( wxFONTENCODING_BIG5 )
-    wxENUM_MEMBER( wxFONTENCODING_SHIFT_JIS )
-    wxENUM_MEMBER( wxFONTENCODING_EUC_JP )
-    wxENUM_MEMBER( wxFONTENCODING_UNICODE )
+wxENUM_MEMBER( wxFONTENCODING_SYSTEM )
+wxENUM_MEMBER( wxFONTENCODING_DEFAULT )
+
+wxENUM_MEMBER( wxFONTENCODING_ISO8859_1 )
+wxENUM_MEMBER( wxFONTENCODING_ISO8859_2 )
+wxENUM_MEMBER( wxFONTENCODING_ISO8859_3 )
+wxENUM_MEMBER( wxFONTENCODING_ISO8859_4 )
+wxENUM_MEMBER( wxFONTENCODING_ISO8859_5 )
+wxENUM_MEMBER( wxFONTENCODING_ISO8859_6 )
+wxENUM_MEMBER( wxFONTENCODING_ISO8859_7 )
+wxENUM_MEMBER( wxFONTENCODING_ISO8859_8 )
+wxENUM_MEMBER( wxFONTENCODING_ISO8859_9 )
+wxENUM_MEMBER( wxFONTENCODING_ISO8859_10 )
+wxENUM_MEMBER( wxFONTENCODING_ISO8859_11 )
+wxENUM_MEMBER( wxFONTENCODING_ISO8859_12 )
+wxENUM_MEMBER( wxFONTENCODING_ISO8859_13 )
+wxENUM_MEMBER( wxFONTENCODING_ISO8859_14 )
+wxENUM_MEMBER( wxFONTENCODING_ISO8859_15 )
+wxENUM_MEMBER( wxFONTENCODING_ISO8859_MAX )
+wxENUM_MEMBER( wxFONTENCODING_KOI8 )
+wxENUM_MEMBER( wxFONTENCODING_KOI8_U )
+wxENUM_MEMBER( wxFONTENCODING_ALTERNATIVE )
+wxENUM_MEMBER( wxFONTENCODING_BULGARIAN )
+wxENUM_MEMBER( wxFONTENCODING_CP437 )
+wxENUM_MEMBER( wxFONTENCODING_CP850 )
+wxENUM_MEMBER( wxFONTENCODING_CP852 )
+wxENUM_MEMBER( wxFONTENCODING_CP855 )
+wxENUM_MEMBER( wxFONTENCODING_CP866 )
+
+wxENUM_MEMBER( wxFONTENCODING_CP874 )
+wxENUM_MEMBER( wxFONTENCODING_CP932 )
+wxENUM_MEMBER( wxFONTENCODING_CP936 )
+wxENUM_MEMBER( wxFONTENCODING_CP949 )
+wxENUM_MEMBER( wxFONTENCODING_CP950 )
+wxENUM_MEMBER( wxFONTENCODING_CP1250 )
+wxENUM_MEMBER( wxFONTENCODING_CP1251 )
+wxENUM_MEMBER( wxFONTENCODING_CP1252 )
+wxENUM_MEMBER( wxFONTENCODING_CP1253 )
+wxENUM_MEMBER( wxFONTENCODING_CP1254 )
+wxENUM_MEMBER( wxFONTENCODING_CP1255 )
+wxENUM_MEMBER( wxFONTENCODING_CP1256 )
+wxENUM_MEMBER( wxFONTENCODING_CP1257 )
+wxENUM_MEMBER( wxFONTENCODING_CP12_MAX )
+wxENUM_MEMBER( wxFONTENCODING_UTF7 )
+wxENUM_MEMBER( wxFONTENCODING_UTF8 )
+wxENUM_MEMBER( wxFONTENCODING_GB2312 )
+wxENUM_MEMBER( wxFONTENCODING_BIG5 )
+wxENUM_MEMBER( wxFONTENCODING_SHIFT_JIS )
+wxENUM_MEMBER( wxFONTENCODING_EUC_JP )
+wxENUM_MEMBER( wxFONTENCODING_UNICODE )
 wxEND_ENUM( wxFontEncoding )
-#endif
 
 // ----------------------------------------------------------------------------
 // constants
index e888407f92000cefd925cc1efc788ef339dce82a..8f3d81c6e4f2710ab7058f1722745d723cad00a4 100644 (file)
@@ -52,6 +52,79 @@ END_EVENT_TABLE()
 // implementation
 // ============================================================================
 
+// ----------------------------------------------------------------------------
+// XTI
+// ----------------------------------------------------------------------------
+
+wxDEFINE_FLAGS( wxFrameStyle )
+wxBEGIN_FLAGS( wxFrameStyle )
+// new style border flags, we put them first to
+// use them for streaming out
+wxFLAGS_MEMBER(wxBORDER_SIMPLE)
+wxFLAGS_MEMBER(wxBORDER_SUNKEN)
+wxFLAGS_MEMBER(wxBORDER_DOUBLE)
+wxFLAGS_MEMBER(wxBORDER_RAISED)
+wxFLAGS_MEMBER(wxBORDER_STATIC)
+wxFLAGS_MEMBER(wxBORDER_NONE)
+
+// old style border flags
+wxFLAGS_MEMBER(wxSIMPLE_BORDER)
+wxFLAGS_MEMBER(wxSUNKEN_BORDER)
+wxFLAGS_MEMBER(wxDOUBLE_BORDER)
+wxFLAGS_MEMBER(wxRAISED_BORDER)
+wxFLAGS_MEMBER(wxSTATIC_BORDER)
+wxFLAGS_MEMBER(wxBORDER)
+
+// standard window styles
+wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
+wxFLAGS_MEMBER(wxCLIP_CHILDREN)
+wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
+wxFLAGS_MEMBER(wxWANTS_CHARS)
+wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
+wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
+wxFLAGS_MEMBER(wxVSCROLL)
+wxFLAGS_MEMBER(wxHSCROLL)
+
+// frame styles
+wxFLAGS_MEMBER(wxSTAY_ON_TOP)
+wxFLAGS_MEMBER(wxCAPTION)
+#if WXWIN_COMPATIBILITY_2_6
+wxFLAGS_MEMBER(wxTHICK_FRAME)
+#endif // WXWIN_COMPATIBILITY_2_6
+wxFLAGS_MEMBER(wxSYSTEM_MENU)
+wxFLAGS_MEMBER(wxRESIZE_BORDER)
+#if WXWIN_COMPATIBILITY_2_6
+wxFLAGS_MEMBER(wxRESIZE_BOX)
+#endif // WXWIN_COMPATIBILITY_2_6
+wxFLAGS_MEMBER(wxCLOSE_BOX)
+wxFLAGS_MEMBER(wxMAXIMIZE_BOX)
+wxFLAGS_MEMBER(wxMINIMIZE_BOX)
+
+wxFLAGS_MEMBER(wxFRAME_TOOL_WINDOW)
+wxFLAGS_MEMBER(wxFRAME_FLOAT_ON_PARENT)
+
+wxFLAGS_MEMBER(wxFRAME_SHAPED)
+wxEND_FLAGS( wxFrameStyle )
+
+wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxFrame, wxTopLevelWindow, "wx/frame.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxFrame)
+wxEVENT_PROPERTY( Menu, wxEVT_COMMAND_MENU_SELECTED, wxCommandEvent)
+
+wxPROPERTY( Title,wxString, SetTitle, GetTitle, wxString(), 0 /*flags*/, \
+           wxT("Helpstring"), wxT("group"))
+wxPROPERTY_FLAGS( WindowStyle, wxFrameStyle, long, SetWindowStyleFlag, \
+                 GetWindowStyleFlag, wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, \
+                 wxT("Helpstring"), wxT("group")) // style
+wxPROPERTY( MenuBar, wxMenuBar *, SetMenuBar, GetMenuBar, wxEMPTY_PARAMETER_VALUE, \
+           0 /*flags*/, wxT("Helpstring"), wxT("group"))
+wxEND_PROPERTIES_TABLE()
+
+wxEMPTY_HANDLERS_TABLE(wxFrame)
+
+wxCONSTRUCTOR_6( wxFrame, wxWindow*, Parent, wxWindowID, Id, wxString, Title, \
+                wxPoint, Position, wxSize, Size, long, WindowStyle)
+
 // ----------------------------------------------------------------------------
 // construction/destruction
 // ----------------------------------------------------------------------------
index b8711937e47cf02109641973660a0ef470ba5701..52b5e49c1394d9049145b1feee5a22efd272393e 100644 (file)
@@ -42,6 +42,69 @@ wxGaugeBase::~wxGaugeBase()
     // this destructor is required for Darwin
 }
 
+// ----------------------------------------------------------------------------
+// XTI
+// ----------------------------------------------------------------------------
+
+wxDEFINE_FLAGS( wxGaugeStyle )
+wxBEGIN_FLAGS( wxGaugeStyle )
+// new style border flags, we put them first to
+// use them for streaming out
+wxFLAGS_MEMBER(wxBORDER_SIMPLE)
+wxFLAGS_MEMBER(wxBORDER_SUNKEN)
+wxFLAGS_MEMBER(wxBORDER_DOUBLE)
+wxFLAGS_MEMBER(wxBORDER_RAISED)
+wxFLAGS_MEMBER(wxBORDER_STATIC)
+wxFLAGS_MEMBER(wxBORDER_NONE)
+
+// old style border flags
+wxFLAGS_MEMBER(wxSIMPLE_BORDER)
+wxFLAGS_MEMBER(wxSUNKEN_BORDER)
+wxFLAGS_MEMBER(wxDOUBLE_BORDER)
+wxFLAGS_MEMBER(wxRAISED_BORDER)
+wxFLAGS_MEMBER(wxSTATIC_BORDER)
+wxFLAGS_MEMBER(wxBORDER)
+
+// standard window styles
+wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
+wxFLAGS_MEMBER(wxCLIP_CHILDREN)
+wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
+wxFLAGS_MEMBER(wxWANTS_CHARS)
+wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
+wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
+wxFLAGS_MEMBER(wxVSCROLL)
+wxFLAGS_MEMBER(wxHSCROLL)
+
+wxFLAGS_MEMBER(wxGA_HORIZONTAL)
+wxFLAGS_MEMBER(wxGA_VERTICAL)
+#if WXWIN_COMPATIBILITY_2_6
+wxFLAGS_MEMBER(wxGA_PROGRESSBAR)
+#endif // WXWIN_COMPATIBILITY_2_6
+wxFLAGS_MEMBER(wxGA_SMOOTH)
+wxEND_FLAGS( wxGaugeStyle )
+
+wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxGauge, wxControl, "wx/gauge.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxGauge)
+wxPROPERTY( Value, int, SetValue, GetValue, 0, 0 /*flags*/, \
+           wxT("Helpstring"), wxT("group"))
+wxPROPERTY( Range, int, SetRange, GetRange, 0, 0 /*flags*/, \
+           wxT("Helpstring"), wxT("group"))
+wxPROPERTY( ShadowWidth, int, SetShadowWidth, GetShadowWidth, \
+           0, 0 /*flags*/, wxT("Helpstring"), wxT("group"))
+wxPROPERTY( BezelFace, int, SetBezelFace, GetBezelFace, \
+           0, 0 /*flags*/, wxT("Helpstring"), wxT("group"))
+
+wxPROPERTY_FLAGS( WindowStyle, wxGaugeStyle, long, SetWindowStyleFlag, \
+                 GetWindowStyleFlag, wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, \
+                 wxT("Helpstring"), wxT("group")) // style
+wxEND_PROPERTIES_TABLE()
+
+wxEMPTY_HANDLERS_TABLE(wxGauge)
+
+wxCONSTRUCTOR_6( wxGauge, wxWindow*, Parent, wxWindowID, Id, int, Range, \
+                wxPoint, Position, wxSize, Size, long, WindowStyle )
+
 // ----------------------------------------------------------------------------
 // wxGauge creation
 // ----------------------------------------------------------------------------
index 5d7abb469f11e32bd9025f214c63b95addf6be0e..7e8b2be8e4d689d2e6411e44780997e8326ec9be 100644 (file)
@@ -44,6 +44,78 @@ wxListBoxBase::~wxListBoxBase()
     // this destructor is required for Darwin
 }
 
+// ----------------------------------------------------------------------------
+// XTI
+// ----------------------------------------------------------------------------
+
+wxDEFINE_FLAGS( wxListBoxStyle )
+wxBEGIN_FLAGS( wxListBoxStyle )
+// new style border flags, we put them first to
+// use them for streaming out
+wxFLAGS_MEMBER(wxBORDER_SIMPLE)
+wxFLAGS_MEMBER(wxBORDER_SUNKEN)
+wxFLAGS_MEMBER(wxBORDER_DOUBLE)
+wxFLAGS_MEMBER(wxBORDER_RAISED)
+wxFLAGS_MEMBER(wxBORDER_STATIC)
+wxFLAGS_MEMBER(wxBORDER_NONE)
+
+// old style border flags
+wxFLAGS_MEMBER(wxSIMPLE_BORDER)
+wxFLAGS_MEMBER(wxSUNKEN_BORDER)
+wxFLAGS_MEMBER(wxDOUBLE_BORDER)
+wxFLAGS_MEMBER(wxRAISED_BORDER)
+wxFLAGS_MEMBER(wxSTATIC_BORDER)
+wxFLAGS_MEMBER(wxBORDER)
+
+// standard window styles
+wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
+wxFLAGS_MEMBER(wxCLIP_CHILDREN)
+wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
+wxFLAGS_MEMBER(wxWANTS_CHARS)
+wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
+wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
+wxFLAGS_MEMBER(wxVSCROLL)
+wxFLAGS_MEMBER(wxHSCROLL)
+
+wxFLAGS_MEMBER(wxLB_SINGLE)
+wxFLAGS_MEMBER(wxLB_MULTIPLE)
+wxFLAGS_MEMBER(wxLB_EXTENDED)
+wxFLAGS_MEMBER(wxLB_HSCROLL)
+wxFLAGS_MEMBER(wxLB_ALWAYS_SB)
+wxFLAGS_MEMBER(wxLB_NEEDED_SB)
+wxFLAGS_MEMBER(wxLB_SORT)
+wxEND_FLAGS( wxListBoxStyle )
+
+wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxListBox, wxControlWithItems, "wx/listbox.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxListBox)
+wxEVENT_PROPERTY( Select, wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEvent )
+wxEVENT_PROPERTY( DoubleClick, wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEvent )
+
+wxPROPERTY( Font, wxFont, SetFont, GetFont , wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, \
+           wxT("Helpstring"), wxT("group"))
+wxPROPERTY_COLLECTION( Choices, wxArrayString, wxString, AppendString, \
+                      GetStrings, 0 /*flags*/, wxT("Helpstring"), wxT("group") )
+wxPROPERTY( Selection, int, SetSelection, GetSelection, wxEMPTY_PARAMETER_VALUE, \
+           0 /*flags*/, wxT("Helpstring"), wxT("group") )
+
+wxPROPERTY_FLAGS( WindowStyle, wxListBoxStyle, long, SetWindowStyleFlag, \
+                 GetWindowStyleFlag, wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, \
+                 wxT("Helpstring"), wxT("group")) // style
+wxEND_PROPERTIES_TABLE()
+
+wxEMPTY_HANDLERS_TABLE(wxListBox)
+
+wxCONSTRUCTOR_4( wxListBox, wxWindow*, Parent, wxWindowID, Id, \
+                wxPoint, Position, wxSize, Size )
+
+/*
+ TODO PROPERTIES
+ selection
+ content
+ item
+ */
+
 // ----------------------------------------------------------------------------
 // selection
 // ----------------------------------------------------------------------------
index 2fc20b78710ec805417b3c13dc70eb66cd8e9bb2..e2b18e9602ea2278937df9ab21c41b42e124e9ea 100644 (file)
@@ -51,4 +51,81 @@ wxDEFINE_EVENT( wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEvent );
 wxDEFINE_EVENT( wxEVT_COMMAND_LIST_ITEM_FOCUSED, wxListEvent );
 wxDEFINE_EVENT( wxEVT_COMMAND_LIST_CACHE_HINT, wxListEvent );
 
+// -----------------------------------------------------------------------------
+// XTI
+// -----------------------------------------------------------------------------
+
+wxDEFINE_FLAGS( wxListCtrlStyle )
+wxBEGIN_FLAGS( wxListCtrlStyle )
+// new style border flags, we put them first to
+// use them for streaming out
+wxFLAGS_MEMBER(wxBORDER_SIMPLE)
+wxFLAGS_MEMBER(wxBORDER_SUNKEN)
+wxFLAGS_MEMBER(wxBORDER_DOUBLE)
+wxFLAGS_MEMBER(wxBORDER_RAISED)
+wxFLAGS_MEMBER(wxBORDER_STATIC)
+wxFLAGS_MEMBER(wxBORDER_NONE)
+
+// old style border flags
+wxFLAGS_MEMBER(wxSIMPLE_BORDER)
+wxFLAGS_MEMBER(wxSUNKEN_BORDER)
+wxFLAGS_MEMBER(wxDOUBLE_BORDER)
+wxFLAGS_MEMBER(wxRAISED_BORDER)
+wxFLAGS_MEMBER(wxSTATIC_BORDER)
+wxFLAGS_MEMBER(wxBORDER)
+
+// standard window styles
+wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
+wxFLAGS_MEMBER(wxCLIP_CHILDREN)
+wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
+wxFLAGS_MEMBER(wxWANTS_CHARS)
+wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
+wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
+wxFLAGS_MEMBER(wxVSCROLL)
+wxFLAGS_MEMBER(wxHSCROLL)
+
+wxFLAGS_MEMBER(wxLC_LIST)
+wxFLAGS_MEMBER(wxLC_REPORT)
+wxFLAGS_MEMBER(wxLC_ICON)
+wxFLAGS_MEMBER(wxLC_SMALL_ICON)
+wxFLAGS_MEMBER(wxLC_ALIGN_TOP)
+wxFLAGS_MEMBER(wxLC_ALIGN_LEFT)
+wxFLAGS_MEMBER(wxLC_AUTOARRANGE)
+wxFLAGS_MEMBER(wxLC_USER_TEXT)
+wxFLAGS_MEMBER(wxLC_EDIT_LABELS)
+wxFLAGS_MEMBER(wxLC_NO_HEADER)
+wxFLAGS_MEMBER(wxLC_SINGLE_SEL)
+wxFLAGS_MEMBER(wxLC_SORT_ASCENDING)
+wxFLAGS_MEMBER(wxLC_SORT_DESCENDING)
+wxFLAGS_MEMBER(wxLC_VIRTUAL)
+wxEND_FLAGS( wxListCtrlStyle )
+
+#if ((!defined(__WXMSW__) && !(defined(__WXMAC__) && wxOSX_USE_CARBON)) || defined(__WXUNIVERSAL__))
+wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxListCtrl, wxGenericListCtrl, "wx/listctrl.h")
+#else
+wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxListCtrl, wxControl, "wx/listctrl.h")
+#endif
+
+wxBEGIN_PROPERTIES_TABLE(wxListCtrl)
+wxEVENT_PROPERTY( TextUpdated, wxEVT_COMMAND_TEXT_UPDATED, wxCommandEvent )
+
+wxPROPERTY_FLAGS( WindowStyle, wxListCtrlStyle, long, SetWindowStyleFlag, \
+                 GetWindowStyleFlag, wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, \
+                 wxT("Helpstring"), wxT("group")) // style
+wxEND_PROPERTIES_TABLE()
+
+wxEMPTY_HANDLERS_TABLE(wxListCtrl)
+
+wxCONSTRUCTOR_5( wxListCtrl, wxWindow*, Parent, wxWindowID, Id, \
+                wxPoint, Position, wxSize, Size, long, WindowStyle )
+
+/*
+ TODO : Expose more information of a list's layout etc. via appropriate objects 
+ (see NotebookPageInfo)
+ */
+
+IMPLEMENT_DYNAMIC_CLASS(wxListView, wxListCtrl)
+IMPLEMENT_DYNAMIC_CLASS(wxListItem, wxObject)
+IMPLEMENT_DYNAMIC_CLASS(wxListEvent, wxNotifyEvent)
+
 #endif // wxUSE_LISTCTRL
index 4c7abae78dbeedb04f4e4ad023d705f2a0dc13f0..c556c59c2d2f46d1e7c3ddb25abdee4544e6f863 100644 (file)
@@ -48,6 +48,161 @@ WX_DEFINE_LIST(wxMenuItemList)
 // implementation
 // ============================================================================
 
+// ----------------------------------------------------------------------------
+// XTI for wxMenu(Bar)
+// ----------------------------------------------------------------------------
+
+#if wxUSE_EXTENDED_RTTI
+
+WX_DEFINE_LIST( wxMenuInfoList )
+
+wxDEFINE_FLAGS( wxMenuStyle )
+wxBEGIN_FLAGS( wxMenuStyle )
+wxFLAGS_MEMBER(wxMENU_TEAROFF)
+wxEND_FLAGS( wxMenuStyle )
+
+wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxMenu, wxEvtHandler, "wx/menu.h")
+wxCOLLECTION_TYPE_INFO( wxMenuItem *, wxMenuItemList ) ;
+
+template<> void wxCollectionToVariantArray( wxMenuItemList const &theList,
+                                           wxVariantBaseArray &value)
+{
+    wxListCollectionToVariantArray<wxMenuItemList::compatibility_iterator>( theList, value ) ;
+}
+
+wxBEGIN_PROPERTIES_TABLE(wxMenu)
+wxEVENT_PROPERTY( Select, wxEVT_COMMAND_MENU_SELECTED, wxCommandEvent)
+
+wxPROPERTY( Title, wxString, SetTitle, GetTitle, wxString(), \
+           0 /*flags*/, wxT("Helpstring"), wxT("group") )
+
+wxREADONLY_PROPERTY_FLAGS( MenuStyle, wxMenuStyle, long, GetStyle, \
+                          wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, wxT("Helpstring"), \
+                          wxT("group")) // style
+
+wxPROPERTY_COLLECTION( MenuItems, wxMenuItemList, wxMenuItem*, Append, \
+                      GetMenuItems, 0 /*flags*/, wxT("Helpstring"), wxT("group"))
+wxEND_PROPERTIES_TABLE()
+
+wxEMPTY_HANDLERS_TABLE(wxMenu)
+
+wxDIRECT_CONSTRUCTOR_2( wxMenu, wxString, Title, long, MenuStyle  )
+
+wxDEFINE_FLAGS( wxMenuBarStyle )
+
+wxBEGIN_FLAGS( wxMenuBarStyle )
+wxFLAGS_MEMBER(wxMB_DOCKABLE)
+wxEND_FLAGS( wxMenuBarStyle )
+
+// the negative id would lead the window (its superclass !) to
+// vetoe streaming out otherwise
+bool wxMenuBarStreamingCallback( const wxObject *WXUNUSED(object), wxObjectWriter *,
+                                wxObjectReaderCallback *, wxVariantBaseArray & )
+{
+    return true;
+}
+
+wxIMPLEMENT_DYNAMIC_CLASS_XTI_CALLBACK(wxMenuBar, wxWindow, "wx/menu.h", \
+                                       wxMenuBarStreamingCallback)
+
+wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxMenuInfo, wxObject, "wx/menu.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxMenuInfo)
+wxREADONLY_PROPERTY( Menu, wxMenu*, GetMenu, wxEMPTY_PARAMETER_VALUE, \
+                    0 /*flags*/, wxT("Helpstring"), wxT("group"))
+
+wxREADONLY_PROPERTY( Title, wxString, GetTitle, wxString(), \
+                    0 /*flags*/, wxT("Helpstring"), wxT("group"))
+wxEND_PROPERTIES_TABLE()
+
+wxEMPTY_HANDLERS_TABLE(wxMenuInfo)
+
+wxCONSTRUCTOR_2( wxMenuInfo, wxMenu*, Menu, wxString, Title )
+
+wxCOLLECTION_TYPE_INFO( wxMenuInfo *, wxMenuInfoList ) ;
+
+template<> void wxCollectionToVariantArray( wxMenuInfoList const &theList, 
+                                           wxVariantBaseArray &value)
+{
+    wxListCollectionToVariantArray<wxMenuInfoList::compatibility_iterator>( theList, value ) ;
+}
+
+wxBEGIN_PROPERTIES_TABLE(wxMenuBar)
+wxPROPERTY_COLLECTION( MenuInfos, wxMenuInfoList, wxMenuInfo*, AppendMenuInfo, \
+                      GetMenuInfos, 0 /*flags*/, wxT("Helpstring"), wxT("group"))
+wxEND_PROPERTIES_TABLE()
+
+wxEMPTY_HANDLERS_TABLE(wxMenuBar)
+
+wxCONSTRUCTOR_DUMMY( wxMenuBar )
+
+#else
+// IMPLEMENT_DYNAMIC_CLASS(wxMenu, wxEvtHandler)
+// IMPLEMENT_DYNAMIC_CLASS(wxMenuBar, wxWindow)
+// IMPLEMENT_DYNAMIC_CLASS(wxMenuInfo, wxObject)
+#endif
+
+
+// ----------------------------------------------------------------------------
+// XTI for wxMenuItem
+// ----------------------------------------------------------------------------
+
+#if wxUSE_EXTENDED_RTTI
+
+bool wxMenuItemStreamingCallback( const wxObject *object, wxObjectWriter *,
+                                 wxObjectReaderCallback *, wxVariantBaseArray & )
+{
+    const wxMenuItem * mitem = wx_dynamic_cast(const wxMenuItem*, object);
+    if ( mitem->GetMenu() && !mitem->GetMenu()->GetTitle().empty() )
+    {
+        // we don't stream out the first two items for menus with a title,
+        // they will be reconstructed
+        if ( mitem->GetMenu()->FindItemByPosition(0) == mitem ||
+            mitem->GetMenu()->FindItemByPosition(1) == mitem )
+            return false;
+    }
+    return true;
+}
+
+wxBEGIN_ENUM( wxItemKind )
+wxENUM_MEMBER( wxITEM_SEPARATOR )
+wxENUM_MEMBER( wxITEM_NORMAL )
+wxENUM_MEMBER( wxITEM_CHECK )
+wxENUM_MEMBER( wxITEM_RADIO )
+wxEND_ENUM( wxItemKind )
+
+wxIMPLEMENT_DYNAMIC_CLASS_XTI_CALLBACK(wxMenuItem, wxObject, "wx/menuitem.h", \
+                                       wxMenuItemStreamingCallback)
+
+wxBEGIN_PROPERTIES_TABLE(wxMenuItem)
+wxPROPERTY( Parent, wxMenu*, SetMenu, GetMenu, wxEMPTY_PARAMETER_VALUE, \
+           0 /*flags*/, wxT("Helpstring"), wxT("group") )
+wxPROPERTY( Id, int, SetId, GetId, wxEMPTY_PARAMETER_VALUE, \
+           0 /*flags*/, wxT("Helpstring"), wxT("group") )
+wxPROPERTY( Text, wxString, SetText, GetText, wxString(), \
+           0 /*flags*/, wxT("Helpstring"), wxT("group") )
+wxPROPERTY( Help, wxString, SetHelp, GetHelp, wxString(), \
+           0 /*flags*/, wxT("Helpstring"), wxT("group") )
+wxREADONLY_PROPERTY( Kind, wxItemKind, GetKind, wxEMPTY_PARAMETER_VALUE, \
+                    0 /*flags*/, wxT("Helpstring"), wxT("group") )
+wxPROPERTY( SubMenu, wxMenu*, SetSubMenu, GetSubMenu, wxEMPTY_PARAMETER_VALUE, \
+           0 /*flags*/, wxT("Helpstring"), wxT("group") )
+wxPROPERTY( Enabled, bool, Enable, IsEnabled, wxVariantBase((bool)true), \
+           0 /*flags*/, wxT("Helpstring"), wxT("group") )
+wxPROPERTY( Checked, bool, Check, IsChecked, wxVariantBase((bool)false), \
+           0 /*flags*/, wxT("Helpstring"), wxT("group") )
+wxPROPERTY( Checkable, bool, SetCheckable, IsCheckable, wxVariantBase((bool)false), \
+           0 /*flags*/, wxT("Helpstring"), wxT("group") )
+wxEND_PROPERTIES_TABLE()
+
+wxEMPTY_HANDLERS_TABLE(wxMenuItem)
+
+wxDIRECT_CONSTRUCTOR_6( wxMenuItem, wxMenu*, Parent, int, Id, wxString, \
+                       Text, wxString, Help, wxItemKind, Kind, wxMenu*, SubMenu )
+#else
+//IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject)
+#endif
+
 // ----------------------------------------------------------------------------
 // wxMenuItemBase
 // ----------------------------------------------------------------------------
index e12ba34a90e6ef3113754e2875741975e0478588..6842afdb5b06279ff580c1197ef52b1f875e90b1 100644 (file)
 wxDEFINE_EVENT( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, wxBookCtrlEvent );
 wxDEFINE_EVENT( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, wxBookCtrlEvent );
 
+#if wxUSE_EXTENDED_RTTI    
+
+// ----------------------------------------------------------------------------
+// XTI
+// ----------------------------------------------------------------------------
+
+#include "wx/listimpl.cpp"
+WX_DEFINE_LIST( wxNotebookPageInfoList )
+
+wxDEFINE_FLAGS( wxNotebookStyle )
+wxBEGIN_FLAGS( wxNotebookStyle )
+// new style border flags, we put them first to
+// use them for streaming out
+wxFLAGS_MEMBER(wxBORDER_SIMPLE)
+wxFLAGS_MEMBER(wxBORDER_SUNKEN)
+wxFLAGS_MEMBER(wxBORDER_DOUBLE)
+wxFLAGS_MEMBER(wxBORDER_RAISED)
+wxFLAGS_MEMBER(wxBORDER_STATIC)
+wxFLAGS_MEMBER(wxBORDER_NONE)
+
+// old style border flags
+wxFLAGS_MEMBER(wxSIMPLE_BORDER)
+wxFLAGS_MEMBER(wxSUNKEN_BORDER)
+wxFLAGS_MEMBER(wxDOUBLE_BORDER)
+wxFLAGS_MEMBER(wxRAISED_BORDER)
+wxFLAGS_MEMBER(wxSTATIC_BORDER)
+wxFLAGS_MEMBER(wxBORDER)
+
+// standard window styles
+wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
+wxFLAGS_MEMBER(wxCLIP_CHILDREN)
+wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
+wxFLAGS_MEMBER(wxWANTS_CHARS)
+wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
+wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
+wxFLAGS_MEMBER(wxVSCROLL)
+wxFLAGS_MEMBER(wxHSCROLL)
+
+wxFLAGS_MEMBER(wxNB_FIXEDWIDTH)
+wxFLAGS_MEMBER(wxBK_DEFAULT)
+wxFLAGS_MEMBER(wxBK_TOP)
+wxFLAGS_MEMBER(wxBK_LEFT)
+wxFLAGS_MEMBER(wxBK_RIGHT)
+wxFLAGS_MEMBER(wxBK_BOTTOM)
+wxFLAGS_MEMBER(wxNB_NOPAGETHEME)
+wxFLAGS_MEMBER(wxNB_FLAT)
+wxEND_FLAGS( wxNotebookStyle )
+
+wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxNotebook, wxControl, "wx/notebook.h")
+wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxNotebookPageInfo, wxObject, "wx/notebook.h" )
+
+wxCOLLECTION_TYPE_INFO( wxNotebookPageInfo *, wxNotebookPageInfoList );
+
+#if wxUSE_EXTENDED_RTTI
+template<> void wxCollectionToVariantArray( wxNotebookPageInfoList const &theList,
+                                           wxVariantBaseArray &value)
+{
+    wxListCollectionToVariantArray<wxNotebookPageInfoList::compatibility_iterator>( theList, value );
+}
+#endif
+
+wxBEGIN_PROPERTIES_TABLE(wxNotebook)
+wxEVENT_PROPERTY( PageChanging, wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, wxNotebookEvent )
+wxEVENT_PROPERTY( PageChanged, wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, wxNotebookEvent )
+
+wxPROPERTY_COLLECTION( PageInfos, wxNotebookPageInfoList, wxNotebookPageInfo*, \
+                      AddPageInfo, GetPageInfos, 0 /*flags*/, wxT("Helpstring"), \
+                      wxT("group"))
+wxPROPERTY_FLAGS( WindowStyle, wxNotebookStyle, long, SetWindowStyleFlag, \
+                 GetWindowStyleFlag, wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, \
+                 wxT("Helpstring"), wxT("group")) // style
+wxEND_PROPERTIES_TABLE()
+
+wxEMPTY_HANDLERS_TABLE(wxNotebook)
+
+wxCONSTRUCTOR_5( wxNotebook, wxWindow*, Parent, wxWindowID, Id, \
+                wxPoint, Position, wxSize, Size, long, WindowStyle)
+
+wxBEGIN_PROPERTIES_TABLE(wxNotebookPageInfo)
+wxREADONLY_PROPERTY( Page, wxNotebookPage*, GetPage, wxEMPTY_PARAMETER_VALUE, \
+                    0 /*flags*/, wxT("Helpstring"), wxT("group"))
+wxREADONLY_PROPERTY( Text, wxString, GetText, wxString(), 0 /*flags*/, \
+                    wxT("Helpstring"), wxT("group"))
+wxREADONLY_PROPERTY( Selected, bool, GetSelected, false, 0 /*flags*/, \
+                    wxT("Helpstring"), wxT("group") )
+wxREADONLY_PROPERTY( ImageId, int, GetImageId, -1, 0 /*flags*/, \
+                    wxT("Helpstring"), wxT("group"))
+wxEND_PROPERTIES_TABLE()
+
+wxEMPTY_HANDLERS_TABLE(wxNotebookPageInfo)
+
+wxCONSTRUCTOR_4( wxNotebookPageInfo, wxNotebookPage*, Page, \
+                wxString, Text, bool, Selected, int, ImageId )
+
+// XTI accessors:
+
+void wxNotebookBase::AddPageInfo( wxNotebookPageInfo* info )
+{
+    AddPage( info->GetPage(), info->GetText(), info->GetSelected(), info->GetImageId() ); 
+}
+
+const wxNotebookPageInfoList& wxNotebookBase::GetPageInfos() const
+{
+    wxNotebookPageInfoList* list = const_cast< wxNotebookPageInfoList* >( &m_pageInfos );
+    WX_CLEAR_LIST( wxNotebookPageInfoList, *list );
+    for( size_t i = 0; i < GetPageCount(); ++i )
+    {
+        wxNotebookPageInfo *info = new wxNotebookPageInfo();
+        info->Create( const_cast<wxNotebookBase*>(this)->GetPage(i), GetPageText(i),
+                     GetSelection() == int(i), GetPageImage(i) );
+        list->Append( info );
+    }
+    return m_pageInfos;
+}
+
+#endif
+
 // ----------------------------------------------------------------------------
 // geometry
 // ----------------------------------------------------------------------------
index 9993161620eb5e1a06840d586f9c4906a0d7824d..b9f2653b031f96ecd5e8087b836ffb688ec8325f 100644 (file)
 // implementation
 // ============================================================================
 
+// ----------------------------------------------------------------------------
+// XTI
+// ----------------------------------------------------------------------------
+
+// TODO: wxCONSTRUCTOR
+#if 0 // wxUSE_EXTENDED_RTTI
+wxDEFINE_FLAGS( wxRadioBoxStyle )
+
+wxBEGIN_FLAGS( wxRadioBoxStyle )
+// new style border flags, we put them first to
+// use them for streaming out
+wxFLAGS_MEMBER(wxBORDER_SIMPLE)
+wxFLAGS_MEMBER(wxBORDER_SUNKEN)
+wxFLAGS_MEMBER(wxBORDER_DOUBLE)
+wxFLAGS_MEMBER(wxBORDER_RAISED)
+wxFLAGS_MEMBER(wxBORDER_STATIC)
+wxFLAGS_MEMBER(wxBORDER_NONE)
+
+// old style border flags
+wxFLAGS_MEMBER(wxSIMPLE_BORDER)
+wxFLAGS_MEMBER(wxSUNKEN_BORDER)
+wxFLAGS_MEMBER(wxDOUBLE_BORDER)
+wxFLAGS_MEMBER(wxRAISED_BORDER)
+wxFLAGS_MEMBER(wxSTATIC_BORDER)
+wxFLAGS_MEMBER(wxBORDER)
+
+// standard window styles
+wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
+wxFLAGS_MEMBER(wxCLIP_CHILDREN)
+wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
+wxFLAGS_MEMBER(wxWANTS_CHARS)
+wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
+wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
+wxFLAGS_MEMBER(wxVSCROLL)
+wxFLAGS_MEMBER(wxHSCROLL)
+
+wxFLAGS_MEMBER(wxRA_SPECIFY_COLS)
+wxFLAGS_MEMBER(wxRA_HORIZONTAL)
+wxFLAGS_MEMBER(wxRA_SPECIFY_ROWS)
+wxFLAGS_MEMBER(wxRA_VERTICAL)
+
+wxEND_FLAGS( wxRadioBoxStyle )
+
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxRadioBox, wxControl,"wx/radiobox.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxRadioBox)
+wxEVENT_PROPERTY( Select , wxEVT_COMMAND_RADIOBOX_SELECTED , wxCommandEvent )
+wxPROPERTY_FLAGS( WindowStyle , wxRadioBoxStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+wxEND_PROPERTIES_TABLE()
+
+/*
+ selection
+ content
+ label
+ dimension
+ item
+ */
+
+#endif
+
+
+// ----------------------------------------------------------------------------
+// wxRadioBoxBase
+// ----------------------------------------------------------------------------
+
 void wxRadioBoxBase::SetMajorDim(unsigned int majorDim, long style)
 {
     wxCHECK_RET( majorDim != 0, wxT("major radiobox dimension can't be 0") );
index 404f28a241625e7f62d7cbfafcbb6dc03545fc74..9129329b8d73754d9ce256cd4fa1154ba79cad3f 100644 (file)
 wxDEFINE_EVENT(wxEVT_COMMAND_SPINCTRL_UPDATED, wxSpinEvent);
 wxDEFINE_EVENT(wxEVT_COMMAND_SPINCTRLDOUBLE_UPDATED, wxSpinDoubleEvent);
 
+// ----------------------------------------------------------------------------
+// XTI
+// ----------------------------------------------------------------------------
+
+wxDEFINE_FLAGS( wxSpinCtrlStyle )
+wxBEGIN_FLAGS( wxSpinCtrlStyle )
+// new style border flags, we put them first to
+// use them for streaming out
+wxFLAGS_MEMBER(wxBORDER_SIMPLE)
+wxFLAGS_MEMBER(wxBORDER_SUNKEN)
+wxFLAGS_MEMBER(wxBORDER_DOUBLE)
+wxFLAGS_MEMBER(wxBORDER_RAISED)
+wxFLAGS_MEMBER(wxBORDER_STATIC)
+wxFLAGS_MEMBER(wxBORDER_NONE)
+
+// old style border flags
+wxFLAGS_MEMBER(wxSIMPLE_BORDER)
+wxFLAGS_MEMBER(wxSUNKEN_BORDER)
+wxFLAGS_MEMBER(wxDOUBLE_BORDER)
+wxFLAGS_MEMBER(wxRAISED_BORDER)
+wxFLAGS_MEMBER(wxSTATIC_BORDER)
+wxFLAGS_MEMBER(wxBORDER)
+
+// standard window styles
+wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
+wxFLAGS_MEMBER(wxCLIP_CHILDREN)
+wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
+wxFLAGS_MEMBER(wxWANTS_CHARS)
+wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
+wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
+wxFLAGS_MEMBER(wxVSCROLL)
+wxFLAGS_MEMBER(wxHSCROLL)
+
+wxFLAGS_MEMBER(wxSP_HORIZONTAL)
+wxFLAGS_MEMBER(wxSP_VERTICAL)
+wxFLAGS_MEMBER(wxSP_ARROW_KEYS)
+wxFLAGS_MEMBER(wxSP_WRAP)
+wxEND_FLAGS( wxSpinCtrlStyle )
+
+wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxSpinCtrl, wxControl, "wx/spinbut.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxSpinCtrl)
+wxEVENT_RANGE_PROPERTY( Spin, wxEVT_SCROLL_TOP, wxEVT_SCROLL_CHANGED, wxSpinEvent )
+
+wxEVENT_PROPERTY( Updated, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEvent )
+wxEVENT_PROPERTY( TextUpdated, wxEVT_COMMAND_TEXT_UPDATED, wxCommandEvent )
+wxEVENT_PROPERTY( TextEnter, wxEVT_COMMAND_TEXT_ENTER, wxCommandEvent )
+
+wxPROPERTY( ValueString, wxString, SetValue, GetValue, \
+           wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, wxT("Helpstring"), wxT("group")) ;
+wxPROPERTY( Value, int, SetValue, GetValue, 0, 0 /*flags*/, \
+           wxT("Helpstring"), wxT("group"))
+/*
+ wxPROPERTY( Min, int, SetMin, GetMin, 0, 0 /*flags, wxT("Helpstring"), wxT("group") )
+ wxPROPERTY( Max, int, SetMax, GetMax, 0, 0 /*flags, wxT("Helpstring"), wxT("group"))
+ */
+wxPROPERTY_FLAGS( WindowStyle, wxSpinCtrlStyle, long, SetWindowStyleFlag, \
+                 GetWindowStyleFlag, wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, \
+                 wxT("Helpstring"), wxT("group")) // style
+/*
+ TODO PROPERTIES
+ style wxSP_ARROW_KEYS
+ */
+wxEND_PROPERTIES_TABLE()
+
+wxEMPTY_HANDLERS_TABLE(wxSpinCtrl)
+
+wxCONSTRUCTOR_6( wxSpinCtrl, wxWindow*, Parent, wxWindowID, Id, \
+                wxString, ValueString, wxPoint, Position, \
+                wxSize, Size, long, WindowStyle )
+
+
 #endif // wxUSE_SPINCTRL
index a29445d7b1503c03ccfbcbe2e3f29fc497902047..9bea608b3d9cfd36238b96d4a59488a1ff2a41c1 100644 (file)
@@ -48,6 +48,61 @@ const wxChar *wxMarkupEntities[][wxMARKUP_ENTITY_MAX] =
 
 #if wxUSE_STATTEXT
 
+// ----------------------------------------------------------------------------
+// XTI
+// ----------------------------------------------------------------------------
+
+wxDEFINE_FLAGS( wxStaticTextStyle )
+wxBEGIN_FLAGS( wxStaticTextStyle )
+// new style border flags, we put them first to
+// use them for streaming out
+wxFLAGS_MEMBER(wxBORDER_SIMPLE)
+wxFLAGS_MEMBER(wxBORDER_SUNKEN)
+wxFLAGS_MEMBER(wxBORDER_DOUBLE)
+wxFLAGS_MEMBER(wxBORDER_RAISED)
+wxFLAGS_MEMBER(wxBORDER_STATIC)
+wxFLAGS_MEMBER(wxBORDER_NONE)
+
+// old style border flags
+wxFLAGS_MEMBER(wxSIMPLE_BORDER)
+wxFLAGS_MEMBER(wxSUNKEN_BORDER)
+wxFLAGS_MEMBER(wxDOUBLE_BORDER)
+wxFLAGS_MEMBER(wxRAISED_BORDER)
+wxFLAGS_MEMBER(wxSTATIC_BORDER)
+wxFLAGS_MEMBER(wxBORDER)
+
+// standard window styles
+wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
+wxFLAGS_MEMBER(wxCLIP_CHILDREN)
+wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
+wxFLAGS_MEMBER(wxWANTS_CHARS)
+wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
+wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
+wxFLAGS_MEMBER(wxVSCROLL)
+wxFLAGS_MEMBER(wxHSCROLL)
+
+wxFLAGS_MEMBER(wxST_NO_AUTORESIZE)
+wxFLAGS_MEMBER(wxALIGN_LEFT)
+wxFLAGS_MEMBER(wxALIGN_RIGHT)
+wxFLAGS_MEMBER(wxALIGN_CENTRE)
+wxEND_FLAGS( wxStaticTextStyle )
+
+wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxStaticText, wxControl, "wx/stattext.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxStaticText)
+wxPROPERTY( Label,wxString, SetLabel, GetLabel, wxString(), 0 /*flags*/, \
+           wxT("Helpstring"), wxT("group"))
+wxPROPERTY_FLAGS( WindowStyle, wxStaticTextStyle, long, SetWindowStyleFlag, \
+                 GetWindowStyleFlag, wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, \
+                 wxT("Helpstring"), wxT("group")) // style
+wxEND_PROPERTIES_TABLE()
+
+wxEMPTY_HANDLERS_TABLE(wxStaticText)
+
+wxCONSTRUCTOR_6( wxStaticText, wxWindow*, Parent, wxWindowID, Id, \
+                wxString, Label, wxPoint, Position, wxSize, Size, long, WindowStyle )
+
+
 // ----------------------------------------------------------------------------
 // wxTextWrapper
 // ----------------------------------------------------------------------------
index 473de1178f8e8f18e756bff5c0fa9bb91ed9261e..d7ed630390f5a8089354440bd041bbca78c4102d 100644 (file)
 // implementation
 // ============================================================================
 
+// ----------------------------------------------------------------------------
+// XTI
+// ----------------------------------------------------------------------------
+
+wxDEFINE_FLAGS( wxTextCtrlStyle )
+wxBEGIN_FLAGS( wxTextCtrlStyle )
+// new style border flags, we put them first to
+// use them for streaming out
+wxFLAGS_MEMBER(wxBORDER_SIMPLE)
+wxFLAGS_MEMBER(wxBORDER_SUNKEN)
+wxFLAGS_MEMBER(wxBORDER_DOUBLE)
+wxFLAGS_MEMBER(wxBORDER_RAISED)
+wxFLAGS_MEMBER(wxBORDER_STATIC)
+wxFLAGS_MEMBER(wxBORDER_NONE)
+
+// old style border flags
+wxFLAGS_MEMBER(wxSIMPLE_BORDER)
+wxFLAGS_MEMBER(wxSUNKEN_BORDER)
+wxFLAGS_MEMBER(wxDOUBLE_BORDER)
+wxFLAGS_MEMBER(wxRAISED_BORDER)
+wxFLAGS_MEMBER(wxSTATIC_BORDER)
+wxFLAGS_MEMBER(wxBORDER)
+
+// standard window styles
+wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
+wxFLAGS_MEMBER(wxCLIP_CHILDREN)
+wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
+wxFLAGS_MEMBER(wxWANTS_CHARS)
+wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
+wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
+wxFLAGS_MEMBER(wxVSCROLL)
+wxFLAGS_MEMBER(wxHSCROLL)
+
+wxFLAGS_MEMBER(wxTE_PROCESS_ENTER)
+wxFLAGS_MEMBER(wxTE_PROCESS_TAB)
+wxFLAGS_MEMBER(wxTE_MULTILINE)
+wxFLAGS_MEMBER(wxTE_PASSWORD)
+wxFLAGS_MEMBER(wxTE_READONLY)
+wxFLAGS_MEMBER(wxHSCROLL)
+wxFLAGS_MEMBER(wxTE_RICH)
+wxFLAGS_MEMBER(wxTE_RICH2)
+wxFLAGS_MEMBER(wxTE_AUTO_URL)
+wxFLAGS_MEMBER(wxTE_NOHIDESEL)
+wxFLAGS_MEMBER(wxTE_LEFT)
+wxFLAGS_MEMBER(wxTE_CENTRE)
+wxFLAGS_MEMBER(wxTE_RIGHT)
+wxFLAGS_MEMBER(wxTE_DONTWRAP)
+wxFLAGS_MEMBER(wxTE_CHARWRAP)
+wxFLAGS_MEMBER(wxTE_WORDWRAP)
+wxEND_FLAGS( wxTextCtrlStyle )
+
+wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxTextCtrl, wxControl, "wx/textctrl.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxTextCtrl)
+wxEVENT_PROPERTY( TextUpdated, wxEVT_COMMAND_TEXT_UPDATED, wxCommandEvent )
+wxEVENT_PROPERTY( TextEnter, wxEVT_COMMAND_TEXT_ENTER, wxCommandEvent )
+
+wxPROPERTY( Font, wxFont, SetFont, GetFont , wxEMPTY_PARAMETER_VALUE, \
+           0 /*flags*/, wxT("Helpstring"), wxT("group") )
+wxPROPERTY( Value, wxString, SetValue, GetValue, wxString(), \
+           0 /*flags*/, wxT("Helpstring"), wxT("group"))
+
+wxPROPERTY_FLAGS( WindowStyle, wxTextCtrlStyle, long, SetWindowStyleFlag, \
+                 GetWindowStyleFlag, wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, \
+                 wxT("Helpstring"), wxT("group")) // style
+wxEND_PROPERTIES_TABLE()
+
+wxEMPTY_HANDLERS_TABLE(wxTextCtrl)
+
+wxCONSTRUCTOR_6( wxTextCtrl, wxWindow*, Parent, wxWindowID, Id, \
+                wxString, Value, wxPoint, Position, wxSize, Size, \
+                long, WindowStyle)
+
+
 IMPLEMENT_DYNAMIC_CLASS(wxTextUrlEvent, wxCommandEvent)
 
 wxDEFINE_EVENT( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEvent );
index 8ae07d6a8f38425531eba5a70908cd257d126ec1..c8b990630793295f3b6653bc049e5e4a40005742 100644 (file)
@@ -55,6 +55,74 @@ wxDEFINE_EVENT( wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK, wxTreeEvent );
 wxDEFINE_EVENT( wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP, wxTreeEvent );
 wxDEFINE_EVENT( wxEVT_COMMAND_TREE_ITEM_MENU, wxTreeEvent );
 
+// ----------------------------------------------------------------------------
+// XTI
+// ----------------------------------------------------------------------------
+
+wxDEFINE_FLAGS( wxTreeCtrlStyle )
+wxBEGIN_FLAGS( wxTreeCtrlStyle )
+// new style border flags, we put them first to
+// use them for streaming out
+wxFLAGS_MEMBER(wxBORDER_SIMPLE)
+wxFLAGS_MEMBER(wxBORDER_SUNKEN)
+wxFLAGS_MEMBER(wxBORDER_DOUBLE)
+wxFLAGS_MEMBER(wxBORDER_RAISED)
+wxFLAGS_MEMBER(wxBORDER_STATIC)
+wxFLAGS_MEMBER(wxBORDER_NONE)
+
+// old style border flags
+wxFLAGS_MEMBER(wxSIMPLE_BORDER)
+wxFLAGS_MEMBER(wxSUNKEN_BORDER)
+wxFLAGS_MEMBER(wxDOUBLE_BORDER)
+wxFLAGS_MEMBER(wxRAISED_BORDER)
+wxFLAGS_MEMBER(wxSTATIC_BORDER)
+wxFLAGS_MEMBER(wxBORDER)
+
+// standard window styles
+wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
+wxFLAGS_MEMBER(wxCLIP_CHILDREN)
+wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
+wxFLAGS_MEMBER(wxWANTS_CHARS)
+wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
+wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
+wxFLAGS_MEMBER(wxVSCROLL)
+wxFLAGS_MEMBER(wxHSCROLL)
+
+wxFLAGS_MEMBER(wxTR_EDIT_LABELS)
+wxFLAGS_MEMBER(wxTR_NO_BUTTONS)
+wxFLAGS_MEMBER(wxTR_HAS_BUTTONS)
+wxFLAGS_MEMBER(wxTR_TWIST_BUTTONS)
+wxFLAGS_MEMBER(wxTR_NO_LINES)
+wxFLAGS_MEMBER(wxTR_FULL_ROW_HIGHLIGHT)
+wxFLAGS_MEMBER(wxTR_LINES_AT_ROOT)
+wxFLAGS_MEMBER(wxTR_HIDE_ROOT)
+wxFLAGS_MEMBER(wxTR_ROW_LINES)
+wxFLAGS_MEMBER(wxTR_HAS_VARIABLE_ROW_HEIGHT)
+wxFLAGS_MEMBER(wxTR_SINGLE)
+wxFLAGS_MEMBER(wxTR_MULTIPLE)
+#if WXWIN_COMPATIBILITY_2_8
+wxFLAGS_MEMBER(wxTR_EXTENDED)
+#endif
+wxFLAGS_MEMBER(wxTR_DEFAULT_STYLE)
+wxEND_FLAGS( wxTreeCtrlStyle )
+
+wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxTreeCtrl, wxControl, "wx/treectrl.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxTreeCtrl)
+wxEVENT_PROPERTY( TextUpdated, wxEVT_COMMAND_TEXT_UPDATED, wxCommandEvent )
+wxEVENT_RANGE_PROPERTY( TreeEvent, wxEVT_COMMAND_TREE_BEGIN_DRAG, \
+                       wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK, wxTreeEvent )
+
+wxPROPERTY_FLAGS( WindowStyle, wxTreeCtrlStyle, long, SetWindowStyleFlag, \
+                 GetWindowStyleFlag, wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, \
+                 wxT("Helpstring"), wxT("group")) // style
+wxEND_PROPERTIES_TABLE()
+
+wxEMPTY_HANDLERS_TABLE(wxTreeCtrl)
+
+wxCONSTRUCTOR_5( wxTreeCtrl, wxWindow*, Parent, wxWindowID, Id, \
+                wxPoint, Position, wxSize, Size, long, WindowStyle )
+
 // ----------------------------------------------------------------------------
 // Tree event
 // ----------------------------------------------------------------------------
index 47308229a1293afa3598bec6a78469cc9b8321f0..dc64619a86e62cb5b3014d4c2eb6768a74774122 100644 (file)
@@ -114,6 +114,137 @@ END_EVENT_TABLE()
 // implementation of the common functionality of the wxWindow class
 // ============================================================================
 
+// ----------------------------------------------------------------------------
+// XTI
+// ----------------------------------------------------------------------------
+
+#if wxUSE_EXTENDED_RTTI
+
+// windows that are created from a parent window during its Create method, 
+// eg. spin controls in a calendar controls must never been streamed out 
+// separately otherwise chaos occurs. Right now easiest is to test for negative ids, 
+// as windows with negative ids never can be recreated anyway
+
+bool wxWindowStreamingCallback( const wxObject *object, wxObjectWriter *, 
+                               wxObjectReaderCallback *, wxVariantBaseArray & )
+{
+    const wxWindow * win = wx_dynamic_cast(const wxWindow*, object);
+    if ( win && win->GetId() < 0 )
+        return false;
+    return true;
+}
+
+wxIMPLEMENT_DYNAMIC_CLASS_XTI_CALLBACK(wxWindow, wxWindowBase, "wx/window.h", \
+                                       wxWindowStreamingCallback)
+
+// make wxWindowList known before the property is used
+
+wxCOLLECTION_TYPE_INFO( wxWindow*, wxWindowList );
+
+template<> void wxCollectionToVariantArray( wxWindowList const &theList, 
+                                           wxVariantBaseArray &value)
+{
+    wxListCollectionToVariantArray<wxWindowList::compatibility_iterator>( theList, value );
+}
+
+wxDEFINE_FLAGS( wxWindowStyle )
+
+wxBEGIN_FLAGS( wxWindowStyle )
+// new style border flags, we put them first to
+// use them for streaming out
+
+wxFLAGS_MEMBER(wxBORDER_SIMPLE)
+wxFLAGS_MEMBER(wxBORDER_SUNKEN)
+wxFLAGS_MEMBER(wxBORDER_DOUBLE)
+wxFLAGS_MEMBER(wxBORDER_RAISED)
+wxFLAGS_MEMBER(wxBORDER_STATIC)
+wxFLAGS_MEMBER(wxBORDER_NONE)
+
+// old style border flags
+wxFLAGS_MEMBER(wxSIMPLE_BORDER)
+wxFLAGS_MEMBER(wxSUNKEN_BORDER)
+wxFLAGS_MEMBER(wxDOUBLE_BORDER)
+wxFLAGS_MEMBER(wxRAISED_BORDER)
+wxFLAGS_MEMBER(wxSTATIC_BORDER)
+wxFLAGS_MEMBER(wxBORDER)
+
+// standard window styles
+wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
+wxFLAGS_MEMBER(wxCLIP_CHILDREN)
+wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
+wxFLAGS_MEMBER(wxWANTS_CHARS)
+wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
+wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
+wxFLAGS_MEMBER(wxVSCROLL)
+wxFLAGS_MEMBER(wxHSCROLL)
+
+wxEND_FLAGS( wxWindowStyle )
+
+wxBEGIN_PROPERTIES_TABLE(wxWindow)
+wxEVENT_PROPERTY( Close, wxEVT_CLOSE_WINDOW, wxCloseEvent)
+wxEVENT_PROPERTY( Create, wxEVT_CREATE, wxWindowCreateEvent )
+wxEVENT_PROPERTY( Destroy, wxEVT_DESTROY, wxWindowDestroyEvent )
+// Always constructor Properties first
+
+wxREADONLY_PROPERTY( Parent,wxWindow*, GetParent, wxEMPTY_PARAMETER_VALUE, \
+                    0 /*flags*/, wxT("Helpstring"), wxT("group"))
+wxPROPERTY( Id,wxWindowID, SetId, GetId, -1 /*wxID_ANY*/, 0 /*flags*/, \
+           wxT("Helpstring"), wxT("group") )
+wxPROPERTY( Position,wxPoint, SetPosition, GetPosition, wxDefaultPosition, \
+           0 /*flags*/, wxT("Helpstring"), wxT("group")) // pos
+wxPROPERTY( Size,wxSize, SetSize, GetSize, wxDefaultSize, 0 /*flags*/, \
+           wxT("Helpstring"), wxT("group")) // size
+wxPROPERTY( WindowStyle, long, SetWindowStyleFlag, GetWindowStyleFlag, \
+           wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, wxT("Helpstring"), wxT("group")) // style
+wxPROPERTY( Name,wxString, SetName, GetName, wxEmptyString, 0 /*flags*/, \
+           wxT("Helpstring"), wxT("group") )
+
+// Then all relations of the object graph
+
+wxREADONLY_PROPERTY_COLLECTION( Children, wxWindowList, wxWindowBase*, \
+                               GetWindowChildren, wxPROP_OBJECT_GRAPH /*flags*/, \
+                               wxT("Helpstring"), wxT("group"))
+
+// and finally all other properties
+
+wxPROPERTY( ExtraStyle, long, SetExtraStyle, GetExtraStyle, wxEMPTY_PARAMETER_VALUE, \
+           0 /*flags*/, wxT("Helpstring"), wxT("group")) // extstyle
+wxPROPERTY( BackgroundColour, wxColour, SetBackgroundColour, GetBackgroundColour, \
+           wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, wxT("Helpstring"), wxT("group")) // bg
+wxPROPERTY( ForegroundColour, wxColour, SetForegroundColour, GetForegroundColour, \
+           wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, wxT("Helpstring"), wxT("group")) // fg
+wxPROPERTY( Enabled, bool, Enable, IsEnabled, wxVariantBase((bool)true), 0 /*flags*/, \
+           wxT("Helpstring"), wxT("group"))
+wxPROPERTY( Shown, bool, Show, IsShown, wxVariantBase((bool)true), 0 /*flags*/, \
+           wxT("Helpstring"), wxT("group"))
+
+#if 0
+// possible property candidates (not in xrc) or not valid in all subclasses
+wxPROPERTY( Title,wxString, SetTitle, GetTitle, wxEmptyString )
+wxPROPERTY( Font, wxFont, SetFont, GetWindowFont , )
+wxPROPERTY( Label,wxString, SetLabel, GetLabel, wxEmptyString )
+// MaxHeight, Width, MinHeight, Width
+// TODO switch label to control and title to toplevels
+
+wxPROPERTY( ThemeEnabled, bool, SetThemeEnabled, GetThemeEnabled, )
+//wxPROPERTY( Cursor, wxCursor, SetCursor, GetCursor, )
+// wxPROPERTY( ToolTip, wxString, SetToolTip, GetToolTipText, )
+wxPROPERTY( AutoLayout, bool, SetAutoLayout, GetAutoLayout, )
+#endif
+wxEND_PROPERTIES_TABLE()
+
+wxEMPTY_HANDLERS_TABLE(wxWindow)
+
+wxCONSTRUCTOR_DUMMY(wxWindow)
+
+#else
+
+#ifndef __WXUNIVERSAL__
+IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowBase)
+#endif
+
+#endif
+
 // ----------------------------------------------------------------------------
 // initialization
 // ----------------------------------------------------------------------------
index 367de68c36fbf6ebdff513a8c9e9471a8b94d8e4..3bb4170e5f52bb4f7edcf11b110ed5c2714ec20a 100644 (file)
@@ -58,65 +58,6 @@ BEGIN_EVENT_TABLE(wxGenericCalendarCtrl, wxControl)
     EVT_SYS_COLOUR_CHANGED(wxGenericCalendarCtrl::OnSysColourChanged)
 END_EVENT_TABLE()
 
-#if wxUSE_EXTENDED_RTTI
-WX_DEFINE_FLAGS( wxCalendarCtrlStyle )
-
-wxBEGIN_FLAGS( wxCalendarCtrlStyle )
-    // new style border flags, we put them first to
-    // use them for streaming out
-    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-    wxFLAGS_MEMBER(wxBORDER_RAISED)
-    wxFLAGS_MEMBER(wxBORDER_STATIC)
-    wxFLAGS_MEMBER(wxBORDER_NONE)
-
-    // old style border flags
-    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-    wxFLAGS_MEMBER(wxRAISED_BORDER)
-    wxFLAGS_MEMBER(wxSTATIC_BORDER)
-    wxFLAGS_MEMBER(wxBORDER)
-
-    // standard window styles
-    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-    wxFLAGS_MEMBER(wxWANTS_CHARS)
-    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
-    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
-    wxFLAGS_MEMBER(wxVSCROLL)
-    wxFLAGS_MEMBER(wxHSCROLL)
-
-    wxFLAGS_MEMBER(wxCAL_SUNDAY_FIRST)
-    wxFLAGS_MEMBER(wxCAL_MONDAY_FIRST)
-    wxFLAGS_MEMBER(wxCAL_SHOW_HOLIDAYS)
-    wxFLAGS_MEMBER(wxCAL_NO_YEAR_CHANGE)
-    wxFLAGS_MEMBER(wxCAL_NO_MONTH_CHANGE)
-    wxFLAGS_MEMBER(wxCAL_SEQUENTIAL_MONTH_SELECTION)
-    wxFLAGS_MEMBER(wxCAL_SHOW_SURROUNDING_WEEKS)
-    wxFLAGS_MEMBER(wxCAL_SHOW_WEEK_NUMBERS)
-
-wxEND_FLAGS( wxCalendarCtrlStyle )
-
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxGenericCalendarCtrl, wxControl,"wx/calctrl.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxGenericCalendarCtrl)
-    wxEVENT_RANGE_PROPERTY( Updated , wxEVT_CALENDAR_SEL_CHANGED , wxEVT_CALENDAR_WEEK_CLICKED , wxCalendarEvent )
-    wxHIDE_PROPERTY( Children )
-    wxPROPERTY( Date,wxDateTime, SetDate , GetDate, , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY_FLAGS( WindowStyle , wxCalendarCtrlStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
-wxEND_PROPERTIES_TABLE()
-
-wxBEGIN_HANDLERS_TABLE(wxGenericCalendarCtrl)
-wxEND_HANDLERS_TABLE()
-
-wxCONSTRUCTOR_6( wxGenericCalendarCtrl , wxWindow* , Parent , wxWindowID , Id , wxDateTime , Date , wxPoint , Position , wxSize , Size , long , WindowStyle )
-#else
-IMPLEMENT_DYNAMIC_CLASS(wxGenericCalendarCtrl, wxControl)
-#endif
-
 // ============================================================================
 // implementation
 // ============================================================================
index adc843d1953674193f71717bc63aa058657e9ef9..d4c9ed20135cc45ec5e08cfb48a38a0868d76a7c 100644 (file)
@@ -22,8 +22,6 @@
     #include "wx/gdicmn.h"
 #endif
 
-IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
-
 // Colour
 
 void wxColour::Init()
index 2895e970ce6ac8449e9b27c7a07e02ec58f3fa60..287bd7a46cc0eefbb6745e68c76fdaaba99fc512 100644 (file)
 #include "wx/commandlinkbutton.h"
 #include "wx/artprov.h"
 
-#if wxUSE_EXTENDED_RTTI
-    wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxCommandLinkButton, wxButton, "wx/commandlinkbutton.h")
-#else
-    wxIMPLEMENT_DYNAMIC_CLASS(wxCommandLinkButton, wxButton)
-#endif // wxUSE_EXTENDED_RTTI
+wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxCommandLinkButton, wxButton, "wx/commandlinkbutton.h")
 
 // ----------------------------------------------------------------------------
 // Generic command link button
index a87c0812ca125709359c422f200bc2e8a1c6440a..fae330fa03a1faf36b320df3eb3236734e60efbf 100644 (file)
@@ -437,64 +437,6 @@ bool wxDirItemData::HasFiles(const wxString& WXUNUSED(spec)) const
 // wxGenericDirCtrl
 //-----------------------------------------------------------------------------
 
-
-#if wxUSE_EXTENDED_RTTI
-WX_DEFINE_FLAGS( wxGenericDirCtrlStyle )
-
-wxBEGIN_FLAGS( wxGenericDirCtrlStyle )
-    // new style border flags, we put them first to
-    // use them for streaming out
-    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-    wxFLAGS_MEMBER(wxBORDER_RAISED)
-    wxFLAGS_MEMBER(wxBORDER_STATIC)
-    wxFLAGS_MEMBER(wxBORDER_NONE)
-
-    // old style border flags
-    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-    wxFLAGS_MEMBER(wxRAISED_BORDER)
-    wxFLAGS_MEMBER(wxSTATIC_BORDER)
-    wxFLAGS_MEMBER(wxBORDER)
-
-    // standard window styles
-    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-    wxFLAGS_MEMBER(wxWANTS_CHARS)
-    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
-    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
-    wxFLAGS_MEMBER(wxVSCROLL)
-    wxFLAGS_MEMBER(wxHSCROLL)
-
-    wxFLAGS_MEMBER(wxDIRCTRL_DIR_ONLY)
-    wxFLAGS_MEMBER(wxDIRCTRL_3D_INTERNAL)
-    wxFLAGS_MEMBER(wxDIRCTRL_SELECT_FIRST)
-    wxFLAGS_MEMBER(wxDIRCTRL_MULTIPLE)
-
-wxEND_FLAGS( wxGenericDirCtrlStyle )
-
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxGenericDirCtrl, wxControl,"wx/dirctrl.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxGenericDirCtrl)
-    wxHIDE_PROPERTY( Children )
-    wxPROPERTY( DefaultPath , wxString , SetDefaultPath , GetDefaultPath  , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY( Filter , wxString , SetFilter , GetFilter  , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
-    wxPROPERTY( DefaultFilter , int , SetFilterIndex, GetFilterIndex, EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
-    wxPROPERTY_FLAGS( WindowStyle, wxGenericDirCtrlStyle, long, SetWindowStyleFlag, GetWindowStyleFlag, EMPTY_MACROVALUE , 0, wxT("Helpstring"), wxT("group") )
-wxEND_PROPERTIES_TABLE()
-
-wxBEGIN_HANDLERS_TABLE(wxGenericDirCtrl)
-wxEND_HANDLERS_TABLE()
-
-wxCONSTRUCTOR_8( wxGenericDirCtrl , wxWindow* , Parent , wxWindowID , Id , wxString , DefaultPath ,
-                 wxPoint , Position , wxSize , Size , long , WindowStyle , wxString , Filter , int , DefaultFilter )
-#else
-IMPLEMENT_DYNAMIC_CLASS(wxGenericDirCtrl, wxControl)
-#endif
-
 BEGIN_EVENT_TABLE(wxGenericDirCtrl, wxControl)
   EVT_TREE_ITEM_EXPANDING     (wxID_TREECTRL, wxGenericDirCtrl::OnExpandItem)
   EVT_TREE_ITEM_COLLAPSED     (wxID_TREECTRL, wxGenericDirCtrl::OnCollapseItem)
index d9a1a800d405b41fec1108856042c81f9e9e9545..45d61abdc866d14c0f343f45a6aa9a7626ff4039 100644 (file)
@@ -1839,58 +1839,6 @@ void wxGridWindow::OnFocus(wxFocusEvent& event)
 
 /////////////////////////////////////////////////////////////////////
 
-#if wxUSE_EXTENDED_RTTI
-WX_DEFINE_FLAGS( wxGridStyle )
-
-wxBEGIN_FLAGS( wxGridStyle )
-    // new style border flags, we put them first to
-    // use them for streaming out
-    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-    wxFLAGS_MEMBER(wxBORDER_RAISED)
-    wxFLAGS_MEMBER(wxBORDER_STATIC)
-    wxFLAGS_MEMBER(wxBORDER_NONE)
-
-    // old style border flags
-    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-    wxFLAGS_MEMBER(wxRAISED_BORDER)
-    wxFLAGS_MEMBER(wxSTATIC_BORDER)
-    wxFLAGS_MEMBER(wxBORDER)
-
-    // standard window styles
-    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-    wxFLAGS_MEMBER(wxWANTS_CHARS)
-    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
-    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB)
-    wxFLAGS_MEMBER(wxVSCROLL)
-    wxFLAGS_MEMBER(wxHSCROLL)
-
-wxEND_FLAGS( wxGridStyle )
-
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxGrid, wxScrolledWindow,"wx/grid.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxGrid)
-    wxHIDE_PROPERTY( Children )
-    wxPROPERTY_FLAGS( WindowStyle , wxGridStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE, 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
-wxEND_PROPERTIES_TABLE()
-
-wxBEGIN_HANDLERS_TABLE(wxGrid)
-wxEND_HANDLERS_TABLE()
-
-wxCONSTRUCTOR_5( wxGrid , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle )
-
-/*
- TODO : Expose more information of a list's layout, etc. via appropriate objects (e.g., NotebookPageInfo)
-*/
-#else
-IMPLEMENT_DYNAMIC_CLASS( wxGrid, wxScrolledWindow )
-#endif
-
 BEGIN_EVENT_TABLE( wxGrid, wxScrolledWindow )
     EVT_PAINT( wxGrid::OnPaint )
     EVT_SIZE( wxGrid::OnSize )
index 5a3ef5ac9064b6e9085e8ad26429a09dc9f8d89f..02b14b51f71a42684e46550bb053eef1481e9a2b 100644 (file)
 
 #include "wx/listctrl.h"
 
-#if ((!defined(__WXMSW__) && !(defined(__WXMAC__) && wxOSX_USE_CARBON)) || defined(__WXUNIVERSAL__))
-    // if we have a native version, its implementation file does all this
-    IMPLEMENT_DYNAMIC_CLASS(wxListItem, wxObject)
-    IMPLEMENT_DYNAMIC_CLASS(wxListView, wxListCtrl)
-    IMPLEMENT_DYNAMIC_CLASS(wxListEvent, wxNotifyEvent)
-
-    IMPLEMENT_DYNAMIC_CLASS(wxListCtrl, wxGenericListCtrl)
-#endif
-
 #ifndef WX_PRECOMP
     #include "wx/scrolwin.h"
     #include "wx/timer.h"
index da2fa7802765d745e3d751e458fa8d0e673639c7..b9818d560c4c9d69f21d68782007f94b08c9a30d 100644 (file)
@@ -877,21 +877,6 @@ void wxVListBoxComboPopup::Populate( const wxArrayString& choices )
 BEGIN_EVENT_TABLE(wxOwnerDrawnComboBox, wxComboCtrl)
 END_EVENT_TABLE()
 
-
-#if wxUSE_EXTENDED_RTTI
-IMPLEMENT_DYNAMIC_CLASS2_XTI(wxOwnerDrawnComboBox, wxComboCtrl, wxControlWithItems, "wx/odcombo.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxOwnerDrawnComboBox)
-wxEND_PROPERTIES_TABLE()
-
-wxBEGIN_HANDLERS_TABLE(wxOwnerDrawnComboBox)
-wxEND_HANDLERS_TABLE()
-
-wxCONSTRUCTOR_5( wxOwnerDrawnComboBox , wxWindow* , Parent , wxWindowID , Id , wxString , Value , wxPoint , Position , wxSize , Size )
-#else
-IMPLEMENT_DYNAMIC_CLASS2(wxOwnerDrawnComboBox, wxComboCtrl, wxControlWithItems)
-#endif
-
 void wxOwnerDrawnComboBox::Init()
 {
 }
index 32e656f94e3c6f431b47c058c8e5e7f636511df6..6ca4edace5c5d8a16c2bca7dfcf8f964798754ac 100644 (file)
 // wxWin macros
 // ----------------------------------------------------------------------------
 
-#if wxUSE_EXTENDED_RTTI
-WX_DEFINE_FLAGS( wxPanelStyle )
-
-wxBEGIN_FLAGS( wxPanelStyle )
-    // new style border flags, we put them first to
-    // use them for streaming out
-    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-    wxFLAGS_MEMBER(wxBORDER_RAISED)
-    wxFLAGS_MEMBER(wxBORDER_STATIC)
-    wxFLAGS_MEMBER(wxBORDER_NONE)
-
-    // old style border flags
-    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-    wxFLAGS_MEMBER(wxRAISED_BORDER)
-    wxFLAGS_MEMBER(wxSTATIC_BORDER)
-    wxFLAGS_MEMBER(wxBORDER)
-
-    // standard window styles
-    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-    wxFLAGS_MEMBER(wxWANTS_CHARS)
-    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
-    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
-    wxFLAGS_MEMBER(wxVSCROLL)
-    wxFLAGS_MEMBER(wxHSCROLL)
-
-wxEND_FLAGS( wxPanelStyle )
-
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxPanel, wxWindow,"wx/panel.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxPanel)
-    wxPROPERTY_FLAGS( WindowStyle , wxPanelStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE, 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
-// style wxTAB_TRAVERSAL
-wxEND_PROPERTIES_TABLE()
-
-wxBEGIN_HANDLERS_TABLE(wxPanel)
-wxEND_HANDLERS_TABLE()
-
-wxCONSTRUCTOR_5( wxPanel , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle )
-
-#else
-IMPLEMENT_DYNAMIC_CLASS(wxPanel, wxWindow)
-#endif
-
 BEGIN_EVENT_TABLE(wxPanel, wxWindow)
     WX_EVENT_TABLE_CONTROL_CONTAINER(wxPanel)
 END_EVENT_TABLE()
index 1f2f3c2492edf724edf0923ab9df3e61652cc23d..dcb3ada436f7c6524a6c050e40b90d051fec5c40 100644 (file)
@@ -539,8 +539,6 @@ void wxSpinCtrlGenericBase::SetSelection(long from, long to)
 // wxSpinCtrl
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl, wxSpinCtrlGenericBase)
-
 void wxSpinCtrl::DoSendEvent()
 {
     wxSpinEvent event( wxEVT_COMMAND_SPINCTRL_UPDATED, GetId());
index 8f6701dccb57f78a11e32794e57ac862bd0edd5f..63dac5b2aed21b85d4ddb07c4938b2cd751e6ab4 100644 (file)
@@ -18,8 +18,6 @@
 
 #include "wx/generic/statbmpg.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxGenericStaticBitmap, wxStaticBitmapBase)
-
 bool wxGenericStaticBitmap::Create(wxWindow *parent, wxWindowID id,
                                    const wxBitmap& bitmap,
                                    const wxPoint& pos, const wxSize& size,
index 023745015db8b4044064c3c0bd3245f07105d987..e6edd9c7e9741a3d79bc427cde8ebe7b3e26ea81 100644 (file)
@@ -36,8 +36,6 @@
 // implementation
 // ============================================================================
 
-IMPLEMENT_DYNAMIC_CLASS(wxStaticLine, wxControl)
-
 // ----------------------------------------------------------------------------
 // wxStaticLine
 // ----------------------------------------------------------------------------
index cb13a8af3d101d065384d95247c967ec246d0253..c3b739e4d33ce37ca97c8bca51794978f7c69a46 100644 (file)
@@ -909,15 +909,6 @@ BEGIN_EVENT_TABLE(wxGenericTreeCtrl, wxTreeCtrlBase)
     EVT_TREE_ITEM_GETTOOLTIP(wxID_ANY, wxGenericTreeCtrl::OnGetToolTip)
 END_EVENT_TABLE()
 
-#if !defined(__WXMSW__) || defined(__WXUNIVERSAL__)
-/*
- * wxTreeCtrl has to be a real class or we have problems with
- * the run-time information.
- */
-
-IMPLEMENT_DYNAMIC_CLASS(wxTreeCtrl, wxGenericTreeCtrl)
-#endif
-
 // -----------------------------------------------------------------------------
 // construction/destruction
 // -----------------------------------------------------------------------------
index f6d2ee2e6e296ec00972b0d8668c84e332eeee0c..55ca28b5c2ed658a095622477b37fe544f76ed64 100644 (file)
@@ -14,8 +14,6 @@
 
 #include "wx/bmpbuttn.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton,wxButton)
-
 bool wxBitmapButton::Create(wxWindow *parent,
                             wxWindowID id,
                             const wxBitmap& bitmap,
index 5faa27c19bf3850faaca00f232b4efd9109457fa..415b5c4e647c4fc209da434fbbcc4c544d88482d 100644 (file)
@@ -90,8 +90,6 @@ static void gtk_checkbox_toggled_callback(GtkWidget *widget, wxCheckBox *cb)
 // wxCheckBox
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxCheckBox,wxControl)
-
 wxCheckBox::wxCheckBox()
 {
 }
index 462d9266ef65fa5edf943d13e0bc533299f8ece1..00170f295031a4d95c8d3f4255c3cec257ced8b2 100644 (file)
@@ -38,8 +38,6 @@ gtk_choice_changed_callback( GtkWidget *WXUNUSED(widget), wxChoice *choice )
 // wxChoice
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControlWithItems)
-
 void wxChoice::Init()
 {
     m_strings = NULL;
index 6a226d4d0b4dab46b15d4a7590db79030e0f0c58..322689db99e61c7ae036dfe379279152bc5c9afe 100644 (file)
@@ -88,8 +88,6 @@ void wxColourRefData::AllocColour( GdkColormap *cmap )
 // GDK's values are in 0..65535 range, ours are in 0..255
 #define SHIFT  8
 
-IMPLEMENT_DYNAMIC_CLASS(wxColour,wxGDIObject)
-
 wxColour::wxColour(const GdkColor& gdkColor)
 {
     m_refData = new wxColourRefData(gdkColor.red, gdkColor.green, gdkColor.blue);
index a0fb1e962dd28544452c873b3d1ab2662808e05a..23f4becc49755e90ab41da9374a2566234b29be9 100644 (file)
@@ -64,8 +64,6 @@ gtkcombobox_popupshown_callback(GObject *WXUNUSED(gobject),
 // wxComboBox
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxChoice)
-
 BEGIN_EVENT_TABLE(wxComboBox, wxChoice)
     EVT_CHAR(wxComboBox::OnChar)
 
index 05635a131e4b8387eeef3ad9dde8ce380797adf8..7d17af90adbfdbf4b7e6eaf1cedffd0645dd3ea7 100644 (file)
@@ -32,8 +32,6 @@
 // event tables
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow)
-
 // ============================================================================
 // implementation
 // ============================================================================
index 91ab64a35170686a6754dd664194b1ab4654e2f6..b867c30fa869868367696d05bb9c75e6e5c1a763 100644 (file)
@@ -20,8 +20,6 @@
 // wxGauge
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl)
-
 bool wxGauge::Create( wxWindow *parent,
                       wxWindowID id,
                       int range,
index 60c03da2030ea8284126b095c1226b9d234d03a0..06c62c2ff566cbd26dc5bbf49dbe4435aa56c15e 100644 (file)
@@ -237,8 +237,6 @@ static gboolean gtk_listbox_searchequal_callback(GtkTreeModel * WXUNUSED(model),
 // wxListBox
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControlWithItems)
-
 // ----------------------------------------------------------------------------
 // construction
 // ----------------------------------------------------------------------------
index d2c5f73cfee57f8bb905d8d363285db4b9521aa7..f465958df1210d3c451af3b5e9ea3c267f12bbaa 100644 (file)
@@ -47,8 +47,6 @@ void gtk_radiobutton_clicked_callback( GtkToggleButton *button, wxRadioButton *r
 // wxRadioButton
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxRadioButton,wxControl)
-
 bool wxRadioButton::Create( wxWindow *parent,
                             wxWindowID id,
                             const wxString& label,
index 48bf5748ee1a2e6e18846773bc9ad527c9f64188..3ffb6eb2b7746f095e150aae5c97ab9833c80f27 100644 (file)
@@ -118,8 +118,6 @@ gtk_button_release_event(GtkRange* range, GdkEventButton*, wxScrollBar* win)
 // wxScrollBar
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxScrollBar,wxControl)
-
 wxScrollBar::wxScrollBar()
 {
 }
index 83deaec5f310f56f656a2fc1a17619e8958d4141..7ded1177739da5f09047309ddc59356bf2a6734c 100644 (file)
@@ -272,8 +272,6 @@ static gchar* gtk_format_value(GtkScale*, double value, void*)
 // wxSlider
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxSlider,wxControl)
-
 wxSlider::wxSlider()
 {
     m_pos = 0;
index 9155e23d3f1e6c8ad48fcaac207e8e0d74682ceb..c8e4780f1280981d7cfdd8a4d565108fbb213355 100644 (file)
@@ -72,9 +72,6 @@ gtk_value_changed(GtkSpinButton* spinbutton, wxSpinButton* win)
 // wxSpinButton
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxSpinButton,wxControl)
-IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent)
-
 BEGIN_EVENT_TABLE(wxSpinButton, wxControl)
     EVT_SIZE(wxSpinButton::OnSize)
 END_EVENT_TABLE()
index d84c02d39d8332aa960a4a0db4ee8881c18d0631..1d2b31a00cddd8e11fc9b14216855c231dce667c 100644 (file)
@@ -352,8 +352,6 @@ wxSpinCtrlGTKBase::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 // wxSpinCtrl
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl, wxSpinCtrlGTKBase)
-
 //-----------------------------------------------------------------------------
 // wxSpinCtrlDouble
 //-----------------------------------------------------------------------------
index b12acdde77a64e2cec979b3370ea185b5b4ddfb4..a7e372c93d22d4268560c52ca7030f95b7a970b9 100644 (file)
@@ -20,8 +20,6 @@
 // wxStaticBitmap
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap,wxControl)
-
 wxStaticBitmap::wxStaticBitmap(void)
 {
 }
index b7df8b6f58cb2c2f4a983ed8024016d229fa5cd1..151f04d0faad2f995ad7341f15127a6f24fe3470 100644 (file)
@@ -48,8 +48,6 @@ static void size_allocate(GtkWidget* widget, GtkAllocation* alloc, void*)
 // wxStaticBox
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl)
-
 wxStaticBox::wxStaticBox()
 {
 }
index 9cb487fb6ad4d5a6ae4951cbdd84a38885b8b611..d19a152ccb37e4c493ae99d351d3f7bfb4ecd0e6 100644 (file)
@@ -21,8 +21,6 @@
 // wxStaticLine
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxStaticLine, wxControl)
-
 wxStaticLine::wxStaticLine()
 {
 }
index b3f96071aea18d2680bbd8872eba437b353f4e93..330253262aa8bbd144947d08cbeb68a5ef829028 100644 (file)
@@ -19,8 +19,6 @@
 // wxStaticText
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxStaticText,wxControl)
-
 wxStaticText::wxStaticText()
 {
 }
index 8275b82b1640b82235503c0901186a723178be2c..e88d1e2aed9fbd4ed3bdd2e3849cf12a8a9645c6 100644 (file)
@@ -583,8 +583,6 @@ gtk_paste_clipboard_callback( GtkWidget *widget, wxTextCtrl *win )
 //  wxTextCtrl
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxTextCtrlBase)
-
 BEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase)
     EVT_CHAR(wxTextCtrl::OnChar)
 
index 53c687fa0848e5e1e3e25ca20c27288db27c657e..26e7dc2b446f9b1a7d3ff0bde73b3230ed58d3a3 100644 (file)
@@ -2048,9 +2048,7 @@ wxMouseState wxGetMouseState()
 // method
 #ifdef __WXUNIVERSAL__
     IMPLEMENT_ABSTRACT_CLASS(wxWindowGTK, wxWindowBase)
-#else // __WXGTK__
-    IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowBase)
-#endif // __WXUNIVERSAL__/__WXGTK__
+#endif // __WXUNIVERSAL__
 
 void wxWindowGTK::Init()
 {
index 18d39511633a72b002fdba2b6168c8a8bd6e7150..109281084a87bcb6ce07c85344c09c54332f84d2 100644 (file)
@@ -114,8 +114,6 @@ static void gtk_bmpbutton_release_callback( GtkWidget *WXUNUSED(widget), wxBitma
 // wxBitmapButton
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton,wxButton)
-
 void wxBitmapButton::Init()
 {
     m_hasFocus =
index a388cc3474b0e5a4e11eee80640d772af16f6fda..cbcf71028c679cf164bc15cb9cd51a17cc4f6df2 100644 (file)
@@ -94,8 +94,6 @@ gtk_button_style_set_callback( GtkWidget *m_widget, GtkStyle *WXUNUSED(style), w
 // wxButton
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxButton,wxControl)
-
 wxButton::wxButton()
 {
 }
index c895b7c82cea1e7f4e48fb8a2e3b8556d3051117..5d3dd8738cba17f98815338f68968dfbca64f9f0 100644 (file)
@@ -58,8 +58,6 @@ static void gtk_checkbox_toggled_callback(GtkWidget *WXUNUSED(widget),
 // wxCheckBox
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxCheckBox,wxControl)
-
 wxCheckBox::wxCheckBox()
 {
 }
index 5c29d0930ccbb1897662daeb460eccd84da23e5b..1a17d2d027f087292a1af217509a617677fbd35d 100644 (file)
@@ -86,8 +86,6 @@ static void gtk_choice_clicked_callback( GtkWidget *WXUNUSED(widget), wxChoice *
 // wxChoice
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControlWithItems)
-
 wxChoice::wxChoice()
 {
     m_strings = NULL;
index 4d379eb6329dabcedea24f6215d83d82f0a0fc74..eb133b79e1a4fccc8f75008d3232f7af8775d61c 100644 (file)
@@ -137,8 +137,6 @@ void wxColourRefData::AllocColour( GdkColormap *cmap )
 // GDK's values are in 0..65535 range, our are in 0..255
 #define SHIFT  8
 
-IMPLEMENT_DYNAMIC_CLASS(wxColour,wxGDIObject)
-
 wxColour::~wxColour()
 {
 }
index ebbbc0c0a4fc8e313a445e04d8d366f730110cd7..515f0c8c6576e2598e72289ed3b06fb94a7b6036 100644 (file)
@@ -170,8 +170,6 @@ gtk_combo_select_child_callback( GtkList *WXUNUSED(list), GtkWidget *WXUNUSED(wi
 // wxComboBox
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxComboBox,wxControl)
-
 BEGIN_EVENT_TABLE(wxComboBox, wxControl)
     EVT_SIZE(wxComboBox::OnSize)
     EVT_CHAR(wxComboBox::OnChar)
index 54bac5264ff20430f3fb380cb12375da5227cafd..1646b771cbde9e447009f9106e0277dae0739e08 100644 (file)
@@ -43,8 +43,6 @@ BEGIN_EVENT_TABLE(wxDialog,wxDialogBase)
     EVT_CLOSE   (wxDialog::OnCloseWindow)
 END_EVENT_TABLE()
 
-IMPLEMENT_DYNAMIC_CLASS(wxDialog,wxTopLevelWindow)
-
 void wxDialog::Init()
 {
     m_returnCode = 0;
index 83474b3a55d22b92129baec5c7c67be9996985c5..304c152a579b34dd3b3b4903859d9c408d0b7644 100644 (file)
@@ -56,8 +56,6 @@ extern bool g_isIdle;
 // event tables
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow)
-
 // ============================================================================
 // implementation
 // ============================================================================
index 4c6fcb52783e00f3c433a57211686aab73514076..e8710caec0ca6e3c585617881d02e7e14d83efd1 100644 (file)
@@ -20,8 +20,6 @@
 // wxGauge
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl)
-
 bool wxGauge::Create( wxWindow *parent,
                       wxWindowID id,
                       int range,
index 66feebd3c37cc9408773f46ebcd8600f92aa1b36..c0e55bae2ae7199d262f7900678592b10df6d84c 100644 (file)
@@ -452,8 +452,6 @@ gtk_listbox_realized_callback( GtkWidget *WXUNUSED(widget), wxListBox *win )
 // wxListBox
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControlWithItems)
-
 // ----------------------------------------------------------------------------
 // construction
 // ----------------------------------------------------------------------------
index 73968dc43bbcc6cbd27433bab57d6dfc0806ce01..52e317f1f42bb068678de03613ba1e6fa27ec729 100644 (file)
@@ -60,8 +60,6 @@ void gtk_radiobutton_clicked_callback( GtkToggleButton *button, wxRadioButton *r
 // wxRadioButton
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxRadioButton,wxControl)
-
 bool wxRadioButton::Create( wxWindow *parent,
                             wxWindowID id,
                             const wxString& label,
index 82ad187aa693439d8a565dad63287d883eca91b7..e6dd46e299df16569bb18e4536cf853c87e919f7 100644 (file)
@@ -165,8 +165,6 @@ gtk_scrollbar_button_release_callback( GtkRange *WXUNUSED(widget),
 // wxScrollBar
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxScrollBar,wxControl)
-
 wxScrollBar::~wxScrollBar()
 {
 }
index 7a7a4f0e6b0ac841026a1a5a12e0085706cd6381..c0187f3cca408d19bea62a248b6b89a680fc6ba3 100644 (file)
@@ -125,8 +125,6 @@ static gint gtk_slider_button_release_callback( GtkWidget *scale,
 // wxSlider
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxSlider,wxControl)
-
 bool wxSlider::Create(wxWindow *parent, wxWindowID id,
         int value, int minValue, int maxValue,
         const wxPoint& pos, const wxSize& size,
index 250fda3d2a018303270313a435b2a6e102876601..447adb0830deb4777c94e54fc4b08b50e4cdf81b 100644 (file)
@@ -103,9 +103,6 @@ static void gtk_spinbutt_callback( GtkWidget *WXUNUSED(widget), wxSpinButton *wi
 // wxSpinButton
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxSpinButton,wxControl)
-IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent)
-
 BEGIN_EVENT_TABLE(wxSpinButton, wxControl)
     EVT_SIZE(wxSpinButton::OnSize)
 END_EVENT_TABLE()
index f0beb6ac45b8ba1f5ce21eff95a2d03460232d45..f1f0db47dcf68bcacb493ec1d4fe922794c0fb23 100644 (file)
@@ -90,8 +90,6 @@ gtk_spinctrl_text_changed_callback( GtkWidget *WXUNUSED(widget), wxSpinCtrl *win
 // wxSpinCtrl
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl,wxControl)
-
 BEGIN_EVENT_TABLE(wxSpinCtrl, wxControl)
     EVT_CHAR(wxSpinCtrl::OnChar)
 END_EVENT_TABLE()
index e9ee469e1ed77bd4a4536a54a398d577f8974e10..a1818129aa1258627ded7780eee3f4e290b90569 100644 (file)
@@ -21,8 +21,6 @@
 // wxStaticBitmap
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap,wxControl)
-
 wxStaticBitmap::wxStaticBitmap(void)
 {
 }
index a2542e88e2b20362c15da953c20586179b9f42f4..b8a3d77256ee3085fc76a078a92a7564dc88a944 100644 (file)
@@ -22,8 +22,6 @@
 // wxStaticBox
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl)
-
 wxStaticBox::wxStaticBox()
 {
 }
index 0e05c9e758d6b988a9c4d0f03d2f845fc798983f..9dc3279b5c1cda24a808eabbc67ba746694e9f7d 100644 (file)
@@ -21,8 +21,6 @@
 // wxStaticLine
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxStaticLine, wxControl)
-
 wxStaticLine::wxStaticLine()
 {
 }
index e1f4fb53e1c9d1f12826df64ed261cacecb4bbdc..c43214696018dc46cd4483ec68350c2211fc7173 100644 (file)
@@ -27,8 +27,6 @@ void wxgtk_window_size_request_callback(GtkWidget *widget,
 // wxStaticText
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxStaticText,wxControl)
-
 wxStaticText::wxStaticText()
 {
 }
index 41caee9f642e05513279f2178e444ccb6658e1f3..1aa82a3fffef5b9bc785d0179988310d7c60f83b 100644 (file)
@@ -201,8 +201,6 @@ static void wxgtk_text_draw( GtkWidget *widget, GdkRectangle *rect)
 //  wxTextCtrl
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxTextCtrlBase)
-
 BEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase)
     EVT_CHAR(wxTextCtrl::OnChar)
 
index 2618e11b8c69eee42ec3e6dee37fa58df1bd70bc..dcefcff70ce710a6a875a3094043251c9ac568c3 100644 (file)
@@ -2413,9 +2413,7 @@ wxMouseState wxGetMouseState()
 // method
 #ifdef __WXUNIVERSAL__
     IMPLEMENT_ABSTRACT_CLASS(wxWindowGTK, wxWindowBase)
-#else // __WXGTK__
-    IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowBase)
-#endif // __WXUNIVERSAL__/__WXGTK__
+#endif // __WXUNIVERSAL__
 
 void wxWindowGTK::Init()
 {
index ceb2fac7c8e39ee8ae24d9cfbb753980ab1c76f9..058499e4812b12fc7823d0dddfd9954abd016cfc 100644 (file)
@@ -1640,9 +1640,6 @@ void wxHtmlWindow::SelectAll()
 
 IMPLEMENT_ABSTRACT_CLASS(wxHtmlProcessor,wxObject)
 
-#if wxUSE_EXTENDED_RTTI
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxHtmlWindow, wxScrolledWindow,"wx/html/htmlwin.h")
-
 wxBEGIN_PROPERTIES_TABLE(wxHtmlWindow)
 /*
     TODO PROPERTIES
@@ -1657,9 +1654,8 @@ wxBEGIN_HANDLERS_TABLE(wxHtmlWindow)
 wxEND_HANDLERS_TABLE()
 
 wxCONSTRUCTOR_5( wxHtmlWindow , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle )
-#else
-IMPLEMENT_DYNAMIC_CLASS(wxHtmlWindow,wxScrolledWindow)
-#endif
+
+wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxHtmlWindow, wxScrolledWindow,"wx/html/htmlwin.h")
 
 BEGIN_EVENT_TABLE(wxHtmlWindow, wxScrolledWindow)
     EVT_SIZE(wxHtmlWindow::OnSize)
index 4449639d9ce17a1d580e11ade5556112a49914d0..1246d1de9d67848f682dd43ce631545593095ec2 100644 (file)
@@ -30,8 +30,6 @@ void wxButtonCallback (Widget w, XtPointer clientData, XtPointer ptr);
 
 // Pixmap XCreateInsensitivePixmap( Display *display, Pixmap pixmap );
 
-IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton)
-
 wxBitmapButton::wxBitmapButton()
 {
     m_marginX = m_marginY = wxDEFAULT_BUTTON_MARGIN;
index 7b85a01c74b8f79e896b16e81dcc654d5975becb..9df9eab55c31316907da4eff68543f63fa6838d5 100644 (file)
@@ -34,8 +34,6 @@
 
 void wxButtonCallback (Widget w, XtPointer clientData, XtPointer ptr);
 
-IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
-
 #define MIN_WIDTH 78
 #define MIN_LARGE_HEIGHT 30
 
index 1a79bf75ec76879fe5d44f4dfa1a62156d119059..771c50ff85fbdedbdb5fdb5834688ae4ad4e58be 100644 (file)
@@ -45,8 +45,6 @@
 void wxCheckBoxCallback (Widget w, XtPointer clientData,
                          XtPointer ptr);
 
-IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl)
-
 // Single check box item
 bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
                         const wxPoint& pos,
index 10f3c3fcccf6c2ebb94c6b14b8df43139992d97f..32ae77bab493b67eb052581867ce1d9afa236792 100644 (file)
@@ -38,8 +38,6 @@
 #define WIDTH_OVERHEAD_SUBTRACT 40
 #define HEIGHT_OVERHEAD 15
 
-IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControlWithItems)
-
 void wxChoiceCallback (Widget w, XtPointer clientData,
                        XtPointer ptr);
 
index 0f5d8a4f8715d99fb13e696b7b44e62558bf2a95..05d1a89e9b814393bf5157f9f5f363c2596d209a 100644 (file)
@@ -32,8 +32,6 @@
 
 #include "wx/motif/private.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
-
 wxCOMPILE_TIME_ASSERT( sizeof(WXPixel) == sizeof(Pixel), PixelSizeIsOk );
 
 // Colour
index 618c22de04929b8134d8d406abf8d6738ea5cddb..9291ad72fb99f138a65bb54a7966c7d48aa021dc 100644 (file)
@@ -62,8 +62,6 @@ extern wxList wxModelessWindows;  // Frames and modeless dialogs
 
 #define wxUSE_INVISIBLE_RESIZE 1
 
-IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)
-
 wxDialog::wxDialog()
 {
     m_modalShowing = false;
index ea5e99675873e3a34a1b05edd9e4621c35728f92..51755c4a1e318c9bf8d9da15ef331ffcbe68ecdc 100644 (file)
@@ -91,8 +91,6 @@ BEGIN_EVENT_TABLE(wxFrame, wxFrameBase)
     EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged)
 END_EVENT_TABLE()
 
-IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow)
-
 // ============================================================================
 // implementation
 // ============================================================================
index 4ccdf87265d359bc8bccf2375a231e8e9411fdbb..c63649ca06fe25ad47ac02fafc428868094a45a0 100644 (file)
@@ -44,8 +44,6 @@
 #endif
 #include "wx/motif/private.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl)
-
 #if !wxCHECK_MOTIF_VERSION( 2, 0 ) || wxCHECK_LESSTIF()
 
 // XmGauge copyright notice:
index 4d593370235acbf183fc69025b3c221f13c2e04e..b0ab1011abf8349ff99695a52ff56e099701ba11 100644 (file)
@@ -33,8 +33,6 @@
 #endif
 #include "wx/motif/private.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControlWithItems)
-
 static void wxListBoxCallback(Widget w,
                               XtPointer clientData,
                               XmListCallbackStruct * cbs);
index 98741b960af028edebae618023ebc4d83893d034..d6832a3f6df942ca99731bb237740045cf506b28 100644 (file)
@@ -32,8 +32,6 @@
 void wxRadioButtonCallback (Widget w, XtPointer clientData,
                             XmToggleButtonCallbackStruct * cbs);
 
-IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
-
 wxRadioButton::wxRadioButton()
 {
 }
index f12accfcf817e51add05caa927a53297e218842c..3b53a731df98cb44c38e6b507b288c48f3d36026 100644 (file)
@@ -28,8 +28,6 @@
 static void wxScrollBarCallback(Widget widget, XtPointer clientData,
                         XmScaleCallbackStruct *cbs);
 
-IMPLEMENT_DYNAMIC_CLASS(wxScrollBar, wxControl)
-
 // Scrollbar
 bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
            const wxPoint& pos,
index 192b4633e8eb5c05f08c28643248c1ce5234a12f..70c5c66a24aa3a94624fab6521cc04c5e45c514a 100644 (file)
@@ -36,8 +36,6 @@
 
 static void wxSliderCallback (Widget widget, XtPointer clientData, XmScaleCallbackStruct * cbs);
 
-IMPLEMENT_DYNAMIC_CLASS(wxSlider, wxControl)
-
 BEGIN_EVENT_TABLE(wxSlider, wxControl)
 END_EVENT_TABLE()
 
index 6286212ced3e139d6d969083590331df271056a1..44c4baf6f035338d8b3d264f7bd8ac47d57ca795 100644 (file)
@@ -241,9 +241,6 @@ bool wxArrowButton::Create( wxSpinButton* parent,
 // wxSpinButton
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl)
-IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent)
-
 static void CalcSizes( const wxPoint& pt, const wxSize& sz,
                        wxPoint& pt1, wxSize& sz1,
                        wxPoint& pt2, wxSize& sz2,
index 89a74c3792d27dfcc38404b36048635dffad6f55..548ae9777aa2a3c35075d1f4df40309db34ec215 100644 (file)
@@ -26,8 +26,6 @@
 
 #include "wx/motif/private.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
-
 /*
  * wxStaticBitmap
  */
index 1a175f9910fa9cb04eb3ffe5bf7e6ae3ab405307..2ea22aee4dc3cb3c0d1902ac93d188a7d06dfaff 100644 (file)
@@ -29,8 +29,6 @@
 
 #include "wx/motif/private.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl)
-
 BEGIN_EVENT_TABLE(wxStaticBox, wxControl)
 //EVT_ERASE_BACKGROUND(wxStaticBox::OnEraseBackground)
 END_EVENT_TABLE()
index 5ddee743906ae752bb88abe5ce82c1bcdb24abea..949aca7d198c801ed8ccadd89ca0b4cf1104d8b7 100644 (file)
@@ -26,8 +26,6 @@
 
 #include "wx/motif/private.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl)
-
 bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
            const wxString& label,
            const wxPoint& pos,
index 4cd726bc0434eeaed8541f0f60f1e15fd7d43e64..2da2f34990b6d3f1e868d4fdaa52d46821ab51f4 100644 (file)
@@ -59,8 +59,6 @@ static void wxTextWindowGainFocusProc(Widget w, XtPointer clientData, XmAnyCallb
 static void wxTextWindowLoseFocusProc(Widget w, XtPointer clientData, XmAnyCallbackStruct *cbs);
 static void wxTextWindowActivateProc(Widget w, XtPointer clientData, XmAnyCallbackStruct *ptr);
 
-    IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxTextCtrlBase)
-
     BEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase)
         EVT_DROP_FILES(wxTextCtrl::OnDropFiles)
         EVT_CHAR(wxTextCtrl::OnChar)
index 257d9ce95330b54e9f3366b7f6f1ee0a315a5291..9fa2c9e3dc0898d3b57011a70daa6544a176c40d 100644 (file)
@@ -132,8 +132,6 @@ static int str16len(const char *s)
 // event tables
 // ----------------------------------------------------------------------------
 
-    IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowBase)
-
     BEGIN_EVENT_TABLE(wxWindow, wxWindowBase)
         EVT_SYS_COLOUR_CHANGED(wxWindow::OnSysColourChanged)
     END_EVENT_TABLE()
index 217b1aec6393490e1b79ef23a1991729d54cc579..8cf3fc95ace7fd6173909b7e7dfe61e6cf0fe67a 100644 (file)
 // macros
 // ----------------------------------------------------------------------------
 
-#if wxUSE_EXTENDED_RTTI
-
-WX_DEFINE_FLAGS( wxBitmapButtonStyle )
-
-wxBEGIN_FLAGS( wxBitmapButtonStyle )
-    // new style border flags, we put them first to
-    // use them for streaming out
-    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-    wxFLAGS_MEMBER(wxBORDER_RAISED)
-    wxFLAGS_MEMBER(wxBORDER_STATIC)
-    wxFLAGS_MEMBER(wxBORDER_NONE)
-
-    // old style border flags
-    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-    wxFLAGS_MEMBER(wxRAISED_BORDER)
-    wxFLAGS_MEMBER(wxSTATIC_BORDER)
-    wxFLAGS_MEMBER(wxBORDER)
-
-    // standard window styles
-    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-    wxFLAGS_MEMBER(wxWANTS_CHARS)
-    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
-    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
-    wxFLAGS_MEMBER(wxVSCROLL)
-    wxFLAGS_MEMBER(wxHSCROLL)
-
-    wxFLAGS_MEMBER(wxBU_AUTODRAW)
-    wxFLAGS_MEMBER(wxBU_LEFT)
-    wxFLAGS_MEMBER(wxBU_RIGHT)
-    wxFLAGS_MEMBER(wxBU_TOP)
-    wxFLAGS_MEMBER(wxBU_BOTTOM)
-wxEND_FLAGS( wxBitmapButtonStyle )
-
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxBitmapButton, wxButton,"wx/bmpbuttn.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxBitmapButton)
-    wxPROPERTY_FLAGS( WindowStyle , wxBitmapButtonStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE, 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
-wxEND_PROPERTIES_TABLE()
-
-wxBEGIN_HANDLERS_TABLE(wxBitmapButton)
-wxEND_HANDLERS_TABLE()
-
-wxCONSTRUCTOR_5( wxBitmapButton , wxWindow* , Parent , wxWindowID , Id , wxBitmap , Bitmap , wxPoint , Position , wxSize , Size )
-
-#else
-IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton)
-#endif
-
 BEGIN_EVENT_TABLE(wxBitmapButton, wxBitmapButtonBase)
     EVT_SYS_COLOUR_CHANGED(wxBitmapButton::OnSysColourChanged)
 END_EVENT_TABLE()
index 9d7fa154a70b631f185d4f09d2c0f0928b7f27ea..c5789687fe39459bb14f43d64f52937a8c558f92 100644 (file)
@@ -353,67 +353,6 @@ private:
 // macros
 // ----------------------------------------------------------------------------
 
-#if wxUSE_EXTENDED_RTTI
-
-WX_DEFINE_FLAGS( wxButtonStyle )
-
-wxBEGIN_FLAGS( wxButtonStyle )
-    // new style border flags, we put them first to
-    // use them for streaming out
-    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-    wxFLAGS_MEMBER(wxBORDER_RAISED)
-    wxFLAGS_MEMBER(wxBORDER_STATIC)
-    wxFLAGS_MEMBER(wxBORDER_NONE)
-
-    // old style border flags
-    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-    wxFLAGS_MEMBER(wxRAISED_BORDER)
-    wxFLAGS_MEMBER(wxSTATIC_BORDER)
-    wxFLAGS_MEMBER(wxBORDER)
-
-    // standard window styles
-    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-    wxFLAGS_MEMBER(wxWANTS_CHARS)
-    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
-    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
-    wxFLAGS_MEMBER(wxVSCROLL)
-    wxFLAGS_MEMBER(wxHSCROLL)
-
-    wxFLAGS_MEMBER(wxBU_LEFT)
-    wxFLAGS_MEMBER(wxBU_RIGHT)
-    wxFLAGS_MEMBER(wxBU_TOP)
-    wxFLAGS_MEMBER(wxBU_BOTTOM)
-    wxFLAGS_MEMBER(wxBU_EXACTFIT)
-wxEND_FLAGS( wxButtonStyle )
-
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxButton, wxControl,"wx/button.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxButton)
-    wxEVENT_PROPERTY( Click , wxEVT_COMMAND_BUTTON_CLICKED , wxCommandEvent)
-
-    wxPROPERTY( Font , wxFont , SetFont , GetFont  , EMPTY_MACROVALUE, 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY( Label, wxString , SetLabel, GetLabel, wxString(), 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
-
-    wxPROPERTY_FLAGS( WindowStyle , wxButtonStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
-
-wxEND_PROPERTIES_TABLE()
-
-wxBEGIN_HANDLERS_TABLE(wxButton)
-wxEND_HANDLERS_TABLE()
-
-wxCONSTRUCTOR_6( wxButton , wxWindow* , Parent , wxWindowID , Id , wxString , Label , wxPoint , Position , wxSize , Size , long , WindowStyle  )
-
-
-#else
-IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
-#endif
-
 // ============================================================================
 // implementation
 // ============================================================================
index 2a9e8643ef0cf99636b1b8eaf7ea37ddffcd5588..a4e49c8ccb6ac920150e937b37d09fdd55262831 100644 (file)
@@ -79,59 +79,6 @@ enum
 // implementation
 // ============================================================================
 
-#if wxUSE_EXTENDED_RTTI
-WX_DEFINE_FLAGS( wxCheckBoxStyle )
-
-wxBEGIN_FLAGS( wxCheckBoxStyle )
-    // new style border flags, we put them first to
-    // use them for streaming out
-    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-    wxFLAGS_MEMBER(wxBORDER_RAISED)
-    wxFLAGS_MEMBER(wxBORDER_STATIC)
-    wxFLAGS_MEMBER(wxBORDER_NONE)
-
-    // old style border flags
-    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-    wxFLAGS_MEMBER(wxRAISED_BORDER)
-    wxFLAGS_MEMBER(wxSTATIC_BORDER)
-    wxFLAGS_MEMBER(wxNO_BORDER)
-
-    // standard window styles
-    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-    wxFLAGS_MEMBER(wxWANTS_CHARS)
-    wxFLAGS_MEMBER(wxNO_FULL_REPAINT_ON_RESIZE)
-    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
-    wxFLAGS_MEMBER(wxVSCROLL)
-    wxFLAGS_MEMBER(wxHSCROLL)
-
-wxEND_FLAGS( wxCheckBoxStyle )
-
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxCheckBox, wxControl,"wx/checkbox.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxCheckBox)
-    wxEVENT_PROPERTY( Click , wxEVT_COMMAND_CHECKBOX_CLICKED , wxCommandEvent )
-
-    wxPROPERTY( Font , wxFont , SetFont , GetFont , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY( Label,wxString, SetLabel, GetLabel, wxString() , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY( Value ,bool, SetValue, GetValue, EMPTY_MACROVALUE, 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY_FLAGS( WindowStyle , wxCheckBoxStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE, 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
-wxEND_PROPERTIES_TABLE()
-
-wxBEGIN_HANDLERS_TABLE(wxCheckBox)
-wxEND_HANDLERS_TABLE()
-
-wxCONSTRUCTOR_6( wxCheckBox , wxWindow* , Parent , wxWindowID , Id , wxString , Label , wxPoint , Position , wxSize , Size , long , WindowStyle )
-#else
-IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl)
-#endif
-
-
 // ----------------------------------------------------------------------------
 // wxCheckBox creation
 // ----------------------------------------------------------------------------
index 5b7f131e0b5fc30fd1883dd82462544a256f8106..64c39293281065128fe8e8786df08a1f4997e145 100644 (file)
 
 #include "wx/msw/private.h"
 
-#if wxUSE_EXTENDED_RTTI
-WX_DEFINE_FLAGS( wxChoiceStyle )
-
-wxBEGIN_FLAGS( wxChoiceStyle )
-    // new style border flags, we put them first to
-    // use them for streaming out
-    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-    wxFLAGS_MEMBER(wxBORDER_RAISED)
-    wxFLAGS_MEMBER(wxBORDER_STATIC)
-    wxFLAGS_MEMBER(wxBORDER_NONE)
-
-    // old style border flags
-    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-    wxFLAGS_MEMBER(wxRAISED_BORDER)
-    wxFLAGS_MEMBER(wxSTATIC_BORDER)
-    wxFLAGS_MEMBER(wxBORDER)
-
-    // standard window styles
-    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-    wxFLAGS_MEMBER(wxWANTS_CHARS)
-    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
-    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
-    wxFLAGS_MEMBER(wxVSCROLL)
-    wxFLAGS_MEMBER(wxHSCROLL)
-
-wxEND_FLAGS( wxChoiceStyle )
-
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxChoice, wxControlWithItems,"wx/choice.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxChoice)
-    wxEVENT_PROPERTY( Select , wxEVT_COMMAND_CHOICE_SELECTED , wxCommandEvent )
-
-    wxPROPERTY( Font , wxFont , SetFont , GetFont  , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY_COLLECTION( Choices , wxArrayString , wxString , AppendString , GetStrings , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY( Selection ,int, SetSelection, GetSelection, EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY_FLAGS( WindowStyle , wxChoiceStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
-wxEND_PROPERTIES_TABLE()
-
-wxBEGIN_HANDLERS_TABLE(wxChoice)
-wxEND_HANDLERS_TABLE()
-
-wxCONSTRUCTOR_4( wxChoice , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size )
-#else
-IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControlWithItems)
-#endif
-/*
-    TODO PROPERTIES
-        selection (long)
-        content (list)
-            item
-*/
-
 // ============================================================================
 // implementation
 // ============================================================================
index 9a9a13f98cb15c5aa380039ec223acd0f9edd505..15da19612c9fd7b3d10a54e4f7d2ebcbbb7ab9ee 100644 (file)
 
 #include <string.h>
 
-#if wxUSE_EXTENDED_RTTI
-
-template<> void wxStringReadValue(const wxString &s , wxColour &data )
-{
-    if ( !data.Set(s) )
-    {
-        wxLogError(_("String To Colour : Incorrect colour specification : %s"),
-            s.c_str() );
-        data = wxNullColour;
-    }
-}
-
-template<> void wxStringWriteValue(wxString &s , const wxColour &data )
-{
-    s = data.GetAsString(wxC2S_HTML_SYNTAX);
-}
-
-wxTO_STRING_IMP( wxColour )
-wxFROM_STRING_IMP( wxColour )
-
-IMPLEMENT_DYNAMIC_CLASS_WITH_COPY_AND_STREAMERS_XTI( wxColour , wxObject , "wx/colour.h" ,  &wxTO_STRING( wxColour ) , &wxFROM_STRING( wxColour ))
-
-wxBEGIN_PROPERTIES_TABLE(wxColour)
-    wxREADONLY_PROPERTY( Red, unsigned char, Red, EMPTY_MACROVALUE , 0 /*flags*/, wxT("Helpstring"), wxT("group"))
-    wxREADONLY_PROPERTY( Green, unsigned char, Green, EMPTY_MACROVALUE , 0 /*flags*/, wxT("Helpstring"), wxT("group"))
-    wxREADONLY_PROPERTY( Blue, unsigned char, Blue, EMPTY_MACROVALUE , 0 /*flags*/, wxT("Helpstring"), wxT("group"))
-wxEND_PROPERTIES_TABLE()
-
-wxDIRECT_CONSTRUCTOR_3( wxColour, unsigned char, Red, unsigned char, Green, unsigned char, Blue )
-
-wxBEGIN_HANDLERS_TABLE(wxColour)
-wxEND_HANDLERS_TABLE()
-#else
-IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
-#endif
-
 // Colour
 
 void wxColour::Init()
index 94f6140d50cd9a8221ba13bdbbb503a3ae988cb1..c5a74dc211f2f993f8bd0a143ae044414e6c207e 100644 (file)
 // wxWin macros
 // ----------------------------------------------------------------------------
 
-#if wxUSE_EXTENDED_RTTI
-WX_DEFINE_FLAGS( wxComboBoxStyle )
-
-wxBEGIN_FLAGS( wxComboBoxStyle )
-    // new style border flags, we put them first to
-    // use them for streaming out
-    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-    wxFLAGS_MEMBER(wxBORDER_RAISED)
-    wxFLAGS_MEMBER(wxBORDER_STATIC)
-    wxFLAGS_MEMBER(wxBORDER_NONE)
-
-    // old style border flags
-    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-    wxFLAGS_MEMBER(wxRAISED_BORDER)
-    wxFLAGS_MEMBER(wxSTATIC_BORDER)
-    wxFLAGS_MEMBER(wxBORDER)
-
-    // standard window styles
-    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-    wxFLAGS_MEMBER(wxWANTS_CHARS)
-    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
-    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
-    wxFLAGS_MEMBER(wxVSCROLL)
-    wxFLAGS_MEMBER(wxHSCROLL)
-
-    wxFLAGS_MEMBER(wxCB_SIMPLE)
-    wxFLAGS_MEMBER(wxCB_SORT)
-    wxFLAGS_MEMBER(wxCB_READONLY)
-    wxFLAGS_MEMBER(wxCB_DROPDOWN)
-
-wxEND_FLAGS( wxComboBoxStyle )
-
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxComboBox, wxChoice,"wx/combobox.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxComboBox)
-    wxEVENT_PROPERTY( Select , wxEVT_COMMAND_COMBOBOX_SELECTED , wxCommandEvent )
-    wxEVENT_PROPERTY( TextEnter , wxEVT_COMMAND_TEXT_ENTER , wxCommandEvent )
-
-    // TODO DELEGATES
-    wxPROPERTY( Font , wxFont , SetFont , GetFont  , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY_COLLECTION( Choices , wxArrayString , wxString , AppendString , GetStrings , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY( Value ,wxString, SetValue, GetValue, EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY( Selection ,int, SetSelection, GetSelection, EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY_FLAGS( WindowStyle , wxComboBoxStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
-wxEND_PROPERTIES_TABLE()
-
-wxBEGIN_HANDLERS_TABLE(wxComboBox)
-wxEND_HANDLERS_TABLE()
-
-wxCONSTRUCTOR_5( wxComboBox , wxWindow* , Parent , wxWindowID , Id , wxString , Value , wxPoint , Position , wxSize , Size )
-
-#else
-
-IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxChoice)
-
-#endif
-
 BEGIN_EVENT_TABLE(wxComboBox, wxControl)
     EVT_MENU(wxID_CUT, wxComboBox::OnCut)
     EVT_MENU(wxID_COPY, wxComboBox::OnCopy)
index 592c23a9bc2252bef135cfe23243e2d5247e351f..b883fd5be45603438242907806694e8a28a751c4 100644 (file)
 // wxWin macros
 // ----------------------------------------------------------------------------
 
-#if wxUSE_EXTENDED_RTTI
-WX_DEFINE_FLAGS( wxDialogStyle )
-
-wxBEGIN_FLAGS( wxDialogStyle )
-    // new style border flags, we put them first to
-    // use them for streaming out
-    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-    wxFLAGS_MEMBER(wxBORDER_RAISED)
-    wxFLAGS_MEMBER(wxBORDER_STATIC)
-    wxFLAGS_MEMBER(wxBORDER_NONE)
-
-    // old style border flags
-    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-    wxFLAGS_MEMBER(wxRAISED_BORDER)
-    wxFLAGS_MEMBER(wxSTATIC_BORDER)
-    wxFLAGS_MEMBER(wxNO_BORDER)
-
-    // standard window styles
-    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-
-    // dialog styles
-    wxFLAGS_MEMBER(wxWS_EX_VALIDATE_RECURSIVELY)
-    wxFLAGS_MEMBER(wxSTAY_ON_TOP)
-    wxFLAGS_MEMBER(wxCAPTION)
-#if WXWIN_COMPATIBILITY_2_6
-    wxFLAGS_MEMBER(wxTHICK_FRAME)
-#endif // WXWIN_COMPATIBILITY_2_6
-    wxFLAGS_MEMBER(wxSYSTEM_MENU)
-    wxFLAGS_MEMBER(wxRESIZE_BORDER)
-#if WXWIN_COMPATIBILITY_2_6
-    wxFLAGS_MEMBER(wxRESIZE_BOX)
-#endif // WXWIN_COMPATIBILITY_2_6
-    wxFLAGS_MEMBER(wxCLOSE_BOX)
-    wxFLAGS_MEMBER(wxMAXIMIZE_BOX)
-    wxFLAGS_MEMBER(wxMINIMIZE_BOX)
-wxEND_FLAGS( wxDialogStyle )
-
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxDialog, wxTopLevelWindow,"wx/dialog.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxDialog)
-    wxPROPERTY( Title, wxString, SetTitle, GetTitle, wxString() , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY_FLAGS( WindowStyle , wxDialogStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
-wxEND_PROPERTIES_TABLE()
-
-wxBEGIN_HANDLERS_TABLE(wxDialog)
-wxEND_HANDLERS_TABLE()
-
-wxCONSTRUCTOR_6( wxDialog , wxWindow* , Parent , wxWindowID , Id , wxString , Title , wxPoint , Position , wxSize , Size , long , WindowStyle)
-
-#else
-IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)
-#endif
-
 // ----------------------------------------------------------------------------
 // wxDialogModalData
 // ----------------------------------------------------------------------------
index 077b030d33fb094489f7af1adb2961216ed168b2..c1c96bb1cebe37bda4113bd13f61ee023db7d4d2 100644 (file)
@@ -73,78 +73,6 @@ BEGIN_EVENT_TABLE(wxFrame, wxFrameBase)
     EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged)
 END_EVENT_TABLE()
 
-#if wxUSE_EXTENDED_RTTI
-WX_DEFINE_FLAGS( wxFrameStyle )
-
-wxBEGIN_FLAGS( wxFrameStyle )
-    // new style border flags, we put them first to
-    // use them for streaming out
-    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-    wxFLAGS_MEMBER(wxBORDER_RAISED)
-    wxFLAGS_MEMBER(wxBORDER_STATIC)
-    wxFLAGS_MEMBER(wxBORDER_NONE)
-
-    // old style border flags
-    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-    wxFLAGS_MEMBER(wxRAISED_BORDER)
-    wxFLAGS_MEMBER(wxSTATIC_BORDER)
-    wxFLAGS_MEMBER(wxBORDER)
-
-    // standard window styles
-    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-    wxFLAGS_MEMBER(wxWANTS_CHARS)
-    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
-    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
-    wxFLAGS_MEMBER(wxVSCROLL)
-    wxFLAGS_MEMBER(wxHSCROLL)
-
-    // frame styles
-    wxFLAGS_MEMBER(wxSTAY_ON_TOP)
-    wxFLAGS_MEMBER(wxCAPTION)
-#if WXWIN_COMPATIBILITY_2_6
-    wxFLAGS_MEMBER(wxTHICK_FRAME)
-#endif // WXWIN_COMPATIBILITY_2_6
-    wxFLAGS_MEMBER(wxSYSTEM_MENU)
-    wxFLAGS_MEMBER(wxRESIZE_BORDER)
-#if WXWIN_COMPATIBILITY_2_6
-    wxFLAGS_MEMBER(wxRESIZE_BOX)
-#endif // WXWIN_COMPATIBILITY_2_6
-    wxFLAGS_MEMBER(wxCLOSE_BOX)
-    wxFLAGS_MEMBER(wxMAXIMIZE_BOX)
-    wxFLAGS_MEMBER(wxMINIMIZE_BOX)
-
-    wxFLAGS_MEMBER(wxFRAME_TOOL_WINDOW)
-    wxFLAGS_MEMBER(wxFRAME_FLOAT_ON_PARENT)
-
-    wxFLAGS_MEMBER(wxFRAME_SHAPED)
-
-wxEND_FLAGS( wxFrameStyle )
-
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxFrame, wxTopLevelWindow,"wx/frame.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxFrame)
-    wxEVENT_PROPERTY( Menu , wxEVT_COMMAND_MENU_SELECTED , wxCommandEvent)
-
-    wxPROPERTY( Title,wxString, SetTitle, GetTitle, wxString() , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY_FLAGS( WindowStyle , wxFrameStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
-    wxPROPERTY( MenuBar , wxMenuBar * , SetMenuBar , GetMenuBar , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-wxEND_PROPERTIES_TABLE()
-
-wxBEGIN_HANDLERS_TABLE(wxFrame)
-wxEND_HANDLERS_TABLE()
-
-wxCONSTRUCTOR_6( wxFrame , wxWindow* , Parent , wxWindowID , Id , wxString , Title , wxPoint , Position , wxSize , Size , long , WindowStyle)
-
-#else
-IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow)
-#endif
-
 // ============================================================================
 // implementation
 // ============================================================================
index 69286856bcdff214d70fde48306201ad5e563cbb..1ed1025408e878367fc8fc9f82860348eec3b96f 100644 (file)
 // wxWin macros
 // ----------------------------------------------------------------------------
 
-#if wxUSE_EXTENDED_RTTI
-WX_DEFINE_FLAGS( wxGaugeStyle )
-
-wxBEGIN_FLAGS( wxGaugeStyle )
-    // new style border flags, we put them first to
-    // use them for streaming out
-    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-    wxFLAGS_MEMBER(wxBORDER_RAISED)
-    wxFLAGS_MEMBER(wxBORDER_STATIC)
-    wxFLAGS_MEMBER(wxBORDER_NONE)
-
-    // old style border flags
-    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-    wxFLAGS_MEMBER(wxRAISED_BORDER)
-    wxFLAGS_MEMBER(wxSTATIC_BORDER)
-    wxFLAGS_MEMBER(wxBORDER)
-
-    // standard window styles
-    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-    wxFLAGS_MEMBER(wxWANTS_CHARS)
-    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
-    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
-    wxFLAGS_MEMBER(wxVSCROLL)
-    wxFLAGS_MEMBER(wxHSCROLL)
-
-    wxFLAGS_MEMBER(wxGA_HORIZONTAL)
-    wxFLAGS_MEMBER(wxGA_VERTICAL)
-#if WXWIN_COMPATIBILITY_2_6
-    wxFLAGS_MEMBER(wxGA_PROGRESSBAR)
-#endif // WXWIN_COMPATIBILITY_2_6
-    wxFLAGS_MEMBER(wxGA_SMOOTH)
-
-wxEND_FLAGS( wxGaugeStyle )
-
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxGauge, wxControl,"wx/gauge.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxGauge)
-    wxPROPERTY( Value , int , SetValue, GetValue, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY( Range , int , SetRange, GetRange, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY( ShadowWidth , int , SetShadowWidth, GetShadowWidth, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY( BezelFace , int , SetBezelFace, GetBezelFace, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY_FLAGS( WindowStyle , wxGaugeStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
-wxEND_PROPERTIES_TABLE()
-
-wxBEGIN_HANDLERS_TABLE(wxGauge)
-wxEND_HANDLERS_TABLE()
-
-wxCONSTRUCTOR_6( wxGauge , wxWindow* , Parent , wxWindowID , Id , int , Range , wxPoint , Position , wxSize , Size , long , WindowStyle )
-#else
-IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl)
-#endif
-
 // ============================================================================
 // wxGauge implementation
 // ============================================================================
index 97bbe9284072a0717466fe8c4cb7386b681b1b0d..69281add2b8f7c109a8204041fd30dd2ee868dce 100644 (file)
     #include  "wx/ownerdrw.h"
 #endif
 
-#if wxUSE_EXTENDED_RTTI
-WX_DEFINE_FLAGS( wxListBoxStyle )
-
-wxBEGIN_FLAGS( wxListBoxStyle )
-    // new style border flags, we put them first to
-    // use them for streaming out
-    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-    wxFLAGS_MEMBER(wxBORDER_RAISED)
-    wxFLAGS_MEMBER(wxBORDER_STATIC)
-    wxFLAGS_MEMBER(wxBORDER_NONE)
-
-    // old style border flags
-    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-    wxFLAGS_MEMBER(wxRAISED_BORDER)
-    wxFLAGS_MEMBER(wxSTATIC_BORDER)
-    wxFLAGS_MEMBER(wxBORDER)
-
-    // standard window styles
-    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-    wxFLAGS_MEMBER(wxWANTS_CHARS)
-    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
-    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
-    wxFLAGS_MEMBER(wxVSCROLL)
-    wxFLAGS_MEMBER(wxHSCROLL)
-
-    wxFLAGS_MEMBER(wxLB_SINGLE)
-    wxFLAGS_MEMBER(wxLB_MULTIPLE)
-    wxFLAGS_MEMBER(wxLB_EXTENDED)
-    wxFLAGS_MEMBER(wxLB_HSCROLL)
-    wxFLAGS_MEMBER(wxLB_ALWAYS_SB)
-    wxFLAGS_MEMBER(wxLB_NEEDED_SB)
-    wxFLAGS_MEMBER(wxLB_NO_SB)
-    wxFLAGS_MEMBER(wxLB_SORT)
-
-wxEND_FLAGS( wxListBoxStyle )
-
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxListBox, wxControlWithItems,"wx/listbox.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxListBox)
-    wxEVENT_PROPERTY( Select , wxEVT_COMMAND_LISTBOX_SELECTED , wxCommandEvent )
-    wxEVENT_PROPERTY( DoubleClick , wxEVT_COMMAND_LISTBOX_DOUBLECLICKED , wxCommandEvent )
-
-    wxPROPERTY( Font , wxFont , SetFont , GetFont  , EMPTY_MACROVALUE, 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY_COLLECTION( Choices , wxArrayString , wxString , AppendString , GetStrings, 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
-    wxPROPERTY( Selection ,int, SetSelection, GetSelection, EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
-    wxPROPERTY_FLAGS( WindowStyle , wxListBoxStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
-wxEND_PROPERTIES_TABLE()
-
-wxBEGIN_HANDLERS_TABLE(wxListBox)
-wxEND_HANDLERS_TABLE()
-
-wxCONSTRUCTOR_4( wxListBox , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size )
-#else
-IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControlWithItems)
-#endif
-
-/*
-TODO PROPERTIES
-    selection
-    content
-        item
-*/
-
 // ============================================================================
 // list box item declaration and implementation
 // ============================================================================
index ed4d99e45699e722d5c99508599eba68076f70d3..13525bf4b8dca432a55cdfbda8729ed74b67ce1a 100644 (file)
@@ -225,79 +225,6 @@ public:
     wxDECLARE_NO_COPY_CLASS(wxMSWListItemData);
 };
 
-#if wxUSE_EXTENDED_RTTI
-WX_DEFINE_FLAGS( wxListCtrlStyle )
-
-wxBEGIN_FLAGS( wxListCtrlStyle )
-    // new style border flags, we put them first to
-    // use them for streaming out
-    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-    wxFLAGS_MEMBER(wxBORDER_RAISED)
-    wxFLAGS_MEMBER(wxBORDER_STATIC)
-    wxFLAGS_MEMBER(wxBORDER_NONE)
-
-    // old style border flags
-    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-    wxFLAGS_MEMBER(wxRAISED_BORDER)
-    wxFLAGS_MEMBER(wxSTATIC_BORDER)
-    wxFLAGS_MEMBER(wxBORDER)
-
-    // standard window styles
-    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-    wxFLAGS_MEMBER(wxWANTS_CHARS)
-    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
-    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
-    wxFLAGS_MEMBER(wxVSCROLL)
-    wxFLAGS_MEMBER(wxHSCROLL)
-
-    wxFLAGS_MEMBER(wxLC_LIST)
-    wxFLAGS_MEMBER(wxLC_REPORT)
-    wxFLAGS_MEMBER(wxLC_ICON)
-    wxFLAGS_MEMBER(wxLC_SMALL_ICON)
-    wxFLAGS_MEMBER(wxLC_ALIGN_TOP)
-    wxFLAGS_MEMBER(wxLC_ALIGN_LEFT)
-    wxFLAGS_MEMBER(wxLC_AUTOARRANGE)
-    wxFLAGS_MEMBER(wxLC_USER_TEXT)
-    wxFLAGS_MEMBER(wxLC_EDIT_LABELS)
-    wxFLAGS_MEMBER(wxLC_NO_HEADER)
-    wxFLAGS_MEMBER(wxLC_SINGLE_SEL)
-    wxFLAGS_MEMBER(wxLC_SORT_ASCENDING)
-    wxFLAGS_MEMBER(wxLC_SORT_DESCENDING)
-    wxFLAGS_MEMBER(wxLC_VIRTUAL)
-
-wxEND_FLAGS( wxListCtrlStyle )
-
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxListCtrl, wxControl,"wx/listctrl.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxListCtrl)
-    wxEVENT_PROPERTY( TextUpdated , wxEVT_COMMAND_TEXT_UPDATED , wxCommandEvent )
-
-    wxPROPERTY_FLAGS( WindowStyle , wxListCtrlStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
-wxEND_PROPERTIES_TABLE()
-
-wxBEGIN_HANDLERS_TABLE(wxListCtrl)
-wxEND_HANDLERS_TABLE()
-
-wxCONSTRUCTOR_5( wxListCtrl , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle )
-
-/*
- TODO : Expose more information of a list's layout etc. via appropriate objects (a la NotebookPageInfo)
-*/
-#else
-IMPLEMENT_DYNAMIC_CLASS(wxListCtrl, wxControl)
-#endif
-
-IMPLEMENT_DYNAMIC_CLASS(wxListView, wxListCtrl)
-IMPLEMENT_DYNAMIC_CLASS(wxListItem, wxObject)
-
-IMPLEMENT_DYNAMIC_CLASS(wxListEvent, wxNotifyEvent)
-
 BEGIN_EVENT_TABLE(wxListCtrl, wxControl)
     EVT_PAINT(wxListCtrl::OnPaint)
 END_EVENT_TABLE()
index 01e5fd8dbb6966bf60fbb39fba45717556cee884..bc0fa69092f0a28005eaf5b9ff6c7223aa73cd8f 100644 (file)
 // wxRadioButton creation
 // ----------------------------------------------------------------------------
 
-
-#if wxUSE_EXTENDED_RTTI
-WX_DEFINE_FLAGS( wxRadioButtonStyle )
-
-wxBEGIN_FLAGS( wxRadioButtonStyle )
-    // new style border flags, we put them first to
-    // use them for streaming out
-    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-    wxFLAGS_MEMBER(wxBORDER_RAISED)
-    wxFLAGS_MEMBER(wxBORDER_STATIC)
-    wxFLAGS_MEMBER(wxBORDER_NONE)
-
-    // old style border flags
-    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-    wxFLAGS_MEMBER(wxRAISED_BORDER)
-    wxFLAGS_MEMBER(wxSTATIC_BORDER)
-    wxFLAGS_MEMBER(wxBORDER)
-
-    // standard window styles
-    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-    wxFLAGS_MEMBER(wxWANTS_CHARS)
-    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
-    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
-    wxFLAGS_MEMBER(wxVSCROLL)
-    wxFLAGS_MEMBER(wxHSCROLL)
-
-    wxFLAGS_MEMBER(wxRB_GROUP)
-
-wxEND_FLAGS( wxRadioButtonStyle )
-
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxRadioButton, wxControl,"wx/radiobut.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxRadioButton)
-    wxEVENT_PROPERTY( Click , wxEVT_COMMAND_RADIOBUTTON_SELECTED , wxCommandEvent )
-    wxPROPERTY( Font , wxFont , SetFont , GetFont  , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY( Label,wxString, SetLabel, GetLabel, wxString(), 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
-    wxPROPERTY( Value ,bool, SetValue, GetValue, EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
-    wxPROPERTY_FLAGS( WindowStyle , wxRadioButtonStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
-wxEND_PROPERTIES_TABLE()
-
-wxBEGIN_HANDLERS_TABLE(wxRadioButton)
-wxEND_HANDLERS_TABLE()
-
-wxCONSTRUCTOR_6( wxRadioButton , wxWindow* , Parent , wxWindowID , Id , wxString , Label , wxPoint , Position , wxSize , Size , long , WindowStyle )
-
-#else
-IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
-#endif
-
-
 void wxRadioButton::Init()
 {
     m_isChecked = false;
index f45e294396ad2527f2b47d7fe59725ad314a6013..ce238227dbfbb135d649f8d94bfeac2fbeab6ae7 100644 (file)
 
 #include "wx/msw/private.h"
 
-#if wxUSE_EXTENDED_RTTI
-WX_DEFINE_FLAGS( wxScrollBarStyle )
-
-wxBEGIN_FLAGS( wxScrollBarStyle )
-    // new style border flags, we put them first to
-    // use them for streaming out
-    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-    wxFLAGS_MEMBER(wxBORDER_RAISED)
-    wxFLAGS_MEMBER(wxBORDER_STATIC)
-    wxFLAGS_MEMBER(wxBORDER_NONE)
-
-    // old style border flags
-    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-    wxFLAGS_MEMBER(wxRAISED_BORDER)
-    wxFLAGS_MEMBER(wxSTATIC_BORDER)
-    wxFLAGS_MEMBER(wxBORDER)
-
-    // standard window styles
-    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-    wxFLAGS_MEMBER(wxWANTS_CHARS)
-    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
-    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
-    wxFLAGS_MEMBER(wxVSCROLL)
-    wxFLAGS_MEMBER(wxHSCROLL)
-
-    wxFLAGS_MEMBER(wxSB_HORIZONTAL)
-    wxFLAGS_MEMBER(wxSB_VERTICAL)
-
-wxEND_FLAGS( wxScrollBarStyle )
-
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxScrollBar, wxControl,"wx/scrolbar.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxScrollBar)
-    wxEVENT_RANGE_PROPERTY( Scroll , wxEVT_SCROLL_TOP , wxEVT_SCROLL_CHANGED , wxScrollEvent )
-
-    wxPROPERTY( ThumbPosition , int , SetThumbPosition, GetThumbPosition, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY( Range , int , SetRange, GetRange, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY( ThumbSize , int , SetThumbSize, GetThumbSize, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY( PageSize , int , SetPageSize, GetPageSize, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY_FLAGS( WindowStyle , wxScrollBarStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
-wxEND_PROPERTIES_TABLE()
-
-wxBEGIN_HANDLERS_TABLE(wxScrollBar)
-wxEND_HANDLERS_TABLE()
-
-wxCONSTRUCTOR_5( wxScrollBar , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle )
-#else
-IMPLEMENT_DYNAMIC_CLASS(wxScrollBar, wxControl)
-#endif
-
 // Scrollbar
 bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
            const wxPoint& pos,
index ffa5d3919aeed708dc0e415c54bbd75e1170d208..3eb922c534cab47b92adcc2cbffdab972a7c7eb6 100644 (file)
@@ -63,80 +63,6 @@ const int TICK = 8;
 
 } // anonymous namespace
 
-// ----------------------------------------------------------------------------
-// XTI
-// ----------------------------------------------------------------------------
-
-#if wxUSE_EXTENDED_RTTI
-WX_DEFINE_FLAGS( wxSliderStyle )
-
-wxBEGIN_FLAGS( wxSliderStyle )
-    // new style border flags, we put them first to
-    // use them for streaming out
-    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-    wxFLAGS_MEMBER(wxBORDER_RAISED)
-    wxFLAGS_MEMBER(wxBORDER_STATIC)
-    wxFLAGS_MEMBER(wxBORDER_NONE)
-
-    // old style border flags
-    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-    wxFLAGS_MEMBER(wxRAISED_BORDER)
-    wxFLAGS_MEMBER(wxSTATIC_BORDER)
-    wxFLAGS_MEMBER(wxBORDER)
-
-    // standard window styles
-    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-    wxFLAGS_MEMBER(wxWANTS_CHARS)
-    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
-    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
-    wxFLAGS_MEMBER(wxVSCROLL)
-    wxFLAGS_MEMBER(wxHSCROLL)
-
-    wxFLAGS_MEMBER(wxSL_HORIZONTAL)
-    wxFLAGS_MEMBER(wxSL_VERTICAL)
-    wxFLAGS_MEMBER(wxSL_AUTOTICKS)
-    wxFLAGS_MEMBER(wxSL_LEFT)
-    wxFLAGS_MEMBER(wxSL_TOP)
-    wxFLAGS_MEMBER(wxSL_RIGHT)
-    wxFLAGS_MEMBER(wxSL_BOTTOM)
-    wxFLAGS_MEMBER(wxSL_BOTH)
-    wxFLAGS_MEMBER(wxSL_SELRANGE)
-    wxFLAGS_MEMBER(wxSL_INVERSE)
-    wxFLAGS_MEMBER(wxSL_MIN_MAX_LABELS)
-    wxFLAGS_MEMBER(wxSL_VALUE_LABEL)
-    wxFLAGS_MEMBER(wxSL_LABELS)
-
-wxEND_FLAGS( wxSliderStyle )
-
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxSlider, wxControl,"wx/slider.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxSlider)
-    wxEVENT_RANGE_PROPERTY( Scroll , wxEVT_SCROLL_TOP , wxEVT_SCROLL_CHANGED , wxScrollEvent )
-    wxEVENT_PROPERTY( Updated , wxEVT_COMMAND_SLIDER_UPDATED , wxCommandEvent )
-
-    wxPROPERTY( Value , int , SetValue, GetValue , 0, 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY( Minimum , int , SetMin, GetMin, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY( Maximum , int , SetMax, GetMax, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY( PageSize , int , SetPageSize, GetLineSize, 1 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY( LineSize , int , SetLineSize, GetLineSize, 1 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY( ThumbLength , int , SetThumbLength, GetThumbLength, 1 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY_FLAGS( WindowStyle , wxSliderStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
-wxEND_PROPERTIES_TABLE()
-
-wxBEGIN_HANDLERS_TABLE(wxSlider)
-wxEND_HANDLERS_TABLE()
-
-wxCONSTRUCTOR_8( wxSlider , wxWindow* , Parent , wxWindowID , Id , int , Value , int , Minimum , int , Maximum , wxPoint , Position , wxSize , Size , long , WindowStyle )
-#else
-IMPLEMENT_DYNAMIC_CLASS(wxSlider, wxControl)
-#endif
-
 // ============================================================================
 // wxSlider implementation
 // ============================================================================
index 1695f13436805fa056c7197b5f72558cf3bb5ebe..6d6f93e5b505f288a1e3f99e054c30ef0596b54b 100644 (file)
@@ -33,8 +33,6 @@
 
 #include "wx/spinbutt.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent)
-
 #include "wx/msw/private.h"
 
 #ifndef UDM_SETRANGE32
@@ -54,66 +52,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent)
 // wxWin macros
 // ----------------------------------------------------------------------------
 
-
-#if wxUSE_EXTENDED_RTTI
-WX_DEFINE_FLAGS( wxSpinButtonStyle )
-
-wxBEGIN_FLAGS( wxSpinButtonStyle )
-    // new style border flags, we put them first to
-    // use them for streaming out
-    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-    wxFLAGS_MEMBER(wxBORDER_RAISED)
-    wxFLAGS_MEMBER(wxBORDER_STATIC)
-    wxFLAGS_MEMBER(wxBORDER_NONE)
-
-    // old style border flags
-    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-    wxFLAGS_MEMBER(wxRAISED_BORDER)
-    wxFLAGS_MEMBER(wxSTATIC_BORDER)
-    wxFLAGS_MEMBER(wxBORDER)
-
-    // standard window styles
-    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-    wxFLAGS_MEMBER(wxWANTS_CHARS)
-    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
-    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
-    wxFLAGS_MEMBER(wxVSCROLL)
-    wxFLAGS_MEMBER(wxHSCROLL)
-
-    wxFLAGS_MEMBER(wxSP_HORIZONTAL)
-    wxFLAGS_MEMBER(wxSP_VERTICAL)
-    wxFLAGS_MEMBER(wxSP_ARROW_KEYS)
-    wxFLAGS_MEMBER(wxSP_WRAP)
-
-wxEND_FLAGS( wxSpinButtonStyle )
-
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxSpinButton, wxControl,"wx/spinbut.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxSpinButton)
-    wxEVENT_RANGE_PROPERTY( Spin , wxEVT_SCROLL_TOP , wxEVT_SCROLL_CHANGED , wxSpinEvent )
-
-    wxPROPERTY( Value , int , SetValue, GetValue, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY( Min , int , SetMin, GetMin, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY( Max , int , SetMax, GetMax, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY_FLAGS( WindowStyle , wxSpinButtonStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
-wxEND_PROPERTIES_TABLE()
-
-wxBEGIN_HANDLERS_TABLE(wxSpinButton)
-wxEND_HANDLERS_TABLE()
-
-wxCONSTRUCTOR_5( wxSpinButton , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle )
-#else
-IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl)
-#endif
-
-
-
 // ----------------------------------------------------------------------------
 // wxSpinButton
 // ----------------------------------------------------------------------------
index b981c09afc5712361c364bcbd07e54cca1402e90..19e302e6d498fa589189b91ababeb7d454144c25 100644 (file)
 // macros
 // ----------------------------------------------------------------------------
 
-#if wxUSE_EXTENDED_RTTI
-WX_DEFINE_FLAGS( wxSpinCtrlStyle )
-
-wxBEGIN_FLAGS( wxSpinCtrlStyle )
-    // new style border flags, we put them first to
-    // use them for streaming out
-    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-    wxFLAGS_MEMBER(wxBORDER_RAISED)
-    wxFLAGS_MEMBER(wxBORDER_STATIC)
-    wxFLAGS_MEMBER(wxBORDER_NONE)
-
-    // old style border flags
-    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-    wxFLAGS_MEMBER(wxRAISED_BORDER)
-    wxFLAGS_MEMBER(wxSTATIC_BORDER)
-    wxFLAGS_MEMBER(wxBORDER)
-
-    // standard window styles
-    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-    wxFLAGS_MEMBER(wxWANTS_CHARS)
-    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
-    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
-    wxFLAGS_MEMBER(wxVSCROLL)
-    wxFLAGS_MEMBER(wxHSCROLL)
-
-    wxFLAGS_MEMBER(wxSP_HORIZONTAL)
-    wxFLAGS_MEMBER(wxSP_VERTICAL)
-    wxFLAGS_MEMBER(wxSP_ARROW_KEYS)
-    wxFLAGS_MEMBER(wxSP_WRAP)
-
-wxEND_FLAGS( wxSpinCtrlStyle )
-
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxSpinCtrl, wxControl,"wx/spinbut.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxSpinCtrl)
-    wxEVENT_RANGE_PROPERTY( Spin , wxEVT_SCROLL_TOP , wxEVT_SCROLL_CHANGED , wxSpinEvent )
-    wxEVENT_PROPERTY( Updated , wxEVT_COMMAND_SPINCTRL_UPDATED , wxCommandEvent )
-    wxEVENT_PROPERTY( TextUpdated , wxEVT_COMMAND_TEXT_UPDATED , wxCommandEvent )
-    wxEVENT_PROPERTY( TextEnter , wxEVT_COMMAND_TEXT_ENTER , wxCommandEvent )
-
-    wxPROPERTY( ValueString , wxString , SetValue , GetValue , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) ;
-    wxPROPERTY( Value , int , SetValue, GetValue, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY( Min , int , SetMin, GetMin, 0, 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
-    wxPROPERTY( Max , int , SetMax, GetMax, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY_FLAGS( WindowStyle , wxSpinCtrlStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
-/*
-    TODO PROPERTIES
-        style wxSP_ARROW_KEYS
-*/
-wxEND_PROPERTIES_TABLE()
-
-wxBEGIN_HANDLERS_TABLE(wxSpinCtrl)
-wxEND_HANDLERS_TABLE()
-
-wxCONSTRUCTOR_6( wxSpinCtrl , wxWindow* , Parent , wxWindowID , Id , wxString , ValueString , wxPoint , Position , wxSize , Size , long , WindowStyle )
-#else
-IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl, wxControl)
-#endif
-
 BEGIN_EVENT_TABLE(wxSpinCtrl, wxSpinButton)
     EVT_CHAR(wxSpinCtrl::OnChar)
     EVT_SET_FOCUS(wxSpinCtrl::OnSetFocus)
index fbaf004ad1f5b429abc0ba5092dd1ab4b719bf7c..0b2a52706eab8f6c31019e05b6a723bcc7dff80d 100644 (file)
 // macors
 // ---------------------------------------------------------------------------
 
-#if wxUSE_EXTENDED_RTTI
-WX_DEFINE_FLAGS( wxStaticBitmapStyle )
-
-wxBEGIN_FLAGS( wxStaticBitmapStyle )
-    // new style border flags, we put them first to
-    // use them for streaming out
-    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-    wxFLAGS_MEMBER(wxBORDER_RAISED)
-    wxFLAGS_MEMBER(wxBORDER_STATIC)
-    wxFLAGS_MEMBER(wxBORDER_NONE)
-
-    // old style border flags
-    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-    wxFLAGS_MEMBER(wxRAISED_BORDER)
-    wxFLAGS_MEMBER(wxSTATIC_BORDER)
-    wxFLAGS_MEMBER(wxBORDER)
-
-    // standard window styles
-    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-    wxFLAGS_MEMBER(wxWANTS_CHARS)
-    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
-    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
-    wxFLAGS_MEMBER(wxVSCROLL)
-    wxFLAGS_MEMBER(wxHSCROLL)
-
-wxEND_FLAGS( wxStaticBitmapStyle )
-
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxStaticBitmap, wxControl,"wx/statbmp.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxStaticBitmap)
-    wxPROPERTY_FLAGS( WindowStyle , wxStaticBitmapStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE, 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
-wxEND_PROPERTIES_TABLE()
-
-wxBEGIN_HANDLERS_TABLE(wxStaticBitmap)
-wxEND_HANDLERS_TABLE()
-
-wxCONSTRUCTOR_5( wxStaticBitmap, wxWindow* , Parent , wxWindowID , Id , wxBitmap, Bitmap, wxPoint , Position , wxSize , Size )
-
-#else
-IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
-#endif
-
-/*
-    TODO PROPERTIES :
-        bitmap
-*/
-
 // ===========================================================================
 // implementation
 // ===========================================================================
index 2047e8bd4c565aeea3529415a40ce880350547f9..75306978e01fd8d987e3245d23ded74ed416cda0 100644 (file)
 // wxWin macros
 // ----------------------------------------------------------------------------
 
-#if wxUSE_EXTENDED_RTTI
-WX_DEFINE_FLAGS( wxStaticBoxStyle )
-
-wxBEGIN_FLAGS( wxStaticBoxStyle )
-    // new style border flags, we put them first to
-    // use them for streaming out
-    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-    wxFLAGS_MEMBER(wxBORDER_RAISED)
-    wxFLAGS_MEMBER(wxBORDER_STATIC)
-    wxFLAGS_MEMBER(wxBORDER_NONE)
-
-    // old style border flags
-    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-    wxFLAGS_MEMBER(wxRAISED_BORDER)
-    wxFLAGS_MEMBER(wxSTATIC_BORDER)
-    wxFLAGS_MEMBER(wxBORDER)
-
-    // standard window styles
-    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-    wxFLAGS_MEMBER(wxWANTS_CHARS)
-    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
-    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
-    wxFLAGS_MEMBER(wxVSCROLL)
-    wxFLAGS_MEMBER(wxHSCROLL)
-
-wxEND_FLAGS( wxStaticBoxStyle )
-
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxStaticBox, wxControl,"wx/statbox.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxStaticBox)
-    wxPROPERTY( Label,wxString, SetLabel, GetLabel, wxString() , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY_FLAGS( WindowStyle , wxStaticBoxStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE, 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
-/*
-    TODO PROPERTIES :
-        label
-*/
-wxEND_PROPERTIES_TABLE()
-
-wxBEGIN_HANDLERS_TABLE(wxStaticBox)
-wxEND_HANDLERS_TABLE()
-
-wxCONSTRUCTOR_6( wxStaticBox , wxWindow* , Parent , wxWindowID , Id , wxString , Label , wxPoint , Position , wxSize , Size , long , WindowStyle )
-#else
-IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl)
-#endif
-
 // ============================================================================
 // implementation
 // ============================================================================
index 24cd55c91cb527f50abd8f33ca76de86b2d2068e..a10a33176a47b3fc491126c410a537b557ca4e70 100644 (file)
 // implementation
 // ============================================================================
 
-#if wxUSE_EXTENDED_RTTI
-WX_DEFINE_FLAGS( wxStaticLineStyle )
-
-wxBEGIN_FLAGS( wxStaticLineStyle )
-    // new style border flags, we put them first to
-    // use them for streaming out
-    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-    wxFLAGS_MEMBER(wxBORDER_RAISED)
-    wxFLAGS_MEMBER(wxBORDER_STATIC)
-    wxFLAGS_MEMBER(wxBORDER_NONE)
-
-    // old style border flags
-    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-    wxFLAGS_MEMBER(wxRAISED_BORDER)
-    wxFLAGS_MEMBER(wxSTATIC_BORDER)
-    wxFLAGS_MEMBER(wxBORDER)
-
-    // standard window styles
-    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-    wxFLAGS_MEMBER(wxWANTS_CHARS)
-    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
-    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
-    wxFLAGS_MEMBER(wxVSCROLL)
-    wxFLAGS_MEMBER(wxHSCROLL)
-
-    wxFLAGS_MEMBER(wxLI_HORIZONTAL)
-    wxFLAGS_MEMBER(wxLI_VERTICAL)
-
-wxEND_FLAGS( wxStaticLineStyle )
-
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxStaticLine, wxControl,"wx/statline.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxStaticLine)
-    wxPROPERTY_FLAGS( WindowStyle , wxStaticLineStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE, 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
-wxEND_PROPERTIES_TABLE()
-
-wxBEGIN_HANDLERS_TABLE(wxStaticLine)
-wxEND_HANDLERS_TABLE()
-
-wxCONSTRUCTOR_5( wxStaticLine, wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle)
-
-#else
-IMPLEMENT_DYNAMIC_CLASS(wxStaticLine, wxControl)
-#endif
-
-/*
-    TODO PROPERTIES :
-        style (wxLI_HORIZONTAL)
-*/
-
 // ----------------------------------------------------------------------------
 // wxStaticLine
 // ----------------------------------------------------------------------------
index 572a8f8089828b7e57cd11ff8ceaeaaab86fee4f..7fdff2f500ff4b0a661118daf7e45386f4510d38 100644 (file)
 
 #include "wx/msw/private.h"
 
-#if wxUSE_EXTENDED_RTTI
-WX_DEFINE_FLAGS( wxStaticTextStyle )
-
-wxBEGIN_FLAGS( wxStaticTextStyle )
-    // new style border flags, we put them first to
-    // use them for streaming out
-    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-    wxFLAGS_MEMBER(wxBORDER_RAISED)
-    wxFLAGS_MEMBER(wxBORDER_STATIC)
-    wxFLAGS_MEMBER(wxBORDER_NONE)
-
-    // old style border flags
-    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-    wxFLAGS_MEMBER(wxRAISED_BORDER)
-    wxFLAGS_MEMBER(wxSTATIC_BORDER)
-    wxFLAGS_MEMBER(wxBORDER)
-
-    // standard window styles
-    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-    wxFLAGS_MEMBER(wxWANTS_CHARS)
-    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
-    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
-    wxFLAGS_MEMBER(wxVSCROLL)
-    wxFLAGS_MEMBER(wxHSCROLL)
-
-    wxFLAGS_MEMBER(wxST_NO_AUTORESIZE)
-    wxFLAGS_MEMBER(wxALIGN_LEFT)
-    wxFLAGS_MEMBER(wxALIGN_RIGHT)
-    wxFLAGS_MEMBER(wxALIGN_CENTRE)
-
-wxEND_FLAGS( wxStaticTextStyle )
-
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxStaticText, wxControl,"wx/stattext.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxStaticText)
-    wxPROPERTY( Label,wxString, SetLabel, GetLabel, wxString() , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY_FLAGS( WindowStyle , wxStaticTextStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE, 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
-wxEND_PROPERTIES_TABLE()
-
-wxBEGIN_HANDLERS_TABLE(wxStaticText)
-wxEND_HANDLERS_TABLE()
-
-wxCONSTRUCTOR_6( wxStaticText , wxWindow* , Parent , wxWindowID , Id , wxString , Label , wxPoint , Position , wxSize , Size , long , WindowStyle )
-#else
-IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl)
-#endif
-
 bool wxStaticText::Create(wxWindow *parent,
                           wxWindowID id,
                           const wxString& label,
index ca3c74873bba32ce1e9731dcf1309e7ea528e550..dee0498db697d7493096634fb7bce7c4522ea453 100644 (file)
@@ -176,76 +176,6 @@ private:
 // event tables and other macros
 // ----------------------------------------------------------------------------
 
-#if wxUSE_EXTENDED_RTTI
-WX_DEFINE_FLAGS( wxTextCtrlStyle )
-
-wxBEGIN_FLAGS( wxTextCtrlStyle )
-    // new style border flags, we put them first to
-    // use them for streaming out
-    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-    wxFLAGS_MEMBER(wxBORDER_RAISED)
-    wxFLAGS_MEMBER(wxBORDER_STATIC)
-    wxFLAGS_MEMBER(wxBORDER_NONE)
-
-    // old style border flags
-    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-    wxFLAGS_MEMBER(wxRAISED_BORDER)
-    wxFLAGS_MEMBER(wxSTATIC_BORDER)
-    wxFLAGS_MEMBER(wxBORDER)
-
-    // standard window styles
-    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-    wxFLAGS_MEMBER(wxWANTS_CHARS)
-    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
-    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
-    wxFLAGS_MEMBER(wxVSCROLL)
-    wxFLAGS_MEMBER(wxHSCROLL)
-
-    wxFLAGS_MEMBER(wxTE_PROCESS_ENTER)
-    wxFLAGS_MEMBER(wxTE_PROCESS_TAB)
-    wxFLAGS_MEMBER(wxTE_MULTILINE)
-    wxFLAGS_MEMBER(wxTE_PASSWORD)
-    wxFLAGS_MEMBER(wxTE_READONLY)
-    wxFLAGS_MEMBER(wxHSCROLL)
-    wxFLAGS_MEMBER(wxTE_RICH)
-    wxFLAGS_MEMBER(wxTE_RICH2)
-    wxFLAGS_MEMBER(wxTE_AUTO_URL)
-    wxFLAGS_MEMBER(wxTE_NOHIDESEL)
-    wxFLAGS_MEMBER(wxTE_LEFT)
-    wxFLAGS_MEMBER(wxTE_CENTRE)
-    wxFLAGS_MEMBER(wxTE_RIGHT)
-    wxFLAGS_MEMBER(wxTE_DONTWRAP)
-    wxFLAGS_MEMBER(wxTE_CHARWRAP)
-    wxFLAGS_MEMBER(wxTE_WORDWRAP)
-
-wxEND_FLAGS( wxTextCtrlStyle )
-
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxTextCtrl, wxControl,"wx/textctrl.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxTextCtrl)
-    wxEVENT_PROPERTY( TextUpdated , wxEVT_COMMAND_TEXT_UPDATED , wxCommandEvent )
-    wxEVENT_PROPERTY( TextEnter , wxEVT_COMMAND_TEXT_ENTER , wxCommandEvent )
-
-    wxPROPERTY( Font , wxFont , SetFont , GetFont  , EMPTY_MACROVALUE, 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
-    wxPROPERTY( Value , wxString , SetValue, GetValue, wxString() , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY_FLAGS( WindowStyle , wxTextCtrlStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
-wxEND_PROPERTIES_TABLE()
-
-wxBEGIN_HANDLERS_TABLE(wxTextCtrl)
-wxEND_HANDLERS_TABLE()
-
-wxCONSTRUCTOR_6( wxTextCtrl , wxWindow* , Parent , wxWindowID , Id , wxString , Value , wxPoint , Position , wxSize , Size , long , WindowStyle)
-#else
-IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxTextCtrlBase)
-#endif
-
-
 BEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase)
     EVT_CHAR(wxTextCtrl::OnChar)
     EVT_KEY_DOWN(wxTextCtrl::OnKeyDown)
index 6cb53d2876c6c74ba1eecafaf90f1b04b934c62c..fab5750dfb78c2cb51a9e059acd75e4bc07a6028 100644 (file)
@@ -601,72 +601,6 @@ private:
 // wxWin macros
 // ----------------------------------------------------------------------------
 
-#if wxUSE_EXTENDED_RTTI
-WX_DEFINE_FLAGS( wxTreeCtrlStyle )
-
-wxBEGIN_FLAGS( wxTreeCtrlStyle )
-    // new style border flags, we put them first to
-    // use them for streaming out
-    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-    wxFLAGS_MEMBER(wxBORDER_RAISED)
-    wxFLAGS_MEMBER(wxBORDER_STATIC)
-    wxFLAGS_MEMBER(wxBORDER_NONE)
-
-    // old style border flags
-    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-    wxFLAGS_MEMBER(wxRAISED_BORDER)
-    wxFLAGS_MEMBER(wxSTATIC_BORDER)
-    wxFLAGS_MEMBER(wxBORDER)
-
-    // standard window styles
-    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-    wxFLAGS_MEMBER(wxWANTS_CHARS)
-    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
-    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
-    wxFLAGS_MEMBER(wxVSCROLL)
-    wxFLAGS_MEMBER(wxHSCROLL)
-
-    wxFLAGS_MEMBER(wxTR_EDIT_LABELS)
-    wxFLAGS_MEMBER(wxTR_NO_BUTTONS)
-    wxFLAGS_MEMBER(wxTR_HAS_BUTTONS)
-    wxFLAGS_MEMBER(wxTR_TWIST_BUTTONS)
-    wxFLAGS_MEMBER(wxTR_NO_LINES)
-    wxFLAGS_MEMBER(wxTR_FULL_ROW_HIGHLIGHT)
-    wxFLAGS_MEMBER(wxTR_LINES_AT_ROOT)
-    wxFLAGS_MEMBER(wxTR_HIDE_ROOT)
-    wxFLAGS_MEMBER(wxTR_ROW_LINES)
-    wxFLAGS_MEMBER(wxTR_HAS_VARIABLE_ROW_HEIGHT)
-    wxFLAGS_MEMBER(wxTR_SINGLE)
-    wxFLAGS_MEMBER(wxTR_MULTIPLE)
-#if WXWIN_COMPATIBILITY_2_8
-    wxFLAGS_MEMBER(wxTR_EXTENDED)
-#endif
-    wxFLAGS_MEMBER(wxTR_DEFAULT_STYLE)
-
-wxEND_FLAGS( wxTreeCtrlStyle )
-
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxTreeCtrl, wxControl,"wx/treectrl.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxTreeCtrl)
-    wxEVENT_PROPERTY( TextUpdated , wxEVT_COMMAND_TEXT_UPDATED , wxCommandEvent )
-    wxEVENT_RANGE_PROPERTY( TreeEvent , wxEVT_COMMAND_TREE_BEGIN_DRAG , wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK , wxTreeEvent )
-    wxPROPERTY_FLAGS( WindowStyle , wxTreeCtrlStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
-wxEND_PROPERTIES_TABLE()
-
-wxBEGIN_HANDLERS_TABLE(wxTreeCtrl)
-wxEND_HANDLERS_TABLE()
-
-wxCONSTRUCTOR_5( wxTreeCtrl , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle )
-#else
-IMPLEMENT_DYNAMIC_CLASS(wxTreeCtrl, wxControl)
-#endif
-
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
index 60cc4018025bae1f591eb36736b66b0c7abbaea7..33d80aa13cc87baf09edb9857cd0be5e78b7b480 100644 (file)
 
 #include "wx/spinbutt.h" // for wxSpinnerBestSize
 
-#if wxUSE_EXTENDED_RTTI
-// TODO
-#else
-IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
-#endif
-
 #define GetBuddyHwnd()      (HWND)(m_hwndBuddy)
 
 #define IsVertical(wxStyle) ( (wxStyle & wxSP_HORIZONTAL) != wxSP_HORIZONTAL )
index f8b8c16d25da16bcc69c1426f340a85eb73e8c48..9d3650ce6297ea37218553421f5a6441f2f2c364 100644 (file)
 // event tables and other macros
 // ----------------------------------------------------------------------------
 
-#if wxUSE_EXTENDED_RTTI
-// TODO
-#else
-IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxControl)
-#endif
-
 BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)
     EVT_CHAR(wxTextCtrl::OnChar)
 
index cd5f076e0036c3c810758387e27f64aa08852b7f..6e3bd673e477894e2f866fb5cbaf2227bc4df197 100644 (file)
@@ -328,115 +328,7 @@ bool GetCursorPosWinCE(POINT* pt)
 // method
 #ifdef __WXUNIVERSAL__
     IMPLEMENT_ABSTRACT_CLASS(wxWindowMSW, wxWindowBase)
-#else // __WXMSW__
-#if wxUSE_EXTENDED_RTTI
-
-// windows that are created from a parent window during its Create method, eg. spin controls in a calendar controls
-// must never been streamed out separately otherwise chaos occurs. Right now easiest is to test for negative ids, as
-// windows with negative ids never can be recreated anyway
-
-bool wxWindowStreamingCallback( const wxObject *object, wxWriter * , wxPersister * , wxxVariantArray & )
-{
-    const wxWindow * win = dynamic_cast<const wxWindow*>(object) ;
-    if ( win && win->GetId() < 0 )
-        return false ;
-    return true ;
-}
-
-IMPLEMENT_DYNAMIC_CLASS_XTI_CALLBACK(wxWindow, wxWindowBase,"wx/window.h", wxWindowStreamingCallback)
-
-// make wxWindowList known before the property is used
-
-wxCOLLECTION_TYPE_INFO( wxWindow* , wxWindowList ) ;
-
-template<> void wxCollectionToVariantArray( wxWindowList const &theList, wxxVariantArray &value)
-{
-    wxListCollectionToVariantArray<wxWindowList::compatibility_iterator>( theList , value ) ;
-}
-
-WX_DEFINE_FLAGS( wxWindowStyle )
-
-wxBEGIN_FLAGS( wxWindowStyle )
-    // new style border flags, we put them first to
-    // use them for streaming out
-
-    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-    wxFLAGS_MEMBER(wxBORDER_RAISED)
-    wxFLAGS_MEMBER(wxBORDER_STATIC)
-    wxFLAGS_MEMBER(wxBORDER_NONE)
-
-    // old style border flags
-    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-    wxFLAGS_MEMBER(wxRAISED_BORDER)
-    wxFLAGS_MEMBER(wxSTATIC_BORDER)
-    wxFLAGS_MEMBER(wxBORDER)
-
-    // standard window styles
-    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-    wxFLAGS_MEMBER(wxWANTS_CHARS)
-    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
-    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
-    wxFLAGS_MEMBER(wxVSCROLL)
-    wxFLAGS_MEMBER(wxHSCROLL)
-
-wxEND_FLAGS( wxWindowStyle )
-
-wxBEGIN_PROPERTIES_TABLE(wxWindow)
-    wxEVENT_PROPERTY( Close , wxEVT_CLOSE_WINDOW , wxCloseEvent)
-    wxEVENT_PROPERTY( Create , wxEVT_CREATE , wxWindowCreateEvent )
-    wxEVENT_PROPERTY( Destroy , wxEVT_DESTROY , wxWindowDestroyEvent )
-    // Always constructor Properties first
-
-    wxREADONLY_PROPERTY( Parent,wxWindow*, GetParent, EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY( Id,wxWindowID, SetId, GetId, -1 /*wxID_ANY*/ , 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
-    wxPROPERTY( Position,wxPoint, SetPosition , GetPosition, wxDefaultPosition , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // pos
-    wxPROPERTY( Size,wxSize, SetSize, GetSize, wxDefaultSize , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // size
-    wxPROPERTY( WindowStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
-
-    // Then all relations of the object graph
-
-    wxREADONLY_PROPERTY_COLLECTION( Children , wxWindowList , wxWindowBase* , GetWindowChildren , wxPROP_OBJECT_GRAPH /*flags*/ , wxT("Helpstring") , wxT("group"))
-
-   // and finally all other properties
-
-    wxPROPERTY( ExtraStyle , long , SetExtraStyle , GetExtraStyle , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // extstyle
-    wxPROPERTY( BackgroundColour , wxColour , SetBackgroundColour , GetBackgroundColour , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // bg
-    wxPROPERTY( ForegroundColour , wxColour , SetForegroundColour , GetForegroundColour , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // fg
-    wxPROPERTY( Enabled , bool , Enable , IsEnabled , wxxVariant((bool)true) , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY( Shown , bool , Show , IsShown , wxxVariant((bool)true) , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-#if 0
-    // possible property candidates (not in xrc) or not valid in all subclasses
-    wxPROPERTY( Title,wxString, SetTitle, GetTitle, wxEmptyString )
-    wxPROPERTY( Font , wxFont , SetFont , GetWindowFont  , )
-    wxPROPERTY( Label,wxString, SetLabel, GetLabel, wxEmptyString )
-    // MaxHeight, Width , MinHeight , Width
-    // TODO switch label to control and title to toplevels
-
-    wxPROPERTY( ThemeEnabled , bool , SetThemeEnabled , GetThemeEnabled , )
-    //wxPROPERTY( Cursor , wxCursor , SetCursor , GetCursor , )
-    // wxPROPERTY( ToolTip , wxString , SetToolTip , GetToolTipText , )
-    wxPROPERTY( AutoLayout , bool , SetAutoLayout , GetAutoLayout , )
-
-
-
-#endif
-wxEND_PROPERTIES_TABLE()
-
-wxBEGIN_HANDLERS_TABLE(wxWindow)
-wxEND_HANDLERS_TABLE()
-
-wxCONSTRUCTOR_DUMMY(wxWindow)
-
-#else
-    IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowBase)
-#endif
-#endif // __WXUNIVERSAL__/__WXMSW__
+#endif // __WXUNIVERSAL__
 
 BEGIN_EVENT_TABLE(wxWindowMSW, wxWindowBase)
     EVT_SYS_COLOUR_CHANGED(wxWindowMSW::OnSysColourChanged)
index 6112b02a5637cd99108d569f56e6a7a987cd38c2..82bb6dde952c46006b3a40c776e0bbef701b605c 100644 (file)
@@ -23,8 +23,6 @@
 #include "wx/os2/private.h"
 
 
-IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton)
-
 #define BUTTON_HEIGHT_FACTOR (EDIT_CONTROL_FACTOR * 1.1)
 
 bool wxBitmapButton::Create( wxWindow*          pParent,
index 0dfafaa3b3c3bbb3b503e3700264ab59c3074e46..ce0c00f81817091a1ee6aaa1d63ba89a16e8a74e 100644 (file)
@@ -39,8 +39,6 @@
 #define BST_CHECKED 0x0001
 #endif
 
-IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
-
 // Button
 
 bool wxButton::Create( wxWindow*          pParent,
index 2925980a9fd3b0c243a4f8871dd27a086076c01a..5462a84f7a1e447cbc6425e273d3916c33005953 100644 (file)
@@ -27,7 +27,6 @@
 // macros
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox)
 
 extern void  wxAssociateWinWithHandle( HWND         hWnd
index 9f0360a9fcbb2a59d24436fd34d300effd6ff461..1804a62b240116a1f0dc4d9c4208dde018e453b4 100644 (file)
@@ -24,8 +24,6 @@
 
 #include "wx/os2/private.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControlWithItems)
-
 bool wxChoice::Create(
   wxWindow*                         pParent
 , wxWindowID                        vId
index 08d79a82f166858e9c1f528a3c16fa8cdb64b957..d453f15b448f5a6165de5d73acb5a522940b7ee9 100644 (file)
@@ -22,8 +22,6 @@
 #define INCL_PM
 #include<os2.h>
 
-IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
-
 // Colour
 
 void wxColour::Init()
index 002ea2015cb5f5e0ff29f94c73e711175d373e3a..81590e0f99d048d6b5c3daa53a97902322d56f32 100644 (file)
@@ -35,8 +35,6 @@ MRESULT EXPENTRY wxComboEditWndProc( HWND   hWnd
 //
 static WXFARPROC gfnWndprocEdit     = (WXFARPROC)NULL;
 
-IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)
-
 bool wxComboBox::OS2Command( WXUINT uParam, WXWORD WXUNUSED(wId) )
 {
     long lSel = GetSelection();
index 776f9db9080e1eb13dbab04b8c0d577460880d6e..cd8721178d1cc1ca8e40b03c89d16d18691a7d58 100644 (file)
@@ -33,7 +33,6 @@
 #define wxDIALOG_DEFAULT_WIDTH 500
 #define wxDIALOG_DEFAULT_HEIGHT 500
 
-IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)
 
 // ----------------------------------------------------------------------------
 // wxDialogModalData
index bfa1f560b803389257ba01e4680e9ced405f83f4..dfccb2ccadcb09c97c25379353e5dc768abb2736 100644 (file)
@@ -52,8 +52,6 @@ BEGIN_EVENT_TABLE(wxFrame, wxFrameBase)
     EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged)
 END_EVENT_TABLE()
 
-IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)
-
 // ============================================================================
 // implementation
 // ============================================================================
index 9c95081918e446a3462a6d24cefbaaadb85277dd..80568caaecd7c654f0677387e208dca098aed7e0 100644 (file)
@@ -27,8 +27,6 @@ extern void  wxAssociateWinWithHandle( HWND         hWnd
                                       ,wxWindowOS2* pWin
                                      );
 
-IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxGaugeBase)
-
 MRESULT EXPENTRY wxGaugeWndProc( HWND hWnd,
                                  UINT uMessage,
                                  MPARAM wParam,
index ada1db3c6c1a77454077f898ce6bfc99d55db4b4..c3018a031408dbb7803661e77ca8437a0b1f1aa2 100644 (file)
@@ -39,8 +39,6 @@
     #include  "wx/ownerdrw.h"
 #endif
 
-IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControlWithItems)
-
 // ============================================================================
 // list box item declaration and implementation
 // ============================================================================
index 57e13fb4e0d42c38d8d88817090c8681edf400d6..fac87773756d8e9948cde2df94857dac95db7ee5 100644 (file)
@@ -773,13 +773,6 @@ void ConvertToOS2ListCol (
     pField->offStruct = 0;
 } // end of ConvertToOS2ListCol
 
-
-IMPLEMENT_DYNAMIC_CLASS(wxListCtrl, wxControl)
-IMPLEMENT_DYNAMIC_CLASS(wxListView, wxListCtrl)
-IMPLEMENT_DYNAMIC_CLASS(wxListItem, wxObject)
-
-IMPLEMENT_DYNAMIC_CLASS(wxListEvent, wxNotifyEvent)
-
 BEGIN_EVENT_TABLE(wxListCtrl, wxControl)
     EVT_PAINT(wxListCtrl::OnPaint)
 END_EVENT_TABLE()
index 677b804d7a01bf96cce9fc8c0282f69bd4439d60..3b85eff91d08aebf4030950b7c9d606d8c8793b9 100644 (file)
@@ -27,8 +27,6 @@
 
 #include "wx/os2/private.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
-
 extern void  wxAssociateWinWithHandle( HWND         hWnd
                                       ,wxWindowOS2* pWin
                                      );
index a89d53de3e608f8f3de7a0457b289df0db4404d1..ed01ed5c964252a9065a2be7a95d9d13f30cdb12 100644 (file)
@@ -20,8 +20,6 @@
 
 #include "wx/os2/private.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxScrollBar, wxControl)
-
 // Scrollbar
 bool wxScrollBar::Create(wxWindow* pParent,
                          wxWindowID vId,
index b9864249f51f491dad78fe740eb8c879bbcbd445..83752dd30b0bbe75d50dd71d248b46562050ca98 100644 (file)
@@ -28,8 +28,6 @@
 #include "wx/slider.h"
 #include "wx/os2/private.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxSlider, wxControl)
-
 wxSlider::wxSlider()
 {
     m_hStaticValue = 0L;
index 533b209728ae3466a5c77174d234491e21ad510e..14fbeaa39cbd4c191fe0c7ca7c4f07c17b053582 100644 (file)
@@ -28,8 +28,6 @@ extern void  wxAssociateWinWithHandle( HWND         hWnd
                                       ,wxWindowOS2* pWin
                                      );
 
-IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent)
-
 #include "wx/os2/private.h"
 
 // ============================================================================
@@ -40,8 +38,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent)
 // wxWin macros
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl)
-
 bool wxSpinButton::Create(
   wxWindow*                         pParent
 , wxWindowID                        vId
index c9d8187d9444bd7a0adee11f200061757b401769..2771654ab0b9b349fa4e33c49901696894e46ee3 100644 (file)
@@ -40,8 +40,6 @@ extern void  wxAssociateWinWithHandle( HWND         hWnd
 static WXFARPROC fnWndProcSpinCtrl = (WXFARPROC)NULL;
 wxArraySpins                        wxSpinCtrl::m_svAllSpins;
 
-IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl, wxControl)
-
 BEGIN_EVENT_TABLE(wxSpinCtrl, wxSpinButton)
     EVT_CHAR(wxSpinCtrl::OnChar)
     EVT_SPIN(wxID_ANY, wxSpinCtrl::OnSpinChange)
index c80642962f03768a417df57773aef40af78610f5..5874763573e462f5c0ea725ff326b3471856ac9e 100644 (file)
@@ -28,8 +28,6 @@
 // macros
 // ---------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
-
 BEGIN_EVENT_TABLE(wxStaticBitmap, wxWindow)
     EVT_PAINT(wxStaticBitmap::OnPaint)
 END_EVENT_TABLE()
index 8ae9f4d7ab86a0f47a8d5dbadc3a5b64b8aa787c..c1512ea6a8653592182b4404445143440e71915a 100644 (file)
@@ -22,8 +22,6 @@
 
 #include "wx/os2/private.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl)
-
 bool wxStaticBox::Create( wxWindow*       pParent,
                           wxWindowID      vId,
                           const wxString& rsLabel,
index e9663eebf90f92d0634f2b7436f33c57b26d51a8..62562b26e01521c7a1759936174092d3a8717a62 100644 (file)
@@ -33,8 +33,6 @@
 // implementation
 // ============================================================================
 
-IMPLEMENT_DYNAMIC_CLASS(wxStaticLine, wxControl)
-
 // ----------------------------------------------------------------------------
 // wxStaticLine
 // ----------------------------------------------------------------------------
index 6285c011da193541af0852934042c9c8ba0ebe8c..292f6623534ee0085be08854d5aeff9eb1c794f7 100644 (file)
@@ -24,8 +24,6 @@
 #include "wx/os2/private.h"
 #include <stdio.h>
 
-IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl)
-
 bool wxStaticText::Create( wxWindow*        pParent,
                            wxWindowID       vId,
                            const wxString&  rsLabel,
index a3ae1dcb3e54c8f7e924e4d3bddba880e19ac74c..3be381a95f154c62551524b43d0bb9327f2a8698 100644 (file)
@@ -55,8 +55,6 @@
 // event tables and other macros
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxTextCtrlBase)
-
 BEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase)
     EVT_CHAR(wxTextCtrl::OnChar)
     EVT_DROP_FILES(wxTextCtrl::OnDropFiles)
index ab60bc7c09bd557d478644c97a035096f33388fe..9bddf9c7199d68deedb0b82dde51a97089e98f2e 100644 (file)
@@ -254,8 +254,6 @@ private:
 // wxWin macros
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxTreeCtrl, wxControl)
-
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
index fdf6d3a87b37ad49090b6f8d11559e2e868fddb0..ddcc14e1d099eab510f2bcd2d5e8294824d730e6 100644 (file)
@@ -170,9 +170,7 @@ static wxWindow*                    gpWinBeingCreated = NULL;
 // method
 #ifdef __WXUNIVERSAL__
     IMPLEMENT_ABSTRACT_CLASS(wxWindowOS2, wxWindowBase)
-#else // __WXPM__
-    IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowBase)
-#endif // __WXUNIVERSAL__/__WXPM__
+#endif // __WXUNIVERSAL__
 
 BEGIN_EVENT_TABLE(wxWindowOS2, wxWindowBase)
     EVT_ERASE_BACKGROUND(wxWindowOS2::OnEraseBackground)
index 2384340ae2c6011d70ad6daf1dfd675204137762..4e872a906e15e4056a9da3acdadaab50aa49559d 100644 (file)
@@ -20,9 +20,6 @@
     #include "wx/dcmemory.h"
 #endif
 
-IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton)
-
-
 #include "wx/osx/private.h"
 
 //---------------------------------------------------------------------------
index 6c83fb16baf24680459cae742ca15561f4fa65a7..045ea7967540c7a11e912833e9373708b551d1bd 100644 (file)
@@ -42,8 +42,6 @@ bool IsHelpButtonWithStandardLabel(wxWindowID id, const wxString& label)
 
 } // anonymous namespace
 
-IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
-
 BEGIN_EVENT_TABLE(wxButton, wxControl)
     EVT_ENTER_WINDOW(wxButton::OnEnterWindow)
     EVT_LEAVE_WINDOW(wxButton::OnLeaveWindow)
index cba75b71bf36682925dad8b65250c0515f12ca8e..2662bb8bd0ef2aa8a532c58df99ee4c1befdd7f6 100644 (file)
@@ -25,8 +25,6 @@
 
 #include "wx/osx/private.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)
-
 WX_DELEGATE_TO_CONTROL_CONTAINER(wxComboBox, wxControl)
 
 BEGIN_EVENT_TABLE(wxComboBox, wxControl)
index b568c23c89a2882ff330f1c743148eadbf6b60dc..9a132ebae7db11268e9048994492dde0d62cf7f3 100644 (file)
@@ -25,8 +25,6 @@
 #endif
 #endif
 
-IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)
-
 #if TARGET_API_MAC_OSX
 #define USE_HICOMBOBOX 1 //use hi combobox define
 #else
index 92ee6a94f5f987559be231ebec5f7fc9c1c2cd11..da1283489109ef266b9545665ea30b5d819ef01e 100644 (file)
@@ -31,8 +31,6 @@ BEGIN_EVENT_TABLE(wxFrame, wxFrameBase)
   EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged)
 END_EVENT_TABLE()
 
-IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow)
-
 #define WX_MAC_STATUSBAR_HEIGHT 18
 
 // ----------------------------------------------------------------------------
index 8e3ac789f685af8c27cb1508bff79fdea95b5f3f..898890d2ffb11ef604b70aaa93f5562fa7fa86f6 100644 (file)
 
 #include "wx/hashmap.h"
 
-#if wxUSE_EXTENDED_RTTI
-WX_DEFINE_FLAGS( wxListCtrlStyle )
-
-wxBEGIN_FLAGS( wxListCtrlStyle )
-    // new style border flags, we put them first to
-    // use them for streaming out
-    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-    wxFLAGS_MEMBER(wxBORDER_RAISED)
-    wxFLAGS_MEMBER(wxBORDER_STATIC)
-    wxFLAGS_MEMBER(wxBORDER_NONE)
-
-    // old style border flags
-    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-    wxFLAGS_MEMBER(wxRAISED_BORDER)
-    wxFLAGS_MEMBER(wxSTATIC_BORDER)
-    wxFLAGS_MEMBER(wxBORDER)
-
-    // standard window styles
-    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-    wxFLAGS_MEMBER(wxWANTS_CHARS)
-    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
-    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
-    wxFLAGS_MEMBER(wxVSCROLL)
-    wxFLAGS_MEMBER(wxHSCROLL)
-
-    wxFLAGS_MEMBER(wxLC_LIST)
-    wxFLAGS_MEMBER(wxLC_REPORT)
-    wxFLAGS_MEMBER(wxLC_ICON)
-    wxFLAGS_MEMBER(wxLC_SMALL_ICON)
-    wxFLAGS_MEMBER(wxLC_ALIGN_TOP)
-    wxFLAGS_MEMBER(wxLC_ALIGN_LEFT)
-    wxFLAGS_MEMBER(wxLC_AUTOARRANGE)
-    wxFLAGS_MEMBER(wxLC_USER_TEXT)
-    wxFLAGS_MEMBER(wxLC_EDIT_LABELS)
-    wxFLAGS_MEMBER(wxLC_NO_HEADER)
-    wxFLAGS_MEMBER(wxLC_SINGLE_SEL)
-    wxFLAGS_MEMBER(wxLC_SORT_ASCENDING)
-    wxFLAGS_MEMBER(wxLC_SORT_DESCENDING)
-    wxFLAGS_MEMBER(wxLC_VIRTUAL)
-
-wxEND_FLAGS( wxListCtrlStyle )
-
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxListCtrl, wxControl,"wx/listctrl.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxListCtrl)
-    wxEVENT_PROPERTY( TextUpdated , wxEVT_COMMAND_TEXT_UPDATED , wxCommandEvent )
-
-    wxPROPERTY_FLAGS( WindowStyle , wxListCtrlStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
-wxEND_PROPERTIES_TABLE()
-
-wxBEGIN_HANDLERS_TABLE(wxListCtrl)
-wxEND_HANDLERS_TABLE()
-
-wxCONSTRUCTOR_5( wxListCtrl , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle )
-
-/*
- TODO : Expose more information of a list's layout etc. via appropriate objects (a la NotebookPageInfo)
-*/
-#else
-IMPLEMENT_DYNAMIC_CLASS(wxListCtrl, wxControl)
-#endif
-
-IMPLEMENT_DYNAMIC_CLASS(wxListView, wxListCtrl)
-IMPLEMENT_DYNAMIC_CLASS(wxListItem, wxObject)
-
-IMPLEMENT_DYNAMIC_CLASS(wxListEvent, wxNotifyEvent)
-
 WX_DECLARE_HASH_MAP( int, wxListItem*, wxIntegerHash, wxIntegerEqual, wxListItemList );
 
 #include "wx/listimpl.cpp"
index ab6915452ac620f3150803338c0581d719f6854e..1034298f46a7e4a750372ba52ef0144cb744bea0 100644 (file)
@@ -19,8 +19,6 @@
     #include "wx/dcclient.h"
 #endif
 
-IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
-
 /*
  * wxStaticBitmap
  */
index ca968e6c08821d72705f70b7e03b0390e562375c..1d68d6b7fcc27eb73b00e7adf5d8720b8b2ad403 100644 (file)
@@ -20,9 +20,6 @@
     #include "wx/statbox.h"
 #endif
 
-IMPLEMENT_DYNAMIC_CLASS(wxStaticLine, wxControl)
-
-
 bool wxStaticLine::Create( wxWindow *parent,
     wxWindowID id,
     const wxPoint &pos,
index 93cbf2c7bb658c2205200e4a97863ac4309660f8..3a7283396173620966edd95d658307ae49493628 100644 (file)
@@ -16,7 +16,6 @@
 #include "wx/checkbox.h"
 #include "wx/osx/private.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox)
 
 // Single check box item
index 966974de067a369fb6697de8f8eaa0d71114df0d..e3d6cdab4827dd8ed3c7db863936d96e72fcb244 100644 (file)
@@ -22,8 +22,6 @@
 
 #include "wx/osx/private.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControlWithItems)
-
 wxChoice::~wxChoice()
 {
     if ( HasClientObjectData() )
index 4aec03feb346da7f83eb578eb356d7af165f4d98..3ae05278d7f86cab45809dc49266882988cdc2a5 100644 (file)
 
 // work in progress
 
+@interface wxNSTableDataSource : NSObject wxOSX_10_6_AND_LATER(<NSComboBoxDataSource>)
+{
+    wxNSComboBoxControl* impl;
+}
+
+- (NSInteger)numberOfItemsInComboBox:(NSComboBox *)aComboBox;
+- (id)comboBox:(NSComboBox *)aComboBox objectValueForItemAtIndex:(NSInteger)index;
+
+@end
+
+
 @interface wxNSComboBox : NSComboBox
 {
 }
index 9790bb95dca74fad92b71e877a4be18f6c63b1f5..8e814f8ebaa2b34dc7326acb7e11f0a92909b275 100644 (file)
@@ -21,8 +21,6 @@
 
 // work in progress
 
-IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)
-
 wxComboBox::~wxComboBox()
 {
 }
index 35114175ceee1b93366d43d71a320b189d8a6999..92bddd08be1bfd62a7ffe0d081115e526f5b5ec9 100644 (file)
@@ -19,8 +19,6 @@
 
 #include "wx/osx/private.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
-
 #if wxOSX_USE_COCOA_OR_CARBON
 wxColour::wxColour(const RGBColor& col)
 {
index 05da19bcc876f7a36617e0bd0a134f0993aa9f67..e4088d6cfcc37dad4738e1045f581a6cad1e215e 100644 (file)
@@ -40,9 +40,6 @@ void wxDialog::OSXEndModalDialog()
     s_openDialogs--;
 }
 
-
-IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)
-
 void wxDialog::Init()
 {
     m_modality = wxDIALOG_MODALITY_NONE;
index 869bce41f60785ccc131d2fdf4e16902fdd6254a..284d7fc66697851959a0bcfa6d5c377abcf16f9d 100644 (file)
@@ -15,8 +15,6 @@
 
 #include "wx/gauge.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl)
-
 #include "wx/osx/private.h"
 
 bool wxGauge::Create( wxWindow *parent,
index c8a037b89959610aac7b3c8459d29e79ef2e3b87..624eb806ff1240f02dffb87961ce7bfd64dd622e 100644 (file)
@@ -24,8 +24,6 @@
     #include "wx/dcclient.h"
 #endif
 
-IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControlWithItems)
-
 BEGIN_EVENT_TABLE(wxListBox, wxControl)
 END_EVENT_TABLE()
 
index cbd5f199901d0323f68310517e05a5497a596c8d..772a2601a6c9b0fef093f5b9bdaa1cfd768fea0f 100644 (file)
@@ -16,9 +16,6 @@
 #include "wx/radiobut.h"
 #include "wx/osx/private.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
-
-
 bool wxRadioButton::Create( wxWindow *parent,
     wxWindowID id,
     const wxString& label,
index cbe8cdfe8751941e4ab6218e99116ade8f047fd3..e0cdcfe752e376fc9bf1561304d65ea6e85c3210 100644 (file)
@@ -23,8 +23,6 @@
 
 #if wxUSE_SCROLLBAR
 
-IMPLEMENT_DYNAMIC_CLASS(wxScrollBar, wxControl)
-
 BEGIN_EVENT_TABLE(wxScrollBar, wxControl)
 END_EVENT_TABLE()
 
index 705ec7db942d6f7aeec4736dca209c85b7510ca5..de069f1e4ad519a9a11519c52972e080d9aad23e 100644 (file)
@@ -16,8 +16,6 @@
 #include "wx/slider.h"
 #include "wx/osx/private.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxSlider, wxControl)
-
 BEGIN_EVENT_TABLE(wxSlider, wxControl)
 END_EVENT_TABLE()
 
index 8e1d44e0fc6e716c07caa214a89aa9c797e2ee99..5e3408d5193c62b6fdf37f2c2d808fd9873acaa8 100644 (file)
 #include "wx/osx/private.h"
 
 
-IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl)
-IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent)
-
-
 wxSpinButton::wxSpinButton()
    : wxSpinButtonBase()
 {
index a6b733ae0ab3f728262e141fa98c31b65e43a583..3c8a7e42a742879ef18c745862fd9e4479a09263 100644 (file)
@@ -196,8 +196,6 @@ BEGIN_EVENT_TABLE(wxSpinCtrlButton, wxSpinButton)
     EVT_SPIN(wxID_ANY, wxSpinCtrlButton::OnSpinButton)
 END_EVENT_TABLE()
 
-IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl, wxControl)
-
 BEGIN_EVENT_TABLE(wxSpinCtrl, wxControl)
     WX_EVENT_TABLE_CONTROL_CONTAINER(wxSpinCtrl)
 END_EVENT_TABLE()
index 216b6fd9190d81050ad2f8a93f8f2bbe41cb6e29..f6df81bcac2e4f9f913f8ed97f3cd0feac9602a8 100644 (file)
@@ -16,8 +16,6 @@
 #include "wx/statbox.h"
 #include "wx/osx/private.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl)
-
 bool wxStaticBox::Create( wxWindow *parent,
     wxWindowID id,
     const wxString& label,
index d216f2e9967cfeea48097336ff725467ec5e9f15..73e29957c743017604acebd39d1945020ccc55a1 100644 (file)
@@ -37,8 +37,6 @@
 // implementation
 // ============================================================================
 
-IMPLEMENT_DYNAMIC_CLASS(wxStaticLine, wxControl)
-
 // ----------------------------------------------------------------------------
 // wxStaticLine
 // ----------------------------------------------------------------------------
index dce98c9b6c1fc6244a9ac00b24730dd998655fca..94af706ee6b4499c5441bcb1ef87f9f8212cebc1 100644 (file)
@@ -27,8 +27,6 @@
 
 #include <stdio.h>
 
-IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl)
-
 
 bool wxStaticText::Create( wxWindow *parent,
     wxWindowID id,
index ff1a28f48d7dfe0d150c0b5920c0f0e4e176b601..7efdcb487a84876c32975171eb76aac8ea4f9f2c 100644 (file)
@@ -48,8 +48,6 @@
 
 #include "wx/osx/private.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxTextCtrlBase)
-
 BEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase)
     EVT_DROP_FILES(wxTextCtrl::OnDropFiles)
     EVT_CHAR(wxTextCtrl::OnChar)
index ec1375142eb95edd61d9a98d58daac1d9380617f..6fe191e35995435ef8925544a93511dd422b0d4b 100644 (file)
@@ -76,8 +76,6 @@
 
 #ifdef __WXUNIVERSAL__
     IMPLEMENT_ABSTRACT_CLASS(wxWindowMac, wxWindowBase)
-#else
-    IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowBase)
 #endif
 
 BEGIN_EVENT_TABLE(wxWindowMac, wxWindowBase)
index 72b08d09537331d396c23fdd7642ea2f6e1e9c68..7319d06551e8d5e3489edbced2ee3f41c761893f 100644 (file)
 // macros
 // ----------------------------------------------------------------------------
 
-#if wxUSE_EXTENDED_RTTI
-
-WX_DEFINE_FLAGS( wxBitmapButtonStyle )
-
-wxBEGIN_FLAGS( wxBitmapButtonStyle )
-    // new style border flags, we put them first to
-    // use them for streaming out
-    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-    wxFLAGS_MEMBER(wxBORDER_RAISED)
-    wxFLAGS_MEMBER(wxBORDER_STATIC)
-    wxFLAGS_MEMBER(wxBORDER_NONE)
-
-    // old style border flags
-    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-    wxFLAGS_MEMBER(wxRAISED_BORDER)
-    wxFLAGS_MEMBER(wxSTATIC_BORDER)
-    wxFLAGS_MEMBER(wxBORDER)
-
-    // standard window styles
-    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-    wxFLAGS_MEMBER(wxWANTS_CHARS)
-    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
-    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
-    wxFLAGS_MEMBER(wxVSCROLL)
-    wxFLAGS_MEMBER(wxHSCROLL)
-
-    wxFLAGS_MEMBER(wxBU_AUTODRAW)
-    wxFLAGS_MEMBER(wxBU_LEFT)
-    wxFLAGS_MEMBER(wxBU_RIGHT)
-    wxFLAGS_MEMBER(wxBU_TOP)
-    wxFLAGS_MEMBER(wxBU_BOTTOM)
-wxEND_FLAGS( wxBitmapButtonStyle )
-
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxBitmapButton, wxButton,"wx/bmpbuttn.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxBitmapButton)
-    wxPROPERTY_FLAGS( WindowStyle , wxBitmapButtonStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE, 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
-wxEND_PROPERTIES_TABLE()
-
-wxBEGIN_HANDLERS_TABLE(wxBitmapButton)
-wxEND_HANDLERS_TABLE()
-
-wxCONSTRUCTOR_5( wxBitmapButton , wxWindow* , Parent , wxWindowID , Id , wxBitmap , Bitmap , wxPoint , Position , wxSize , Size )
-
-#else
-IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton)
-#endif
-
 #define BUTTON_HEIGHT_FACTOR (EDIT_CONTROL_FACTOR * 1.1)
 
 bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id,
index 93fd0d6690e478d9b57c724a195e1b7682e8b16b..c395130b80960fffe1bf799294c49f9233fa7a5f 100644 (file)
 // macros
 // ----------------------------------------------------------------------------
 
-#if wxUSE_EXTENDED_RTTI
-
-WX_DEFINE_FLAGS( wxButtonStyle )
-
-wxBEGIN_FLAGS( wxButtonStyle )
-    // new style border flags, we put them first to
-    // use them for streaming out
-    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-    wxFLAGS_MEMBER(wxBORDER_RAISED)
-    wxFLAGS_MEMBER(wxBORDER_STATIC)
-    wxFLAGS_MEMBER(wxBORDER_NONE)
-
-    // old style border flags
-    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-    wxFLAGS_MEMBER(wxRAISED_BORDER)
-    wxFLAGS_MEMBER(wxSTATIC_BORDER)
-    wxFLAGS_MEMBER(wxBORDER)
-
-    // standard window styles
-    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-    wxFLAGS_MEMBER(wxWANTS_CHARS)
-    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
-    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
-    wxFLAGS_MEMBER(wxVSCROLL)
-    wxFLAGS_MEMBER(wxHSCROLL)
-
-    wxFLAGS_MEMBER(wxBU_LEFT)
-    wxFLAGS_MEMBER(wxBU_RIGHT)
-    wxFLAGS_MEMBER(wxBU_TOP)
-    wxFLAGS_MEMBER(wxBU_BOTTOM)
-    wxFLAGS_MEMBER(wxBU_EXACTFIT)
-wxEND_FLAGS( wxButtonStyle )
-
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxButton, wxControl,"wx/button.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxButton)
-    wxEVENT_PROPERTY( Click , wxEVT_COMMAND_BUTTON_CLICKED , wxCommandEvent)
-
-    wxPROPERTY( Font , wxFont , SetFont , GetFont  , EMPTY_MACROVALUE, 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY( Label, wxString , SetLabel, GetLabel, wxString(), 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
-
-    wxPROPERTY_FLAGS( WindowStyle , wxButtonStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
-
-wxEND_PROPERTIES_TABLE()
-
-wxBEGIN_HANDLERS_TABLE(wxButton)
-wxEND_HANDLERS_TABLE()
-
-wxCONSTRUCTOR_6( wxButton , wxWindow* , Parent , wxWindowID , Id , wxString , Label , wxPoint , Position , wxSize , Size , long , WindowStyle  )
-
-
-#else
-IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
-#endif
-
 // this macro tries to adjust the default button height to a reasonable value
 // using the char height as the base
 #define BUTTON_HEIGHT_FROM_CHAR_HEIGHT(cy) (11*EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy)/10)
index 8a74d281262f41653b3017974ee2e584507dc34c..3c9006de2a182939fc381f518fbe1feee179ded7 100644 (file)
 // implementation
 // ============================================================================
 
-#if wxUSE_EXTENDED_RTTI
-WX_DEFINE_FLAGS( wxCheckBoxStyle )
-
-wxBEGIN_FLAGS( wxCheckBoxStyle )
-    // new style border flags, we put them first to
-    // use them for streaming out
-    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-    wxFLAGS_MEMBER(wxBORDER_RAISED)
-    wxFLAGS_MEMBER(wxBORDER_STATIC)
-    wxFLAGS_MEMBER(wxBORDER_NONE)
-
-    // old style border flags
-    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-    wxFLAGS_MEMBER(wxRAISED_BORDER)
-    wxFLAGS_MEMBER(wxSTATIC_BORDER)
-    wxFLAGS_MEMBER(wxNO_BORDER)
-
-    // standard window styles
-    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-    wxFLAGS_MEMBER(wxWANTS_CHARS)
-    wxFLAGS_MEMBER(wxNO_FULL_REPAINT_ON_RESIZE)
-    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
-    wxFLAGS_MEMBER(wxVSCROLL)
-    wxFLAGS_MEMBER(wxHSCROLL)
-
-wxEND_FLAGS( wxCheckBoxStyle )
-
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxCheckBox, wxControl,"wx/checkbox.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxCheckBox)
-    wxEVENT_PROPERTY( Click , wxEVT_COMMAND_CHECKBOX_CLICKED , wxCommandEvent )
-
-    wxPROPERTY( Font , wxFont , SetFont , GetFont , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY( Label,wxString, SetLabel, GetLabel, wxString() , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY( Value ,bool, SetValue, GetValue, EMPTY_MACROVALUE, 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY_FLAGS( WindowStyle , wxCheckBoxStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE, 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
-wxEND_PROPERTIES_TABLE()
-
-wxBEGIN_HANDLERS_TABLE(wxCheckBox)
-wxEND_HANDLERS_TABLE()
-
-wxCONSTRUCTOR_6( wxCheckBox , wxWindow* , Parent , wxWindowID , Id , wxString , Label , wxPoint , Position , wxSize , Size , long , WindowStyle )
-#else
-IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl)
-#endif
-
-
 // ----------------------------------------------------------------------------
 // wxCheckBox
 // ----------------------------------------------------------------------------
index 5ea2d6ea02f790f4a315a0e4289fb49f3cdb07b7..e1852a767fc7f8839640b7cc9c0a70c47ac16549 100644 (file)
     #include "wx/settings.h"
 #endif
 
-#if wxUSE_EXTENDED_RTTI
-WX_DEFINE_FLAGS( wxChoiceStyle )
-
-wxBEGIN_FLAGS( wxChoiceStyle )
-    // new style border flags, we put them first to
-    // use them for streaming out
-    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-    wxFLAGS_MEMBER(wxBORDER_RAISED)
-    wxFLAGS_MEMBER(wxBORDER_STATIC)
-    wxFLAGS_MEMBER(wxBORDER_NONE)
-
-    // old style border flags
-    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-    wxFLAGS_MEMBER(wxRAISED_BORDER)
-    wxFLAGS_MEMBER(wxSTATIC_BORDER)
-    wxFLAGS_MEMBER(wxBORDER)
-
-    // standard window styles
-    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-    wxFLAGS_MEMBER(wxWANTS_CHARS)
-    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
-    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
-    wxFLAGS_MEMBER(wxVSCROLL)
-    wxFLAGS_MEMBER(wxHSCROLL)
-
-wxEND_FLAGS( wxChoiceStyle )
-
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxChoice, wxControl,"wx/choice.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxChoice)
-    wxEVENT_PROPERTY( Select , wxEVT_COMMAND_CHOICE_SELECTED , wxCommandEvent )
-
-    wxPROPERTY( Font , wxFont , SetFont , GetFont  , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY_COLLECTION( Choices , wxArrayString , wxString , AppendString , GetStrings , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY( Selection ,int, SetSelection, GetSelection, EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY_FLAGS( WindowStyle , wxChoiceStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
-wxEND_PROPERTIES_TABLE()
-
-wxBEGIN_HANDLERS_TABLE(wxChoice)
-wxEND_HANDLERS_TABLE()
-
-wxCONSTRUCTOR_4( wxChoice , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size )
-#else
-IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControlWithItems)
-#endif
-
 // ============================================================================
 // implementation
 // ============================================================================
index e35fbcf02807bab6c2dd4079d84aed80d3b68fcf..90c062712fa163d65cd34d69b2e8a24a9976610c 100644 (file)
 // wxWin macros
 // ----------------------------------------------------------------------------
 
-#if wxUSE_EXTENDED_RTTI
-WX_DEFINE_FLAGS( wxComboBoxStyle )
-
-wxBEGIN_FLAGS( wxComboBoxStyle )
-    // new style border flags, we put them first to
-    // use them for streaming out
-    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-    wxFLAGS_MEMBER(wxBORDER_RAISED)
-    wxFLAGS_MEMBER(wxBORDER_STATIC)
-    wxFLAGS_MEMBER(wxBORDER_NONE)
-
-    // old style border flags
-    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-    wxFLAGS_MEMBER(wxRAISED_BORDER)
-    wxFLAGS_MEMBER(wxSTATIC_BORDER)
-    wxFLAGS_MEMBER(wxBORDER)
-
-    // standard window styles
-    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-    wxFLAGS_MEMBER(wxWANTS_CHARS)
-    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
-    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
-    wxFLAGS_MEMBER(wxVSCROLL)
-    wxFLAGS_MEMBER(wxHSCROLL)
-
-    wxFLAGS_MEMBER(wxCB_SIMPLE)
-    wxFLAGS_MEMBER(wxCB_SORT)
-    wxFLAGS_MEMBER(wxCB_READONLY)
-    wxFLAGS_MEMBER(wxCB_DROPDOWN)
-
-wxEND_FLAGS( wxComboBoxStyle )
-
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxComboBox, wxControl,"wx/combobox.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxComboBox)
-    wxEVENT_PROPERTY( Select , wxEVT_COMMAND_COMBOBOX_SELECTED , wxCommandEvent )
-    wxEVENT_PROPERTY( TextEnter , wxEVT_COMMAND_TEXT_ENTER , wxCommandEvent )
-
-    // TODO DELEGATES
-    wxPROPERTY( Font , wxFont , SetFont , GetFont  , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY_COLLECTION( Choices , wxArrayString , wxString , AppendString , GetStrings , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY( Value ,wxString, SetValue, GetValue, EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY( Selection ,int, SetSelection, GetSelection, EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY_FLAGS( WindowStyle , wxComboBoxStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
-wxEND_PROPERTIES_TABLE()
-
-wxBEGIN_HANDLERS_TABLE(wxComboBox)
-wxEND_HANDLERS_TABLE()
-
-wxCONSTRUCTOR_5( wxComboBox , wxWindow* , Parent , wxWindowID , Id , wxString , Value , wxPoint , Position , wxSize , Size )
-#else
-IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)
-#endif
-
 // ----------------------------------------------------------------------------
 // function prototypes
 // ----------------------------------------------------------------------------
index 4358cfef5f4f56fc7400af2e89bd54580e67b079..622f6b93611282500318787b7081baa6deca740e 100644 (file)
 // wxWin macros
 // ----------------------------------------------------------------------------
 
-#if wxUSE_EXTENDED_RTTI
-WX_DEFINE_FLAGS( wxDialogStyle )
-
-wxBEGIN_FLAGS( wxDialogStyle )
-    // new style border flags, we put them first to
-    // use them for streaming out
-    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-    wxFLAGS_MEMBER(wxBORDER_RAISED)
-    wxFLAGS_MEMBER(wxBORDER_STATIC)
-    wxFLAGS_MEMBER(wxBORDER_NONE)
-
-    // old style border flags
-    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-    wxFLAGS_MEMBER(wxRAISED_BORDER)
-    wxFLAGS_MEMBER(wxSTATIC_BORDER)
-    wxFLAGS_MEMBER(wxNO_BORDER)
-
-    // standard window styles
-    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-
-    // dialog styles
-    wxFLAGS_MEMBER(wxWS_EX_VALIDATE_RECURSIVELY)
-    wxFLAGS_MEMBER(wxSTAY_ON_TOP)
-    wxFLAGS_MEMBER(wxCAPTION)
-#if WXWIN_COMPATIBILITY_2_6
-    wxFLAGS_MEMBER(wxTHICK_FRAME)
-#endif // WXWIN_COMPATIBILITY_2_6
-    wxFLAGS_MEMBER(wxSYSTEM_MENU)
-    wxFLAGS_MEMBER(wxRESIZE_BORDER)
-#if WXWIN_COMPATIBILITY_2_6
-    wxFLAGS_MEMBER(wxRESIZE_BOX)
-#endif // WXWIN_COMPATIBILITY_2_6
-    wxFLAGS_MEMBER(wxCLOSE_BOX)
-    wxFLAGS_MEMBER(wxMAXIMIZE_BOX)
-    wxFLAGS_MEMBER(wxMINIMIZE_BOX)
-wxEND_FLAGS( wxDialogStyle )
-
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxDialog, wxTopLevelWindow,"wx/dialog.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxDialog)
-    wxPROPERTY( Title, wxString, SetTitle, GetTitle, wxString() , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY_FLAGS( WindowStyle , wxDialogStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
-wxEND_PROPERTIES_TABLE()
-
-wxBEGIN_HANDLERS_TABLE(wxDialog)
-wxEND_HANDLERS_TABLE()
-
-wxCONSTRUCTOR_6( wxDialog , wxWindow* , Parent , wxWindowID , Id , wxString , Title , wxPoint , Position , wxSize , Size , long , WindowStyle)
-
-#else
-IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)
-#endif
-
 // ----------------------------------------------------------------------------
 // wxDialogModalData
 // ----------------------------------------------------------------------------
index da9e70ede71effd888ea018ee81f863913a2693c..b89b94b6714a727ad9b282449285621ec01ed50a 100644 (file)
@@ -65,78 +65,6 @@ BEGIN_EVENT_TABLE(wxFrame, wxFrameBase)
     EVT_PAINT(wxFrame::OnPaint)
 END_EVENT_TABLE()
 
-#if wxUSE_EXTENDED_RTTI
-WX_DEFINE_FLAGS( wxFrameStyle )
-
-wxBEGIN_FLAGS( wxFrameStyle )
-    // new style border flags, we put them first to
-    // use them for streaming out
-    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-    wxFLAGS_MEMBER(wxBORDER_RAISED)
-    wxFLAGS_MEMBER(wxBORDER_STATIC)
-    wxFLAGS_MEMBER(wxBORDER_NONE)
-
-    // old style border flags
-    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-    wxFLAGS_MEMBER(wxRAISED_BORDER)
-    wxFLAGS_MEMBER(wxSTATIC_BORDER)
-    wxFLAGS_MEMBER(wxBORDER)
-
-    // standard window styles
-    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-    wxFLAGS_MEMBER(wxWANTS_CHARS)
-    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
-    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
-    wxFLAGS_MEMBER(wxVSCROLL)
-    wxFLAGS_MEMBER(wxHSCROLL)
-
-    // frame styles
-    wxFLAGS_MEMBER(wxSTAY_ON_TOP)
-    wxFLAGS_MEMBER(wxCAPTION)
-#if WXWIN_COMPATIBILITY_2_6
-    wxFLAGS_MEMBER(wxTHICK_FRAME)
-#endif // WXWIN_COMPATIBILITY_2_6
-    wxFLAGS_MEMBER(wxSYSTEM_MENU)
-    wxFLAGS_MEMBER(wxRESIZE_BORDER)
-#if WXWIN_COMPATIBILITY_2_6
-    wxFLAGS_MEMBER(wxRESIZE_BOX)
-#endif // WXWIN_COMPATIBILITY_2_6
-    wxFLAGS_MEMBER(wxCLOSE_BOX)
-    wxFLAGS_MEMBER(wxMAXIMIZE_BOX)
-    wxFLAGS_MEMBER(wxMINIMIZE_BOX)
-
-    wxFLAGS_MEMBER(wxFRAME_TOOL_WINDOW)
-    wxFLAGS_MEMBER(wxFRAME_FLOAT_ON_PARENT)
-
-    wxFLAGS_MEMBER(wxFRAME_SHAPED)
-
-wxEND_FLAGS( wxFrameStyle )
-
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxFrame, wxTopLevelWindow,"wx/frame.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxFrame)
-    wxEVENT_PROPERTY( Menu , wxEVT_COMMAND_MENU_SELECTED , wxCommandEvent)
-
-    wxPROPERTY( Title,wxString, SetTitle, GetTitle, wxString() , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY_FLAGS( WindowStyle , wxFrameStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
-    wxPROPERTY( MenuBar , wxMenuBar * , SetMenuBar , GetMenuBar , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-wxEND_PROPERTIES_TABLE()
-
-wxBEGIN_HANDLERS_TABLE(wxFrame)
-wxEND_HANDLERS_TABLE()
-
-wxCONSTRUCTOR_6( wxFrame , wxWindow* , Parent , wxWindowID , Id , wxString , Title , wxPoint , Position , wxSize , Size , long , WindowStyle)
-
-#else
-IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow)
-#endif
-
 // ============================================================================
 // implementation
 // ============================================================================
index fdc6df77f1f9f7cd4bcfc2478256a791b39a62b4..85d1cc4f9114a3682b06e33ffb15ed4b45a933b9 100644 (file)
 // wxWin macros
 // ----------------------------------------------------------------------------
 
-#if wxUSE_EXTENDED_RTTI
-WX_DEFINE_FLAGS( wxGaugeStyle )
-
-wxBEGIN_FLAGS( wxGaugeStyle )
-    // new style border flags, we put them first to
-    // use them for streaming out
-    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-    wxFLAGS_MEMBER(wxBORDER_RAISED)
-    wxFLAGS_MEMBER(wxBORDER_STATIC)
-    wxFLAGS_MEMBER(wxBORDER_NONE)
-
-    // old style border flags
-    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-    wxFLAGS_MEMBER(wxRAISED_BORDER)
-    wxFLAGS_MEMBER(wxSTATIC_BORDER)
-    wxFLAGS_MEMBER(wxBORDER)
-
-    // standard window styles
-    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-    wxFLAGS_MEMBER(wxWANTS_CHARS)
-    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
-    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
-    wxFLAGS_MEMBER(wxVSCROLL)
-    wxFLAGS_MEMBER(wxHSCROLL)
-
-    wxFLAGS_MEMBER(wxGA_HORIZONTAL)
-    wxFLAGS_MEMBER(wxGA_VERTICAL)
-    wxFLAGS_MEMBER(wxGA_SMOOTH)
-
-wxEND_FLAGS( wxGaugeStyle )
-
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxGauge, wxControl,"wx/gauge.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxGauge)
-    wxPROPERTY( Value , int , SetValue, GetValue, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY( Range , int , SetRange, GetRange, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY( ShadowWidth , int , SetShadowWidth, GetShadowWidth, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY( BezelFace , int , SetBezelFace, GetBezelFace, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY_FLAGS( WindowStyle , wxGaugeStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
-wxEND_PROPERTIES_TABLE()
-
-wxBEGIN_HANDLERS_TABLE(wxGauge)
-wxEND_HANDLERS_TABLE()
-
-wxCONSTRUCTOR_6( wxGauge , wxWindow* , Parent , wxWindowID , Id , int , Range , wxPoint , Position , wxSize , Size , long , WindowStyle )
-#else
-IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl)
-#endif
-
 // ============================================================================
 // wxGauge implementation
 // ============================================================================
index fd23382ec914dab549a1fb7f0ee1fc5663ae02e9..e8276aea55e3679601e22b0a6a9ad1b300812dd7 100644 (file)
     #include  "wx/ownerdrw.h"
 #endif
 
-#if wxUSE_EXTENDED_RTTI
-WX_DEFINE_FLAGS( wxListBoxStyle )
-
-wxBEGIN_FLAGS( wxListBoxStyle )
-    // new style border flags, we put them first to
-    // use them for streaming out
-    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-    wxFLAGS_MEMBER(wxBORDER_RAISED)
-    wxFLAGS_MEMBER(wxBORDER_STATIC)
-    wxFLAGS_MEMBER(wxBORDER_NONE)
-
-    // old style border flags
-    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-    wxFLAGS_MEMBER(wxRAISED_BORDER)
-    wxFLAGS_MEMBER(wxSTATIC_BORDER)
-    wxFLAGS_MEMBER(wxBORDER)
-
-    // standard window styles
-    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-    wxFLAGS_MEMBER(wxWANTS_CHARS)
-    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
-    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
-    wxFLAGS_MEMBER(wxVSCROLL)
-    wxFLAGS_MEMBER(wxHSCROLL)
-
-    wxFLAGS_MEMBER(wxLB_SINGLE)
-    wxFLAGS_MEMBER(wxLB_MULTIPLE)
-    wxFLAGS_MEMBER(wxLB_EXTENDED)
-    wxFLAGS_MEMBER(wxLB_HSCROLL)
-    wxFLAGS_MEMBER(wxLB_ALWAYS_SB)
-    wxFLAGS_MEMBER(wxLB_NEEDED_SB)
-    wxFLAGS_MEMBER(wxLB_SORT)
-
-wxEND_FLAGS( wxListBoxStyle )
-
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxListBox, wxControl,"wx/listbox.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxListBox)
-    wxEVENT_PROPERTY( Select , wxEVT_COMMAND_LISTBOX_SELECTED , wxCommandEvent )
-    wxEVENT_PROPERTY( DoubleClick , wxEVT_COMMAND_LISTBOX_DOUBLECLICKED , wxCommandEvent )
-
-    wxPROPERTY( Font , wxFont , SetFont , GetFont  , EMPTY_MACROVALUE, 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY_COLLECTION( Choices , wxArrayString , wxString , AppendString , GetStrings, 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
-    wxPROPERTY( Selection ,int, SetSelection, GetSelection, EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
-    wxPROPERTY_FLAGS( WindowStyle , wxListBoxStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
-wxEND_PROPERTIES_TABLE()
-
-wxBEGIN_HANDLERS_TABLE(wxListBox)
-wxEND_HANDLERS_TABLE()
-
-wxCONSTRUCTOR_4( wxListBox , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size )
-#else
-IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControlWithItems)
-#endif
-
 // ============================================================================
 // list box item declaration and implementation
 // ============================================================================
index b42949ca83e2f54363fe3728a320e3187de6c12a..e5755c98196f47f3b5fc806a4f57c6b2f64b5fc0 100644 (file)
 #include "wx/imaglist.h"
 #include "wx/listctrl.h"
 
-#if wxUSE_EXTENDED_RTTI
-WX_DEFINE_FLAGS( wxListCtrlStyle )
-
-wxBEGIN_FLAGS( wxListCtrlStyle )
-    // new style border flags, we put them first to
-    // use them for streaming out
-    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-    wxFLAGS_MEMBER(wxBORDER_RAISED)
-    wxFLAGS_MEMBER(wxBORDER_STATIC)
-    wxFLAGS_MEMBER(wxBORDER_NONE)
-
-    // old style border flags
-    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-    wxFLAGS_MEMBER(wxRAISED_BORDER)
-    wxFLAGS_MEMBER(wxSTATIC_BORDER)
-    wxFLAGS_MEMBER(wxBORDER)
-
-    // standard window styles
-    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-    wxFLAGS_MEMBER(wxWANTS_CHARS)
-    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
-    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
-    wxFLAGS_MEMBER(wxVSCROLL)
-    wxFLAGS_MEMBER(wxHSCROLL)
-
-    wxFLAGS_MEMBER(wxLC_LIST)
-    wxFLAGS_MEMBER(wxLC_REPORT)
-    wxFLAGS_MEMBER(wxLC_ICON)
-    wxFLAGS_MEMBER(wxLC_SMALL_ICON)
-    wxFLAGS_MEMBER(wxLC_ALIGN_TOP)
-    wxFLAGS_MEMBER(wxLC_ALIGN_LEFT)
-    wxFLAGS_MEMBER(wxLC_AUTOARRANGE)
-    wxFLAGS_MEMBER(wxLC_USER_TEXT)
-    wxFLAGS_MEMBER(wxLC_EDIT_LABELS)
-    wxFLAGS_MEMBER(wxLC_NO_HEADER)
-    wxFLAGS_MEMBER(wxLC_SINGLE_SEL)
-    wxFLAGS_MEMBER(wxLC_SORT_ASCENDING)
-    wxFLAGS_MEMBER(wxLC_SORT_DESCENDING)
-    wxFLAGS_MEMBER(wxLC_VIRTUAL)
-
-wxEND_FLAGS( wxListCtrlStyle )
-
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxListCtrl, wxControl,"wx/listctrl.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxListCtrl)
-    wxEVENT_PROPERTY( TextUpdated , wxEVT_COMMAND_TEXT_UPDATED , wxCommandEvent )
-
-    wxPROPERTY_FLAGS( WindowStyle , wxListCtrlStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
-wxEND_PROPERTIES_TABLE()
-
-wxBEGIN_HANDLERS_TABLE(wxListCtrl)
-wxEND_HANDLERS_TABLE()
-
-wxCONSTRUCTOR_5( wxListCtrl , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle )
-
-/*
- TODO : Expose more information of a list's layout etc. via appropriate objects (à la NotebookPageInfo)
-*/
-#else
-IMPLEMENT_DYNAMIC_CLASS(wxListCtrl, wxControl)
-#endif
-
-IMPLEMENT_DYNAMIC_CLASS(wxListView, wxListCtrl)
-IMPLEMENT_DYNAMIC_CLASS(wxListItem, wxObject)
-
-IMPLEMENT_DYNAMIC_CLASS(wxListEvent, wxNotifyEvent)
-
 BEGIN_EVENT_TABLE(wxListCtrl, wxControl)
     EVT_PAINT(wxListCtrl::OnPaint)
 END_EVENT_TABLE()
index de723d660737f3bebdaf1165dbe0bb3c1b49568a..63ed36a02b62a0255156e0a9de55e5b1a952a2a7 100644 (file)
 // wxRadioButton creation
 // ----------------------------------------------------------------------------
 
-
-#if wxUSE_EXTENDED_RTTI
-WX_DEFINE_FLAGS( wxRadioButtonStyle )
-
-wxBEGIN_FLAGS( wxRadioButtonStyle )
-    // new style border flags, we put them first to
-    // use them for streaming out
-    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-    wxFLAGS_MEMBER(wxBORDER_RAISED)
-    wxFLAGS_MEMBER(wxBORDER_STATIC)
-    wxFLAGS_MEMBER(wxBORDER_NONE)
-
-    // old style border flags
-    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-    wxFLAGS_MEMBER(wxRAISED_BORDER)
-    wxFLAGS_MEMBER(wxSTATIC_BORDER)
-    wxFLAGS_MEMBER(wxBORDER)
-
-    // standard window styles
-    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-    wxFLAGS_MEMBER(wxWANTS_CHARS)
-    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
-    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
-    wxFLAGS_MEMBER(wxVSCROLL)
-    wxFLAGS_MEMBER(wxHSCROLL)
-
-    wxFLAGS_MEMBER(wxRB_GROUP)
-
-wxEND_FLAGS( wxRadioButtonStyle )
-
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxRadioButton, wxControl,"wx/radiobut.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxRadioButton)
-    wxEVENT_PROPERTY( Click , wxEVT_COMMAND_RADIOBUTTON_SELECTED , wxCommandEvent )
-    wxPROPERTY( Font , wxFont , SetFont , GetFont  , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY( Label,wxString, SetLabel, GetLabel, wxString(), 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
-    wxPROPERTY( Value ,bool, SetValue, GetValue, EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
-    wxPROPERTY_FLAGS( WindowStyle , wxRadioButtonStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
-wxEND_PROPERTIES_TABLE()
-
-wxBEGIN_HANDLERS_TABLE(wxRadioButton)
-wxEND_HANDLERS_TABLE()
-
-wxCONSTRUCTOR_6( wxRadioButton , wxWindow* , Parent , wxWindowID , Id , wxString , Label , wxPoint , Position , wxSize , Size , long , WindowStyle )
-
-#else
-IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
-#endif
-
-
 void wxRadioButton::Init()
 {
     m_radioStyle = pushButtonCtl;
index 2efee6c5dd5e696c483e97f75f68837aefaed5d8..8bf618f88c522aa427fb3167cadfbafbc34a4dbf 100644 (file)
 
 #include "wx/palmos/private.h"
 
-#if wxUSE_EXTENDED_RTTI
-WX_DEFINE_FLAGS( wxScrollBarStyle )
-
-wxBEGIN_FLAGS( wxScrollBarStyle )
-    // new style border flags, we put them first to
-    // use them for streaming out
-    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-    wxFLAGS_MEMBER(wxBORDER_RAISED)
-    wxFLAGS_MEMBER(wxBORDER_STATIC)
-    wxFLAGS_MEMBER(wxBORDER_NONE)
-
-    // old style border flags
-    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-    wxFLAGS_MEMBER(wxRAISED_BORDER)
-    wxFLAGS_MEMBER(wxSTATIC_BORDER)
-    wxFLAGS_MEMBER(wxBORDER)
-
-    // standard window styles
-    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-    wxFLAGS_MEMBER(wxWANTS_CHARS)
-    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
-    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
-    wxFLAGS_MEMBER(wxVSCROLL)
-    wxFLAGS_MEMBER(wxHSCROLL)
-
-    wxFLAGS_MEMBER(wxSB_HORIZONTAL)
-    wxFLAGS_MEMBER(wxSB_VERTICAL)
-
-wxEND_FLAGS( wxScrollBarStyle )
-
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxScrollBar, wxControl,"wx/scrolbar.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxScrollBar)
-    wxEVENT_RANGE_PROPERTY( Scroll , wxEVT_SCROLL_TOP , wxEVT_SCROLL_ENDSCROLL , wxScrollEvent )
-
-    wxPROPERTY( ThumbPosition , int , SetThumbPosition, GetThumbPosition, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY( Range , int , SetRange, GetRange, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY( ThumbSize , int , SetThumbSize, GetThumbSize, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY( PageSize , int , SetPageSize, GetPageSize, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY_FLAGS( WindowStyle , wxScrollBarStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
-wxEND_PROPERTIES_TABLE()
-
-wxBEGIN_HANDLERS_TABLE(wxScrollBar)
-wxEND_HANDLERS_TABLE()
-
-wxCONSTRUCTOR_5( wxScrollBar , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle )
-#else
-IMPLEMENT_DYNAMIC_CLASS(wxScrollBar, wxControl)
-#endif
-
 // Scrollbar
 bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
            const wxPoint& pos,
index 9caf2d290d7bb28e96142227ae2da78ecc23d2d4..9db9fa3679d645992eec2469068710509d5fa887 100644 (file)
 #include <Form.h>
 #include <Control.h>
 
-#if wxUSE_EXTENDED_RTTI
-WX_DEFINE_FLAGS( wxSliderStyle )
-
-wxBEGIN_FLAGS( wxSliderStyle )
-    // new style border flags, we put them first to
-    // use them for streaming out
-    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-    wxFLAGS_MEMBER(wxBORDER_RAISED)
-    wxFLAGS_MEMBER(wxBORDER_STATIC)
-    wxFLAGS_MEMBER(wxBORDER_NONE)
-
-    // old style border flags
-    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-    wxFLAGS_MEMBER(wxRAISED_BORDER)
-    wxFLAGS_MEMBER(wxSTATIC_BORDER)
-    wxFLAGS_MEMBER(wxBORDER)
-
-    // standard window styles
-    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-    wxFLAGS_MEMBER(wxWANTS_CHARS)
-    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
-    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
-    wxFLAGS_MEMBER(wxVSCROLL)
-    wxFLAGS_MEMBER(wxHSCROLL)
-
-    wxFLAGS_MEMBER(wxSL_HORIZONTAL)
-    wxFLAGS_MEMBER(wxSL_VERTICAL)
-    wxFLAGS_MEMBER(wxSL_AUTOTICKS)
-    wxFLAGS_MEMBER(wxSL_LABELS)
-    wxFLAGS_MEMBER(wxSL_LEFT)
-    wxFLAGS_MEMBER(wxSL_TOP)
-    wxFLAGS_MEMBER(wxSL_RIGHT)
-    wxFLAGS_MEMBER(wxSL_BOTTOM)
-    wxFLAGS_MEMBER(wxSL_BOTH)
-    wxFLAGS_MEMBER(wxSL_SELRANGE)
-
-wxEND_FLAGS( wxSliderStyle )
-
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxSlider, wxControl,"wx/slider.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxSlider)
-    wxEVENT_RANGE_PROPERTY( Scroll , wxEVT_SCROLL_TOP , wxEVT_SCROLL_ENDSCROLL , wxScrollEvent )
-    wxEVENT_PROPERTY( Updated , wxEVT_COMMAND_SLIDER_UPDATED , wxCommandEvent )
-
-    wxPROPERTY( Value , int , SetValue, GetValue , 0, 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY( Minimum , int , SetMin, GetMin, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY( Maximum , int , SetMax, GetMax, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY( PageSize , int , SetPageSize, GetLineSize, 1 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY( LineSize , int , SetLineSize, GetLineSize, 1 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY( ThumbLength , int , SetThumbLength, GetThumbLength, 1 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY_FLAGS( WindowStyle , wxSliderStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
-wxEND_PROPERTIES_TABLE()
-
-wxBEGIN_HANDLERS_TABLE(wxSlider)
-wxEND_HANDLERS_TABLE()
-
-wxCONSTRUCTOR_8( wxSlider , wxWindow* , Parent , wxWindowID , Id , int , Value , int , Minimum , int , Maximum , wxPoint , Position , wxSize , Size , long , WindowStyle )
-#else
-IMPLEMENT_DYNAMIC_CLASS(wxSlider, wxControl)
-#endif
-
 // Slider
 void wxSlider::Init()
 {
index abd631450977a3aeb256c76dcb6b0a74bb85c7b9..9b2425d3502f3c6659129c282ce6e7b25053f8ff 100644 (file)
@@ -32,8 +32,6 @@
     #include "wx/app.h"
 #endif
 
-IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent)
-
 // ============================================================================
 // implementation
 // ============================================================================
@@ -42,66 +40,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent)
 // wxWin macros
 // ----------------------------------------------------------------------------
 
-
-#if wxUSE_EXTENDED_RTTI
-WX_DEFINE_FLAGS( wxSpinButtonStyle )
-
-wxBEGIN_FLAGS( wxSpinButtonStyle )
-    // new style border flags, we put them first to
-    // use them for streaming out
-    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-    wxFLAGS_MEMBER(wxBORDER_RAISED)
-    wxFLAGS_MEMBER(wxBORDER_STATIC)
-    wxFLAGS_MEMBER(wxBORDER_NONE)
-
-    // old style border flags
-    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-    wxFLAGS_MEMBER(wxRAISED_BORDER)
-    wxFLAGS_MEMBER(wxSTATIC_BORDER)
-    wxFLAGS_MEMBER(wxBORDER)
-
-    // standard window styles
-    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-    wxFLAGS_MEMBER(wxWANTS_CHARS)
-    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
-    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
-    wxFLAGS_MEMBER(wxVSCROLL)
-    wxFLAGS_MEMBER(wxHSCROLL)
-
-    wxFLAGS_MEMBER(wxSP_HORIZONTAL)
-    wxFLAGS_MEMBER(wxSP_VERTICAL)
-    wxFLAGS_MEMBER(wxSP_ARROW_KEYS)
-    wxFLAGS_MEMBER(wxSP_WRAP)
-
-wxEND_FLAGS( wxSpinButtonStyle )
-
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxSpinButton, wxControl,"wx/spinbut.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxSpinButton)
-    wxEVENT_RANGE_PROPERTY( Spin , wxEVT_SCROLL_TOP , wxEVT_SCROLL_ENDSCROLL , wxSpinEvent )
-
-    wxPROPERTY( Value , int , SetValue, GetValue, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY( Min , int , SetMin, GetMin, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY( Max , int , SetMax, GetMax, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY_FLAGS( WindowStyle , wxSpinButtonStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
-wxEND_PROPERTIES_TABLE()
-
-wxBEGIN_HANDLERS_TABLE(wxSpinButton)
-wxEND_HANDLERS_TABLE()
-
-wxCONSTRUCTOR_5( wxSpinButton , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle )
-#else
-IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl)
-#endif
-
-
-
 // ----------------------------------------------------------------------------
 // wxSpinButton
 // ----------------------------------------------------------------------------
index 3c29544ccba9778c774687c715bd826d36246d8f..166e0e6a6bed75a5168c156a574b8e09956693b4 100644 (file)
 // macros
 // ----------------------------------------------------------------------------
 
-#if wxUSE_EXTENDED_RTTI
-WX_DEFINE_FLAGS( wxSpinCtrlStyle )
-
-wxBEGIN_FLAGS( wxSpinCtrlStyle )
-    // new style border flags, we put them first to
-    // use them for streaming out
-    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-    wxFLAGS_MEMBER(wxBORDER_RAISED)
-    wxFLAGS_MEMBER(wxBORDER_STATIC)
-    wxFLAGS_MEMBER(wxBORDER_NONE)
-
-    // old style border flags
-    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-    wxFLAGS_MEMBER(wxRAISED_BORDER)
-    wxFLAGS_MEMBER(wxSTATIC_BORDER)
-    wxFLAGS_MEMBER(wxBORDER)
-
-    // standard window styles
-    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-    wxFLAGS_MEMBER(wxWANTS_CHARS)
-    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
-    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
-    wxFLAGS_MEMBER(wxVSCROLL)
-    wxFLAGS_MEMBER(wxHSCROLL)
-
-    wxFLAGS_MEMBER(wxSP_HORIZONTAL)
-    wxFLAGS_MEMBER(wxSP_VERTICAL)
-    wxFLAGS_MEMBER(wxSP_ARROW_KEYS)
-    wxFLAGS_MEMBER(wxSP_WRAP)
-
-wxEND_FLAGS( wxSpinCtrlStyle )
-
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxSpinCtrl, wxControl,"wx/spinbut.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxSpinCtrl)
-    wxEVENT_RANGE_PROPERTY( Spin , wxEVT_SCROLL_TOP , wxEVT_SCROLL_ENDSCROLL , wxSpinEvent )
-    wxEVENT_PROPERTY( Updated , wxEVT_COMMAND_SPINCTRL_UPDATED , wxCommandEvent )
-    wxEVENT_PROPERTY( TextUpdated , wxEVT_COMMAND_TEXT_UPDATED , wxCommandEvent )
-    wxEVENT_PROPERTY( TextEnter , wxEVT_COMMAND_TEXT_ENTER , wxCommandEvent )
-
-    wxPROPERTY( ValueString , wxString , SetValue , GetValue , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) ;
-    wxPROPERTY( Value , int , SetValue, GetValue, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY( Min , int , SetMin, GetMin, 0, 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
-    wxPROPERTY( Max , int , SetMax, GetMax, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY_FLAGS( WindowStyle , wxSpinCtrlStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
-/*
-    TODO PROPERTIES
-        style wxSP_ARROW_KEYS
-*/
-wxEND_PROPERTIES_TABLE()
-
-wxBEGIN_HANDLERS_TABLE(wxSpinCtrl)
-wxEND_HANDLERS_TABLE()
-
-wxCONSTRUCTOR_6( wxSpinCtrl , wxWindow* , Parent , wxWindowID , Id , wxString , ValueString , wxPoint , Position , wxSize , Size , long , WindowStyle )
-#else
-IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl, wxControl)
-#endif
-
 BEGIN_EVENT_TABLE(wxSpinCtrl, wxSpinButton)
     EVT_CHAR(wxSpinCtrl::OnChar)
 
index 25468400614a96379232382ba877a488d2929145..e16b906f6e55c27edffe2f7d54c3d567c762ccd1 100644 (file)
 // macors
 // ---------------------------------------------------------------------------
 
-#if wxUSE_EXTENDED_RTTI
-WX_DEFINE_FLAGS( wxStaticBitmapStyle )
-
-wxBEGIN_FLAGS( wxStaticBitmapStyle )
-    // new style border flags, we put them first to
-    // use them for streaming out
-    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-    wxFLAGS_MEMBER(wxBORDER_RAISED)
-    wxFLAGS_MEMBER(wxBORDER_STATIC)
-    wxFLAGS_MEMBER(wxBORDER_NONE)
-
-    // old style border flags
-    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-    wxFLAGS_MEMBER(wxRAISED_BORDER)
-    wxFLAGS_MEMBER(wxSTATIC_BORDER)
-    wxFLAGS_MEMBER(wxBORDER)
-
-    // standard window styles
-    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-    wxFLAGS_MEMBER(wxWANTS_CHARS)
-    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
-    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
-    wxFLAGS_MEMBER(wxVSCROLL)
-    wxFLAGS_MEMBER(wxHSCROLL)
-
-wxEND_FLAGS( wxStaticBitmapStyle )
-
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxStaticBitmap, wxControl,"wx/statbmp.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxStaticBitmap)
-    wxPROPERTY_FLAGS( WindowStyle , wxStaticBitmapStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE, 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
-wxEND_PROPERTIES_TABLE()
-
-wxBEGIN_HANDLERS_TABLE(wxStaticBitmap)
-wxEND_HANDLERS_TABLE()
-
-wxCONSTRUCTOR_5( wxStaticBitmap, wxWindow* , Parent , wxWindowID , Id , wxBitmap, Bitmap, wxPoint , Position , wxSize , Size )
-
-#else
-IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
-#endif
-
-/*
-    TODO PROPERTIES :
-        bitmap
-*/
-
 // ===========================================================================
 // implementation
 // ===========================================================================
index eab2e378b25013db839dbeba8bf024d577f1570e..0b6d3509856d6e2170095d54940796f8660209ba 100644 (file)
 // wxWin macros
 // ----------------------------------------------------------------------------
 
-#if wxUSE_EXTENDED_RTTI
-WX_DEFINE_FLAGS( wxStaticBoxStyle )
-
-wxBEGIN_FLAGS( wxStaticBoxStyle )
-    // new style border flags, we put them first to
-    // use them for streaming out
-    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-    wxFLAGS_MEMBER(wxBORDER_RAISED)
-    wxFLAGS_MEMBER(wxBORDER_STATIC)
-    wxFLAGS_MEMBER(wxBORDER_NONE)
-
-    // old style border flags
-    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-    wxFLAGS_MEMBER(wxRAISED_BORDER)
-    wxFLAGS_MEMBER(wxSTATIC_BORDER)
-    wxFLAGS_MEMBER(wxBORDER)
-
-    // standard window styles
-    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-    wxFLAGS_MEMBER(wxWANTS_CHARS)
-    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
-    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
-    wxFLAGS_MEMBER(wxVSCROLL)
-    wxFLAGS_MEMBER(wxHSCROLL)
-
-wxEND_FLAGS( wxStaticBoxStyle )
-
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxStaticBox, wxControl,"wx/statbox.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxStaticBox)
-    wxPROPERTY( Label,wxString, SetLabel, GetLabel, wxString() , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY_FLAGS( WindowStyle , wxStaticBoxStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE, 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
-/*
-    TODO PROPERTIES :
-        label
-*/
-wxEND_PROPERTIES_TABLE()
-
-wxBEGIN_HANDLERS_TABLE(wxStaticBox)
-wxEND_HANDLERS_TABLE()
-
-wxCONSTRUCTOR_6( wxStaticBox , wxWindow* , Parent , wxWindowID , Id , wxString , Label , wxPoint , Position , wxSize , Size , long , WindowStyle )
-#else
-IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl)
-#endif
-
 // ============================================================================
 // implementation
 // ============================================================================
index eeed178c84605cc9b2538eed1cb1d1aca8d67a8b..dce02bfd1e0e5ce0021dadb347dca3a5300b1816 100644 (file)
 // implementation
 // ============================================================================
 
-#if wxUSE_EXTENDED_RTTI
-WX_DEFINE_FLAGS( wxStaticLineStyle )
-
-wxBEGIN_FLAGS( wxStaticLineStyle )
-    // new style border flags, we put them first to
-    // use them for streaming out
-    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-    wxFLAGS_MEMBER(wxBORDER_RAISED)
-    wxFLAGS_MEMBER(wxBORDER_STATIC)
-    wxFLAGS_MEMBER(wxBORDER_NONE)
-
-    // old style border flags
-    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-    wxFLAGS_MEMBER(wxRAISED_BORDER)
-    wxFLAGS_MEMBER(wxSTATIC_BORDER)
-    wxFLAGS_MEMBER(wxBORDER)
-
-    // standard window styles
-    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-    wxFLAGS_MEMBER(wxWANTS_CHARS)
-    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
-    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
-    wxFLAGS_MEMBER(wxVSCROLL)
-    wxFLAGS_MEMBER(wxHSCROLL)
-
-    wxFLAGS_MEMBER(wxLI_HORIZONTAL)
-    wxFLAGS_MEMBER(wxLI_VERTICAL)
-
-wxEND_FLAGS( wxStaticLineStyle )
-
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxStaticLine, wxControl,"wx/statline.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxStaticLine)
-    wxPROPERTY_FLAGS( WindowStyle , wxStaticLineStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE, 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
-wxEND_PROPERTIES_TABLE()
-
-wxBEGIN_HANDLERS_TABLE(wxStaticLine)
-wxEND_HANDLERS_TABLE()
-
-wxCONSTRUCTOR_5( wxStaticLine, wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle)
-
-#else
-IMPLEMENT_DYNAMIC_CLASS(wxStaticLine, wxControl)
-#endif
-
-/*
-    TODO PROPERTIES :
-        style (wxLI_HORIZONTAL)
-*/
-
 // ----------------------------------------------------------------------------
 // wxStaticLine
 // ----------------------------------------------------------------------------
index 413c259f141928fa0cd21de3201a2796dd9d21a4..8147bf2525f8684cdecdaa2e013ee719c613ad72 100644 (file)
 
 #include <Field.h>
 
-#if wxUSE_EXTENDED_RTTI
-WX_DEFINE_FLAGS( wxStaticTextStyle )
-
-wxBEGIN_FLAGS( wxStaticTextStyle )
-    // new style border flags, we put them first to
-    // use them for streaming out
-    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-    wxFLAGS_MEMBER(wxBORDER_RAISED)
-    wxFLAGS_MEMBER(wxBORDER_STATIC)
-    wxFLAGS_MEMBER(wxBORDER_NONE)
-
-    // old style border flags
-    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-    wxFLAGS_MEMBER(wxRAISED_BORDER)
-    wxFLAGS_MEMBER(wxSTATIC_BORDER)
-    wxFLAGS_MEMBER(wxBORDER)
-
-    // standard window styles
-    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-    wxFLAGS_MEMBER(wxWANTS_CHARS)
-    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
-    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
-    wxFLAGS_MEMBER(wxVSCROLL)
-    wxFLAGS_MEMBER(wxHSCROLL)
-
-    wxFLAGS_MEMBER(wxST_NO_AUTORESIZE)
-    wxFLAGS_MEMBER(wxALIGN_LEFT)
-    wxFLAGS_MEMBER(wxALIGN_RIGHT)
-    wxFLAGS_MEMBER(wxALIGN_CENTRE)
-
-wxEND_FLAGS( wxStaticTextStyle )
-
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxStaticText, wxControl,"wx/stattext.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxStaticText)
-    wxPROPERTY( Label,wxString, SetLabel, GetLabel, wxString() , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY_FLAGS( WindowStyle , wxStaticTextStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE, 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
-wxEND_PROPERTIES_TABLE()
-
-wxBEGIN_HANDLERS_TABLE(wxStaticText)
-wxEND_HANDLERS_TABLE()
-
-wxCONSTRUCTOR_6( wxStaticText , wxWindow* , Parent , wxWindowID , Id , wxString , Label , wxPoint , Position , wxSize , Size , long , WindowStyle )
-#else
-IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl)
-#endif
-
 bool wxStaticText::Create(wxWindow *parent,
                           wxWindowID id,
                           const wxString& label,
index febb66a683cf7db87f85ef3014d4f43cfbc84261..40645d5f412c35ba26253c398f3a98770030fa91 100644 (file)
@@ -86,76 +86,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxRichEditModule, wxModule)
 // event tables and other macros
 // ----------------------------------------------------------------------------
 
-#if wxUSE_EXTENDED_RTTI
-WX_DEFINE_FLAGS( wxTextCtrlStyle )
-
-wxBEGIN_FLAGS( wxTextCtrlStyle )
-    // new style border flags, we put them first to
-    // use them for streaming out
-    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-    wxFLAGS_MEMBER(wxBORDER_RAISED)
-    wxFLAGS_MEMBER(wxBORDER_STATIC)
-    wxFLAGS_MEMBER(wxBORDER_NONE)
-
-    // old style border flags
-    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-    wxFLAGS_MEMBER(wxRAISED_BORDER)
-    wxFLAGS_MEMBER(wxSTATIC_BORDER)
-    wxFLAGS_MEMBER(wxBORDER)
-
-    // standard window styles
-    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-    wxFLAGS_MEMBER(wxWANTS_CHARS)
-    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
-    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
-    wxFLAGS_MEMBER(wxVSCROLL)
-    wxFLAGS_MEMBER(wxHSCROLL)
-
-    wxFLAGS_MEMBER(wxTE_PROCESS_ENTER)
-    wxFLAGS_MEMBER(wxTE_PROCESS_TAB)
-    wxFLAGS_MEMBER(wxTE_MULTILINE)
-    wxFLAGS_MEMBER(wxTE_PASSWORD)
-    wxFLAGS_MEMBER(wxTE_READONLY)
-    wxFLAGS_MEMBER(wxHSCROLL)
-    wxFLAGS_MEMBER(wxTE_RICH)
-    wxFLAGS_MEMBER(wxTE_RICH2)
-    wxFLAGS_MEMBER(wxTE_AUTO_URL)
-    wxFLAGS_MEMBER(wxTE_NOHIDESEL)
-    wxFLAGS_MEMBER(wxTE_LEFT)
-    wxFLAGS_MEMBER(wxTE_CENTRE)
-    wxFLAGS_MEMBER(wxTE_RIGHT)
-    wxFLAGS_MEMBER(wxTE_DONTWRAP)
-    wxFLAGS_MEMBER(wxTE_CHARWRAP)
-    wxFLAGS_MEMBER(wxTE_WORDWRAP)
-
-wxEND_FLAGS( wxTextCtrlStyle )
-
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxTextCtrl, wxControl,"wx/textctrl.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxTextCtrl)
-    wxEVENT_PROPERTY( TextUpdated , wxEVT_COMMAND_TEXT_UPDATED , wxCommandEvent )
-    wxEVENT_PROPERTY( TextEnter , wxEVT_COMMAND_TEXT_ENTER , wxCommandEvent )
-
-    wxPROPERTY( Font , wxFont , SetFont , GetFont  , EMPTY_MACROVALUE, 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
-    wxPROPERTY( Value , wxString , SetValue, GetValue, wxString() , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY_FLAGS( WindowStyle , wxTextCtrlStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
-wxEND_PROPERTIES_TABLE()
-
-wxBEGIN_HANDLERS_TABLE(wxTextCtrl)
-wxEND_HANDLERS_TABLE()
-
-wxCONSTRUCTOR_6( wxTextCtrl , wxWindow* , Parent , wxWindowID , Id , wxString , Value , wxPoint , Position , wxSize , Size , long , WindowStyle)
-#else
-IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxTextCtrlBase)
-#endif
-
-
 BEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase)
     EVT_CHAR(wxTextCtrl::OnChar)
     EVT_DROP_FILES(wxTextCtrl::OnDropFiles)
index bf2efa8613fd88c224f07f69d13164d774682a2e..b7f12e18c015aa6a77f327f51a365380edee9d3f 100644 (file)
 // wxWin macros
 // ----------------------------------------------------------------------------
 
-#if wxUSE_EXTENDED_RTTI
-WX_DEFINE_FLAGS( wxTreeCtrlStyle )
-
-wxBEGIN_FLAGS( wxTreeCtrlStyle )
-    // new style border flags, we put them first to
-    // use them for streaming out
-    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-    wxFLAGS_MEMBER(wxBORDER_RAISED)
-    wxFLAGS_MEMBER(wxBORDER_STATIC)
-    wxFLAGS_MEMBER(wxBORDER_NONE)
-
-    // old style border flags
-    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-    wxFLAGS_MEMBER(wxRAISED_BORDER)
-    wxFLAGS_MEMBER(wxSTATIC_BORDER)
-    wxFLAGS_MEMBER(wxBORDER)
-
-    // standard window styles
-    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-    wxFLAGS_MEMBER(wxWANTS_CHARS)
-    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
-    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
-    wxFLAGS_MEMBER(wxVSCROLL)
-    wxFLAGS_MEMBER(wxHSCROLL)
-
-    wxFLAGS_MEMBER(wxTR_EDIT_LABELS)
-    wxFLAGS_MEMBER(wxTR_NO_BUTTONS)
-    wxFLAGS_MEMBER(wxTR_HAS_BUTTONS)
-    wxFLAGS_MEMBER(wxTR_TWIST_BUTTONS)
-    wxFLAGS_MEMBER(wxTR_NO_LINES)
-    wxFLAGS_MEMBER(wxTR_FULL_ROW_HIGHLIGHT)
-    wxFLAGS_MEMBER(wxTR_LINES_AT_ROOT)
-    wxFLAGS_MEMBER(wxTR_HIDE_ROOT)
-    wxFLAGS_MEMBER(wxTR_ROW_LINES)
-    wxFLAGS_MEMBER(wxTR_HAS_VARIABLE_ROW_HEIGHT)
-    wxFLAGS_MEMBER(wxTR_SINGLE)
-    wxFLAGS_MEMBER(wxTR_MULTIPLE)
-    wxFLAGS_MEMBER(wxTR_EXTENDED)
-    wxFLAGS_MEMBER(wxTR_DEFAULT_STYLE)
-
-wxEND_FLAGS( wxTreeCtrlStyle )
-
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxTreeCtrl, wxControl,"wx/treectrl.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxTreeCtrl)
-    wxEVENT_PROPERTY( TextUpdated , wxEVT_COMMAND_TEXT_UPDATED , wxCommandEvent )
-    wxEVENT_RANGE_PROPERTY( TreeEvent , wxEVT_COMMAND_TREE_BEGIN_DRAG , wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK , wxTreeEvent )
-    wxPROPERTY_FLAGS( WindowStyle , wxTreeCtrlStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
-wxEND_PROPERTIES_TABLE()
-
-wxBEGIN_HANDLERS_TABLE(wxTreeCtrl)
-wxEND_HANDLERS_TABLE()
-
-wxCONSTRUCTOR_5( wxTreeCtrl , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle )
-#else
-IMPLEMENT_DYNAMIC_CLASS(wxTreeCtrl, wxControl)
-#endif
-
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
index 144ad5b1122b741c43a4dd85c3abc66d8865b2ac..ca7d5955e34c838bcbe22d4253450653c38d8996 100644 (file)
 // method
 #ifdef __WXUNIVERSAL__
     IMPLEMENT_ABSTRACT_CLASS(wxWindowPalm, wxWindowBase)
-#else // __WXPalm__
-#if wxUSE_EXTENDED_RTTI
-
-// windows that are created from a parent window during its Create method, eg. spin controls in a calendar controls
-// must never been streamed out separately otherwise chaos occurs. Right now easiest is to test for negative ids, as
-// windows with negative ids never can be recreated anyway
-
-bool wxWindowStreamingCallback( const wxObject *object, wxWriter * , wxPersister * , wxxVariantArray & )
-{
-    return false;
-}
-
-IMPLEMENT_DYNAMIC_CLASS_XTI_CALLBACK(wxWindow, wxWindowBase,"wx/window.h", wxWindowStreamingCallback)
-
-// make wxWindowList known before the property is used
-
-wxCOLLECTION_TYPE_INFO( wxWindow* , wxWindowList ) ;
-
-template<> void wxCollectionToVariantArray( wxWindowList const &theList, wxxVariantArray &value)
-{
-    wxListCollectionToVariantArray<wxWindowList::compatibility_iterator>( theList , value ) ;
-}
-
-WX_DEFINE_FLAGS( wxWindowStyle )
-
-wxBEGIN_FLAGS( wxWindowStyle )
-    // new style border flags, we put them first to
-    // use them for streaming out
-
-    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-    wxFLAGS_MEMBER(wxBORDER_RAISED)
-    wxFLAGS_MEMBER(wxBORDER_STATIC)
-    wxFLAGS_MEMBER(wxBORDER_NONE)
-
-    // old style border flags
-    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-    wxFLAGS_MEMBER(wxRAISED_BORDER)
-    wxFLAGS_MEMBER(wxSTATIC_BORDER)
-    wxFLAGS_MEMBER(wxBORDER)
-
-    // standard window styles
-    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-    wxFLAGS_MEMBER(wxWANTS_CHARS)
-    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
-    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
-    wxFLAGS_MEMBER(wxVSCROLL)
-    wxFLAGS_MEMBER(wxHSCROLL)
-
-wxEND_FLAGS( wxWindowStyle )
-
-wxBEGIN_PROPERTIES_TABLE(wxWindow)
-    wxEVENT_PROPERTY( Close , wxEVT_CLOSE_WINDOW , wxCloseEvent)
-    wxEVENT_PROPERTY( Create , wxEVT_CREATE , wxWindowCreateEvent )
-    wxEVENT_PROPERTY( Destroy , wxEVT_DESTROY , wxWindowDestroyEvent )
-    // Always constructor Properties first
-
-    wxREADONLY_PROPERTY( Parent,wxWindow*, GetParent, EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY( Id,wxWindowID, SetId, GetId, wxID_ANY, 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
-    wxPROPERTY( Position,wxPoint, SetPosition , GetPosition, wxDefaultPosition , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // pos
-    wxPROPERTY( Size,wxSize, SetSize, GetSize, wxDefaultSize , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // size
-    wxPROPERTY( WindowStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
-
-    // Then all relations of the object graph
-
-    wxREADONLY_PROPERTY_COLLECTION( Children , wxWindowList , wxWindowBase* , GetWindowChildren , wxPROP_OBJECT_GRAPH /*flags*/ , wxT("Helpstring") , wxT("group"))
-
-   // and finally all other properties
-
-    wxPROPERTY( ExtraStyle , long , SetExtraStyle , GetExtraStyle , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // extstyle
-    wxPROPERTY( BackgroundColour , wxColour , SetBackgroundColour , GetBackgroundColour , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // bg
-    wxPROPERTY( ForegroundColour , wxColour , SetForegroundColour , GetForegroundColour , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // fg
-    wxPROPERTY( Enabled , bool , Enable , IsEnabled , wxxVariant((bool)true) , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY( Shown , bool , Show , IsShown , wxxVariant((bool)true) , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-#if 0
-    // possible property candidates (not in xrc) or not valid in all subclasses
-    wxPROPERTY( Title,wxString, SetTitle, GetTitle, wxT("") )
-    wxPROPERTY( Font , wxFont , SetFont , GetWindowFont  , )
-    wxPROPERTY( Label,wxString, SetLabel, GetLabel, wxT("") )
-    // MaxHeight, Width , MinHeight , Width
-    // TODO switch label to control and title to toplevels
-
-    wxPROPERTY( ThemeEnabled , bool , SetThemeEnabled , GetThemeEnabled , )
-    //wxPROPERTY( Cursor , wxCursor , SetCursor , GetCursor , )
-    // wxPROPERTY( ToolTip , wxString , SetToolTip , GetToolTipText , )
-    wxPROPERTY( AutoLayout , bool , SetAutoLayout , GetAutoLayout , )
-
-
-
-#endif
-wxEND_PROPERTIES_TABLE()
-
-wxBEGIN_HANDLERS_TABLE(wxWindow)
-wxEND_HANDLERS_TABLE()
-
-wxCONSTRUCTOR_DUMMY(wxWindow)
-
-#else
-    IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowBase)
-#endif
-#endif // __WXUNIVERSAL__/__WXPalm__
+#endif // __WXUNIVERSAL__
 
 BEGIN_EVENT_TABLE(wxWindowPalm, wxWindowBase)
     EVT_ERASE_BACKGROUND(wxWindowPalm::OnEraseBackground)
index eb4faa55845dcfa7606382c4f365440506a3d148..f21e6aa2f72ac8499f27bec2f44698c2a4c1028b 100644 (file)
@@ -38,8 +38,6 @@
 // implementation
 // ============================================================================
 
-IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton)
-
 BEGIN_EVENT_TABLE(wxBitmapButton, wxButton)
     EVT_SET_FOCUS(wxBitmapButton::OnSetFocus)
     EVT_KILL_FOCUS(wxBitmapButton::OnKillFocus)
index 4d9a8430841021021d97992a0d9e705f587ad03c..788196ca61d13bbb3fb6b720e445d644e943907e 100644 (file)
@@ -79,8 +79,6 @@ static const wxCoord DEFAULT_BTN_MARGIN_Y = 0;
 // implementation
 // ============================================================================
 
-IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
-
 // ----------------------------------------------------------------------------
 // creation
 // ----------------------------------------------------------------------------
index d92d93808eb0804b07c6d0aabeda0ed721baa3ce..d07f1ad561f2987ad253dddcfaf05e6485176b87 100644 (file)
@@ -59,8 +59,6 @@ public:
 // implementation
 // ============================================================================
 
-IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl)
-
 // ----------------------------------------------------------------------------
 // wxCheckBox
 // ----------------------------------------------------------------------------
index d1d5312f36b6e21fe0cd68105ee4d095e1fc0658..5bb5b0020b2db5d86d30f87c3e4a68616d91c88b 100644 (file)
@@ -31,8 +31,6 @@
     #include "wx/arrstr.h"
 #endif
 
-IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControlWithItems)
-
 BEGIN_EVENT_TABLE(wxChoice, wxComboBox)
     EVT_COMBOBOX(wxID_ANY, wxChoice::OnComboBox)
 END_EVENT_TABLE()
index fbb8423f7bdf3909c3f850ecf12b7d6614f26053..9adf6a99b8daa3cbbc223ffdb290d54d6f404be8 100644 (file)
@@ -41,8 +41,6 @@ BEGIN_EVENT_TABLE(wxDialog,wxDialogBase)
     EVT_CLOSE   (wxDialog::OnCloseWindow)
 END_EVENT_TABLE()
 
-IMPLEMENT_DYNAMIC_CLASS(wxDialog,wxTopLevelWindow)
-
 void wxDialog::Init()
 {
     m_returnCode = 0;
index cb7aa42d0bfde0517f763a950295a1121335018b..67a653c8cc880096e9134a52d5016ffa1f35291a 100644 (file)
@@ -42,8 +42,6 @@ BEGIN_EVENT_TABLE(wxFrame, wxFrameBase)
     EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged)
 END_EVENT_TABLE()
 
-IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow)
-
 // ----------------------------------------------------------------------------
 // ctors
 // ----------------------------------------------------------------------------
index 28f84a4908fa106ae00c973687629fb35f538e3e..f34de9ab82598bed9182bbdfcc66d1beae04d242 100644 (file)
@@ -33,8 +33,6 @@
 
 #include "wx/univ/renderer.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl)
-
 // ============================================================================
 // implementation
 // ============================================================================
index 520ae86b20c61e16a44417ddee3e0ee08781e2d7..147ebfb148dfe4cf9be1209cc73da746f320f6ce 100644 (file)
@@ -97,8 +97,6 @@ protected:
 // implementation of wxListBox
 // ============================================================================
 
-IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControlWithItems)
-
 BEGIN_EVENT_TABLE(wxListBox, wxListBoxBase)
     EVT_SIZE(wxListBox::OnSize)
 END_EVENT_TABLE()
index 41958ea77957f440bcc332b6fb0e59d1b2caa737..cf209a43979e6a199ea81c5836c4507ec0e1f0f9 100644 (file)
@@ -41,8 +41,6 @@
 // implementation
 // ============================================================================
 
-IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
-
 // ----------------------------------------------------------------------------
 // wxRadioButton
 // ----------------------------------------------------------------------------
index 13c3570f79ddc20279ebc47b9633ffd8a67bf502..ff451e18fc377f4e91feb80e29bcf01ce91a6e3e 100644 (file)
@@ -74,8 +74,6 @@ private:
 // implementation
 // ============================================================================
 
-IMPLEMENT_DYNAMIC_CLASS(wxScrollBar, wxControl)
-
 BEGIN_EVENT_TABLE(wxScrollBar, wxScrollBarBase)
 END_EVENT_TABLE()
 
index 8dbb9abf0052ffe7d738d708117d21c8efe39301..431707a0956f04ca7a73d3032fdfe5ebc44cb2f6 100644 (file)
@@ -96,8 +96,6 @@ static const wxCoord SLIDER_LABEL_MARGIN = 2;
 // implementation of wxSlider
 // ============================================================================
 
-IMPLEMENT_DYNAMIC_CLASS(wxSlider, wxControl)
-
 BEGIN_EVENT_TABLE(wxSlider, wxControl)
     EVT_SIZE(wxSlider::OnSize)
 END_EVENT_TABLE()
index e1d885795b7660168b04fd83f1f860759757cc7c..499f53a1ec5bca9e8100485c7e9fe7ab377b10b5 100644 (file)
@@ -38,9 +38,6 @@
 // implementation of wxSpinButton
 // ============================================================================
 
-IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent)
-IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl)
-
 // ----------------------------------------------------------------------------
 // creation
 // ----------------------------------------------------------------------------
index 6059a8ab2e195ce4a8a4a18ae1f6d18e470d2f7c..5ff0f72ab687099f9516224a7bb8c5b9d1aecc5c 100644 (file)
@@ -40,8 +40,6 @@
 // implementation
 // ============================================================================
 
-IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
-
 // ----------------------------------------------------------------------------
 // wxStaticBitmap
 // ----------------------------------------------------------------------------
index 773f5422177d47d7f096a24aa7811ed3fba7b6f3..1241fe2638fddfba06db866603d875a29f805833 100644 (file)
@@ -37,8 +37,6 @@
 // implementation
 // ============================================================================
 
-IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl)
-
 // ----------------------------------------------------------------------------
 // wxStaticBox
 // ----------------------------------------------------------------------------
index dfdac47862d0144b1d5bfa0a9a0dfdc4f1c57fc7..980af6185ac68c5366bf099ed88a966af7b07aed 100644 (file)
@@ -38,8 +38,6 @@
 // implementation
 // ============================================================================
 
-IMPLEMENT_DYNAMIC_CLASS(wxStaticLine, wxControl)
-
 // ----------------------------------------------------------------------------
 // wxStaticLine
 // ----------------------------------------------------------------------------
index 23573fcdd14d2b434454885cc5eb473a4a7fea5b..041ea21d516a17f5a62c58d68ecb09bbdcfaa429 100644 (file)
@@ -633,8 +633,6 @@ BEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase)
     EVT_SIZE(wxTextCtrl::OnSize)
 END_EVENT_TABLE()
 
-IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxTextCtrlBase)
-
 // ----------------------------------------------------------------------------
 // creation
 // ----------------------------------------------------------------------------
index 53ceebfce940647fa1b97ffe64c981787810f8ad..671c3b010f5e5ffaf89dcc2e919d1b9af48c97e5 100644 (file)
@@ -141,8 +141,6 @@ void wxColourRefData::AllocColour( WXColormap cmap )
 
 #define SHIFT (8*(sizeof(short int)-sizeof(char)))
 
-IMPLEMENT_DYNAMIC_CLASS(wxColour,wxGDIObject)
-
 wxColour::~wxColour()
 {
 }
index 9cb89389452c2c63092f567b721bb20516ff7f28..e25156a2b219f4c7a958e58be58ba2692f85a7c3 100644 (file)
@@ -131,8 +131,6 @@ WX_DEFINE_OBJARRAY(wxSourceLineArray);
 //  wxTextCtrl
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxTextCtrlBase)
-
 BEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase)
     EVT_PAINT(wxTextCtrl::OnPaint)
     EVT_ERASE_BACKGROUND(wxTextCtrl::OnEraseBackground)