From 289532452089421ddadbd4726a8469511a19ab76 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Tue, 4 Jan 2011 08:31:53 +0000 Subject: [PATCH] merging back XTI branch part 2 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66555 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- build/bakefiles/files.bkl | 20 + build/msw/makefile.bcc | 440 +++++- build/msw/makefile.gcc | 440 +++++- build/msw/makefile.vc | 440 +++++- build/msw/makefile.wat | 440 +++++- build/msw/wx_base.dsp | 20 + build/msw/wx_core.dsp | 60 + build/msw/wx_vc7_base.vcproj | 15 + build/msw/wx_vc7_core.vcproj | 45 + build/msw/wx_vc8_base.vcproj | 20 + build/msw/wx_vc8_core.vcproj | 60 + build/msw/wx_vc9_base.vcproj | 20 + build/msw/wx_vc9_core.vcproj | 60 + include/wx/defs.h | 89 ++ include/wx/flags.h | 14 +- include/wx/menu.h | 45 + include/wx/notebook.h | 51 + include/wx/object.h | 224 +-- include/wx/xti.h | 2225 +++++----------------------- include/wx/xtistrm.h | 450 +++--- include/wx/xtixml.h | 80 +- src/cocoa/bmpbuttn.mm | 1 - src/cocoa/checkbox.mm | 1 - src/cocoa/choice.mm | 1 - src/cocoa/colour.mm | 2 - src/cocoa/combobox.mm | 1 - src/cocoa/frame.mm | 2 - src/cocoa/gauge.mm | 2 - src/cocoa/listbox.mm | 1 - src/cocoa/radiobut.mm | 1 - src/cocoa/scrolbar.mm | 1 - src/cocoa/slider.mm | 3 +- src/cocoa/spinbutt.mm | 3 - src/cocoa/statbmp.mm | 2 - src/cocoa/statbox.mm | 1 - src/cocoa/statline2.mm | 1 - src/cocoa/stattext.mm | 1 - src/cocoa/textctrl.mm | 1 - src/cocoa/window.mm | 2 - src/common/btncmn.cpp | 62 + src/common/calctrlcmn.cpp | 64 + src/common/choiccmn.cpp | 61 + src/common/colourcmn.cpp | 53 + src/common/combocmn.cpp | 65 + src/common/dlgcmn.cpp | 61 + src/common/fontcmn.cpp | 50 + src/common/fontmap.cpp | 105 +- src/common/framecmn.cpp | 73 + src/common/gaugecmn.cpp | 63 + src/common/lboxcmn.cpp | 72 + src/common/listctrlcmn.cpp | 77 + src/common/menucmn.cpp | 155 ++ src/common/nbkbase.cpp | 117 ++ src/common/radiocmn.cpp | 65 + src/common/spinctrlcmn.cpp | 72 + src/common/stattextcmn.cpp | 55 + src/common/textcmn.cpp | 74 + src/common/treebase.cpp | 68 + src/common/wincmn.cpp | 131 ++ src/generic/calctrlg.cpp | 59 - src/generic/colour.cpp | 2 - src/generic/commandlinkbuttong.cpp | 6 +- src/generic/dirctrlg.cpp | 58 - src/generic/grid.cpp | 52 - src/generic/listctrl.cpp | 9 - src/generic/odcombo.cpp | 15 - src/generic/panelg.cpp | 49 - src/generic/spinctlg.cpp | 2 - src/generic/statbmpg.cpp | 2 - src/generic/statline.cpp | 2 - src/generic/treectlg.cpp | 9 - src/gtk/bmpbuttn.cpp | 2 - src/gtk/checkbox.cpp | 2 - src/gtk/choice.cpp | 2 - src/gtk/colour.cpp | 2 - src/gtk/combobox.cpp | 2 - src/gtk/frame.cpp | 2 - src/gtk/gauge.cpp | 2 - src/gtk/listbox.cpp | 2 - src/gtk/radiobut.cpp | 2 - src/gtk/scrolbar.cpp | 2 - src/gtk/slider.cpp | 2 - src/gtk/spinbutt.cpp | 3 - src/gtk/spinctrl.cpp | 2 - src/gtk/statbmp.cpp | 2 - src/gtk/statbox.cpp | 2 - src/gtk/statline.cpp | 2 - src/gtk/stattext.cpp | 2 - src/gtk/textctrl.cpp | 2 - src/gtk/window.cpp | 4 +- src/gtk1/bmpbuttn.cpp | 2 - src/gtk1/button.cpp | 2 - src/gtk1/checkbox.cpp | 2 - src/gtk1/choice.cpp | 2 - src/gtk1/colour.cpp | 2 - src/gtk1/combobox.cpp | 2 - src/gtk1/dialog.cpp | 2 - src/gtk1/frame.cpp | 2 - src/gtk1/gauge.cpp | 2 - src/gtk1/listbox.cpp | 2 - src/gtk1/radiobut.cpp | 2 - src/gtk1/scrolbar.cpp | 2 - src/gtk1/slider.cpp | 2 - src/gtk1/spinbutt.cpp | 3 - src/gtk1/spinctrl.cpp | 2 - src/gtk1/statbmp.cpp | 2 - src/gtk1/statbox.cpp | 2 - src/gtk1/statline.cpp | 2 - src/gtk1/stattext.cpp | 2 - src/gtk1/textctrl.cpp | 2 - src/gtk1/window.cpp | 4 +- src/html/htmlwin.cpp | 8 +- src/motif/bmpbuttn.cpp | 2 - src/motif/button.cpp | 2 - src/motif/checkbox.cpp | 2 - src/motif/choice.cpp | 2 - src/motif/colour.cpp | 2 - src/motif/dialog.cpp | 2 - src/motif/frame.cpp | 2 - src/motif/gauge.cpp | 2 - src/motif/listbox.cpp | 2 - src/motif/radiobut.cpp | 2 - src/motif/scrolbar.cpp | 2 - src/motif/slider.cpp | 2 - src/motif/spinbutt.cpp | 3 - src/motif/statbmp.cpp | 2 - src/motif/statbox.cpp | 2 - src/motif/stattext.cpp | 2 - src/motif/textctrl.cpp | 2 - src/motif/window.cpp | 2 - src/msw/bmpbuttn.cpp | 54 - src/msw/button.cpp | 61 - src/msw/checkbox.cpp | 53 - src/msw/choice.cpp | 58 - src/msw/colour.cpp | 36 - src/msw/combobox.cpp | 63 - src/msw/dialog.cpp | 58 - src/msw/frame.cpp | 72 - src/msw/gauge.cpp | 58 - src/msw/listbox.cpp | 69 - src/msw/listctrl.cpp | 73 - src/msw/radiobut.cpp | 56 - src/msw/scrolbar.cpp | 56 - src/msw/slider.cpp | 74 - src/msw/spinbutt.cpp | 62 - src/msw/spinctrl.cpp | 65 - src/msw/statbmp.cpp | 53 - src/msw/statbox.cpp | 52 - src/msw/statline.cpp | 56 - src/msw/stattext.cpp | 53 - src/msw/textctrl.cpp | 70 - src/msw/treectrl.cpp | 66 - src/msw/wince/choicece.cpp | 6 - src/msw/wince/textctrlce.cpp | 6 - src/msw/window.cpp | 110 +- src/os2/bmpbuttn.cpp | 2 - src/os2/button.cpp | 2 - src/os2/checkbox.cpp | 1 - src/os2/choice.cpp | 2 - src/os2/colour.cpp | 2 - src/os2/combobox.cpp | 2 - src/os2/dialog.cpp | 1 - src/os2/frame.cpp | 2 - src/os2/gauge.cpp | 2 - src/os2/listbox.cpp | 2 - src/os2/listctrl.cpp | 7 - src/os2/radiobut.cpp | 2 - src/os2/scrolbar.cpp | 2 - src/os2/slider.cpp | 2 - src/os2/spinbutt.cpp | 4 - src/os2/spinctrl.cpp | 2 - src/os2/statbmp.cpp | 2 - src/os2/statbox.cpp | 2 - src/os2/statline.cpp | 2 - src/os2/stattext.cpp | 2 - src/os2/textctrl.cpp | 2 - src/os2/treectrl.cpp | 2 - src/os2/window.cpp | 4 +- src/osx/bmpbuttn_osx.cpp | 3 - src/osx/button_osx.cpp | 2 - src/osx/carbon/combobox.cpp | 2 - src/osx/carbon/combobxc.cpp | 2 - src/osx/carbon/frame.cpp | 2 - src/osx/carbon/listctrl_mac.cpp | 73 - src/osx/carbon/statbmp.cpp | 2 - src/osx/carbon/statline.cpp | 3 - src/osx/checkbox_osx.cpp | 1 - src/osx/choice_osx.cpp | 2 - src/osx/cocoa/combobox.mm | 11 + src/osx/combobox_osx.cpp | 2 - src/osx/core/colour.cpp | 2 - src/osx/dialog_osx.cpp | 3 - src/osx/gauge_osx.cpp | 2 - src/osx/listbox_osx.cpp | 2 - src/osx/radiobut_osx.cpp | 3 - src/osx/scrolbar_osx.cpp | 2 - src/osx/slider_osx.cpp | 2 - src/osx/spinbutt_osx.cpp | 4 - src/osx/spinctrl_osx.cpp | 2 - src/osx/statbox_osx.cpp | 2 - src/osx/statline_osx.cpp | 2 - src/osx/stattext_osx.cpp | 2 - src/osx/textctrl_osx.cpp | 2 - src/osx/window_osx.cpp | 2 - src/palmos/bmpbuttn.cpp | 54 - src/palmos/button.cpp | 61 - src/palmos/checkbox.cpp | 53 - src/palmos/choice.cpp | 52 - src/palmos/combobox.cpp | 60 - src/palmos/dialog.cpp | 58 - src/palmos/frame.cpp | 72 - src/palmos/gauge.cpp | 55 - src/palmos/listbox.cpp | 61 - src/palmos/listctrl.cpp | 73 - src/palmos/radiobut.cpp | 56 - src/palmos/scrolbar.cpp | 56 - src/palmos/slider.cpp | 67 - src/palmos/spinbutt.cpp | 62 - src/palmos/spinctrl.cpp | 65 - src/palmos/statbmp.cpp | 53 - src/palmos/statbox.cpp | 52 - src/palmos/statline.cpp | 56 - src/palmos/stattext.cpp | 53 - src/palmos/textctrl.cpp | 70 - src/palmos/treectrl.cpp | 64 - src/palmos/window.cpp | 107 +- src/univ/bmpbuttn.cpp | 2 - src/univ/button.cpp | 2 - src/univ/checkbox.cpp | 2 - src/univ/choice.cpp | 2 - src/univ/dialog.cpp | 2 - src/univ/framuniv.cpp | 2 - src/univ/gauge.cpp | 2 - src/univ/listbox.cpp | 2 - src/univ/radiobut.cpp | 2 - src/univ/scrolbar.cpp | 2 - src/univ/slider.cpp | 2 - src/univ/spinbutt.cpp | 3 - src/univ/statbmp.cpp | 2 - src/univ/statbox.cpp | 2 - src/univ/statline.cpp | 2 - src/univ/textctrl.cpp | 2 - src/x11/colour.cpp | 2 - src/x11/textctrl.cpp | 2 - 244 files changed, 4378 insertions(+), 5873 deletions(-) diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index 05c8696fb8..8495d50681 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -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 diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc index fc026cc228..db5598ac75 100644 --- a/build/msw/makefile.bcc +++ b/build/msw/makefile.bcc @@ -1791,9 +1791,13 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_artstd.obj \ $(OBJS)\monodll_arttango.obj \ $(OBJS)\monodll_bmpbase.obj \ + $(OBJS)\monodll_bmpbtncmn.obj \ $(OBJS)\monodll_bookctrl.obj \ $(OBJS)\monodll_btncmn.obj \ $(OBJS)\monodll_cairo.obj \ + $(OBJS)\monodll_calctrlcmn.obj \ + $(OBJS)\monodll_checkboxcmn.obj \ + $(OBJS)\monodll_checklstcmn.obj \ $(OBJS)\monodll_choiccmn.obj \ $(OBJS)\monodll_clipcmn.obj \ $(OBJS)\monodll_clrpickercmn.obj \ @@ -1810,6 +1814,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_dcbufcmn.obj \ $(OBJS)\monodll_dcgraph.obj \ $(OBJS)\monodll_dcsvg.obj \ + $(OBJS)\monodll_dirctrlcmn.obj \ $(OBJS)\monodll_dlgcmn.obj \ $(OBJS)\monodll_dndcmn.obj \ $(OBJS)\monodll_dobjcmn.obj \ @@ -1836,6 +1841,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_geometry.obj \ $(OBJS)\monodll_gifdecod.obj \ $(OBJS)\monodll_graphcmn.obj \ + $(OBJS)\monodll_gridcmn.obj \ $(OBJS)\monodll_headercolcmn.obj \ $(OBJS)\monodll_headerctrlcmn.obj \ $(OBJS)\monodll_helpbase.obj \ @@ -1860,23 +1866,32 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_menucmn.obj \ $(OBJS)\monodll_mousemanager.obj \ $(OBJS)\monodll_nbkbase.obj \ + $(OBJS)\monodll_odcombocmn.obj \ $(OBJS)\monodll_overlaycmn.obj \ $(OBJS)\monodll_ownerdrwcmn.obj \ $(OBJS)\monodll_paper.obj \ + $(OBJS)\monodll_panelcmn.obj \ $(OBJS)\monodll_persist.obj \ $(OBJS)\monodll_pickerbase.obj \ $(OBJS)\monodll_popupcmn.obj \ $(OBJS)\monodll_prntbase.obj \ $(OBJS)\monodll_quantize.obj \ + $(OBJS)\monodll_radiobtncmn.obj \ $(OBJS)\monodll_radiocmn.obj \ $(OBJS)\monodll_rearrangectrl.obj \ $(OBJS)\monodll_rendcmn.obj \ $(OBJS)\monodll_rgncmn.obj \ + $(OBJS)\monodll_scrolbarcmn.obj \ $(OBJS)\monodll_settcmn.obj \ $(OBJS)\monodll_sizer.obj \ + $(OBJS)\monodll_slidercmn.obj \ + $(OBJS)\monodll_spinbtncmn.obj \ $(OBJS)\monodll_spinctrlcmn.obj \ $(OBJS)\monodll_srchcmn.obj \ $(OBJS)\monodll_statbar.obj \ + $(OBJS)\monodll_statbmpcmn.obj \ + $(OBJS)\monodll_statboxcmn.obj \ + $(OBJS)\monodll_statlinecmn.obj \ $(OBJS)\monodll_stattextcmn.obj \ $(OBJS)\monodll_stockitem.obj \ $(OBJS)\monodll_tbarbase.obj \ @@ -2039,9 +2054,13 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_artstd.obj \ $(OBJS)\monodll_arttango.obj \ $(OBJS)\monodll_bmpbase.obj \ + $(OBJS)\monodll_bmpbtncmn.obj \ $(OBJS)\monodll_bookctrl.obj \ $(OBJS)\monodll_btncmn.obj \ $(OBJS)\monodll_cairo.obj \ + $(OBJS)\monodll_calctrlcmn.obj \ + $(OBJS)\monodll_checkboxcmn.obj \ + $(OBJS)\monodll_checklstcmn.obj \ $(OBJS)\monodll_choiccmn.obj \ $(OBJS)\monodll_clipcmn.obj \ $(OBJS)\monodll_clrpickercmn.obj \ @@ -2058,6 +2077,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_dcbufcmn.obj \ $(OBJS)\monodll_dcgraph.obj \ $(OBJS)\monodll_dcsvg.obj \ + $(OBJS)\monodll_dirctrlcmn.obj \ $(OBJS)\monodll_dlgcmn.obj \ $(OBJS)\monodll_dndcmn.obj \ $(OBJS)\monodll_dobjcmn.obj \ @@ -2084,6 +2104,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_geometry.obj \ $(OBJS)\monodll_gifdecod.obj \ $(OBJS)\monodll_graphcmn.obj \ + $(OBJS)\monodll_gridcmn.obj \ $(OBJS)\monodll_headercolcmn.obj \ $(OBJS)\monodll_headerctrlcmn.obj \ $(OBJS)\monodll_helpbase.obj \ @@ -2108,23 +2129,32 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_menucmn.obj \ $(OBJS)\monodll_mousemanager.obj \ $(OBJS)\monodll_nbkbase.obj \ + $(OBJS)\monodll_odcombocmn.obj \ $(OBJS)\monodll_overlaycmn.obj \ $(OBJS)\monodll_ownerdrwcmn.obj \ $(OBJS)\monodll_paper.obj \ + $(OBJS)\monodll_panelcmn.obj \ $(OBJS)\monodll_persist.obj \ $(OBJS)\monodll_pickerbase.obj \ $(OBJS)\monodll_popupcmn.obj \ $(OBJS)\monodll_prntbase.obj \ $(OBJS)\monodll_quantize.obj \ + $(OBJS)\monodll_radiobtncmn.obj \ $(OBJS)\monodll_radiocmn.obj \ $(OBJS)\monodll_rearrangectrl.obj \ $(OBJS)\monodll_rendcmn.obj \ $(OBJS)\monodll_rgncmn.obj \ + $(OBJS)\monodll_scrolbarcmn.obj \ $(OBJS)\monodll_settcmn.obj \ $(OBJS)\monodll_sizer.obj \ + $(OBJS)\monodll_slidercmn.obj \ + $(OBJS)\monodll_spinbtncmn.obj \ $(OBJS)\monodll_spinctrlcmn.obj \ $(OBJS)\monodll_srchcmn.obj \ $(OBJS)\monodll_statbar.obj \ + $(OBJS)\monodll_statbmpcmn.obj \ + $(OBJS)\monodll_statboxcmn.obj \ + $(OBJS)\monodll_statlinecmn.obj \ $(OBJS)\monodll_stattextcmn.obj \ $(OBJS)\monodll_stockitem.obj \ $(OBJS)\monodll_tbarbase.obj \ @@ -2515,9 +2545,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_artstd.obj \ $(OBJS)\monolib_arttango.obj \ $(OBJS)\monolib_bmpbase.obj \ + $(OBJS)\monolib_bmpbtncmn.obj \ $(OBJS)\monolib_bookctrl.obj \ $(OBJS)\monolib_btncmn.obj \ $(OBJS)\monolib_cairo.obj \ + $(OBJS)\monolib_calctrlcmn.obj \ + $(OBJS)\monolib_checkboxcmn.obj \ + $(OBJS)\monolib_checklstcmn.obj \ $(OBJS)\monolib_choiccmn.obj \ $(OBJS)\monolib_clipcmn.obj \ $(OBJS)\monolib_clrpickercmn.obj \ @@ -2534,6 +2568,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_dcbufcmn.obj \ $(OBJS)\monolib_dcgraph.obj \ $(OBJS)\monolib_dcsvg.obj \ + $(OBJS)\monolib_dirctrlcmn.obj \ $(OBJS)\monolib_dlgcmn.obj \ $(OBJS)\monolib_dndcmn.obj \ $(OBJS)\monolib_dobjcmn.obj \ @@ -2560,6 +2595,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_geometry.obj \ $(OBJS)\monolib_gifdecod.obj \ $(OBJS)\monolib_graphcmn.obj \ + $(OBJS)\monolib_gridcmn.obj \ $(OBJS)\monolib_headercolcmn.obj \ $(OBJS)\monolib_headerctrlcmn.obj \ $(OBJS)\monolib_helpbase.obj \ @@ -2584,23 +2620,32 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_menucmn.obj \ $(OBJS)\monolib_mousemanager.obj \ $(OBJS)\monolib_nbkbase.obj \ + $(OBJS)\monolib_odcombocmn.obj \ $(OBJS)\monolib_overlaycmn.obj \ $(OBJS)\monolib_ownerdrwcmn.obj \ $(OBJS)\monolib_paper.obj \ + $(OBJS)\monolib_panelcmn.obj \ $(OBJS)\monolib_persist.obj \ $(OBJS)\monolib_pickerbase.obj \ $(OBJS)\monolib_popupcmn.obj \ $(OBJS)\monolib_prntbase.obj \ $(OBJS)\monolib_quantize.obj \ + $(OBJS)\monolib_radiobtncmn.obj \ $(OBJS)\monolib_radiocmn.obj \ $(OBJS)\monolib_rearrangectrl.obj \ $(OBJS)\monolib_rendcmn.obj \ $(OBJS)\monolib_rgncmn.obj \ + $(OBJS)\monolib_scrolbarcmn.obj \ $(OBJS)\monolib_settcmn.obj \ $(OBJS)\monolib_sizer.obj \ + $(OBJS)\monolib_slidercmn.obj \ + $(OBJS)\monolib_spinbtncmn.obj \ $(OBJS)\monolib_spinctrlcmn.obj \ $(OBJS)\monolib_srchcmn.obj \ $(OBJS)\monolib_statbar.obj \ + $(OBJS)\monolib_statbmpcmn.obj \ + $(OBJS)\monolib_statboxcmn.obj \ + $(OBJS)\monolib_statlinecmn.obj \ $(OBJS)\monolib_stattextcmn.obj \ $(OBJS)\monolib_stockitem.obj \ $(OBJS)\monolib_tbarbase.obj \ @@ -2763,9 +2808,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_artstd.obj \ $(OBJS)\monolib_arttango.obj \ $(OBJS)\monolib_bmpbase.obj \ + $(OBJS)\monolib_bmpbtncmn.obj \ $(OBJS)\monolib_bookctrl.obj \ $(OBJS)\monolib_btncmn.obj \ $(OBJS)\monolib_cairo.obj \ + $(OBJS)\monolib_calctrlcmn.obj \ + $(OBJS)\monolib_checkboxcmn.obj \ + $(OBJS)\monolib_checklstcmn.obj \ $(OBJS)\monolib_choiccmn.obj \ $(OBJS)\monolib_clipcmn.obj \ $(OBJS)\monolib_clrpickercmn.obj \ @@ -2782,6 +2831,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_dcbufcmn.obj \ $(OBJS)\monolib_dcgraph.obj \ $(OBJS)\monolib_dcsvg.obj \ + $(OBJS)\monolib_dirctrlcmn.obj \ $(OBJS)\monolib_dlgcmn.obj \ $(OBJS)\monolib_dndcmn.obj \ $(OBJS)\monolib_dobjcmn.obj \ @@ -2808,6 +2858,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_geometry.obj \ $(OBJS)\monolib_gifdecod.obj \ $(OBJS)\monolib_graphcmn.obj \ + $(OBJS)\monolib_gridcmn.obj \ $(OBJS)\monolib_headercolcmn.obj \ $(OBJS)\monolib_headerctrlcmn.obj \ $(OBJS)\monolib_helpbase.obj \ @@ -2832,23 +2883,32 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_menucmn.obj \ $(OBJS)\monolib_mousemanager.obj \ $(OBJS)\monolib_nbkbase.obj \ + $(OBJS)\monolib_odcombocmn.obj \ $(OBJS)\monolib_overlaycmn.obj \ $(OBJS)\monolib_ownerdrwcmn.obj \ $(OBJS)\monolib_paper.obj \ + $(OBJS)\monolib_panelcmn.obj \ $(OBJS)\monolib_persist.obj \ $(OBJS)\monolib_pickerbase.obj \ $(OBJS)\monolib_popupcmn.obj \ $(OBJS)\monolib_prntbase.obj \ $(OBJS)\monolib_quantize.obj \ + $(OBJS)\monolib_radiobtncmn.obj \ $(OBJS)\monolib_radiocmn.obj \ $(OBJS)\monolib_rearrangectrl.obj \ $(OBJS)\monolib_rendcmn.obj \ $(OBJS)\monolib_rgncmn.obj \ + $(OBJS)\monolib_scrolbarcmn.obj \ $(OBJS)\monolib_settcmn.obj \ $(OBJS)\monolib_sizer.obj \ + $(OBJS)\monolib_slidercmn.obj \ + $(OBJS)\monolib_spinbtncmn.obj \ $(OBJS)\monolib_spinctrlcmn.obj \ $(OBJS)\monolib_srchcmn.obj \ $(OBJS)\monolib_statbar.obj \ + $(OBJS)\monolib_statbmpcmn.obj \ + $(OBJS)\monolib_statboxcmn.obj \ + $(OBJS)\monolib_statlinecmn.obj \ $(OBJS)\monolib_stattextcmn.obj \ $(OBJS)\monolib_stockitem.obj \ $(OBJS)\monolib_tbarbase.obj \ @@ -3127,9 +3187,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_artstd.obj \ $(OBJS)\coredll_arttango.obj \ $(OBJS)\coredll_bmpbase.obj \ + $(OBJS)\coredll_bmpbtncmn.obj \ $(OBJS)\coredll_bookctrl.obj \ $(OBJS)\coredll_btncmn.obj \ $(OBJS)\coredll_cairo.obj \ + $(OBJS)\coredll_calctrlcmn.obj \ + $(OBJS)\coredll_checkboxcmn.obj \ + $(OBJS)\coredll_checklstcmn.obj \ $(OBJS)\coredll_choiccmn.obj \ $(OBJS)\coredll_clipcmn.obj \ $(OBJS)\coredll_clrpickercmn.obj \ @@ -3146,6 +3210,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_dcbufcmn.obj \ $(OBJS)\coredll_dcgraph.obj \ $(OBJS)\coredll_dcsvg.obj \ + $(OBJS)\coredll_dirctrlcmn.obj \ $(OBJS)\coredll_dlgcmn.obj \ $(OBJS)\coredll_dndcmn.obj \ $(OBJS)\coredll_dobjcmn.obj \ @@ -3172,6 +3237,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_geometry.obj \ $(OBJS)\coredll_gifdecod.obj \ $(OBJS)\coredll_graphcmn.obj \ + $(OBJS)\coredll_gridcmn.obj \ $(OBJS)\coredll_headercolcmn.obj \ $(OBJS)\coredll_headerctrlcmn.obj \ $(OBJS)\coredll_helpbase.obj \ @@ -3196,23 +3262,32 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_menucmn.obj \ $(OBJS)\coredll_mousemanager.obj \ $(OBJS)\coredll_nbkbase.obj \ + $(OBJS)\coredll_odcombocmn.obj \ $(OBJS)\coredll_overlaycmn.obj \ $(OBJS)\coredll_ownerdrwcmn.obj \ $(OBJS)\coredll_paper.obj \ + $(OBJS)\coredll_panelcmn.obj \ $(OBJS)\coredll_persist.obj \ $(OBJS)\coredll_pickerbase.obj \ $(OBJS)\coredll_popupcmn.obj \ $(OBJS)\coredll_prntbase.obj \ $(OBJS)\coredll_quantize.obj \ + $(OBJS)\coredll_radiobtncmn.obj \ $(OBJS)\coredll_radiocmn.obj \ $(OBJS)\coredll_rearrangectrl.obj \ $(OBJS)\coredll_rendcmn.obj \ $(OBJS)\coredll_rgncmn.obj \ + $(OBJS)\coredll_scrolbarcmn.obj \ $(OBJS)\coredll_settcmn.obj \ $(OBJS)\coredll_sizer.obj \ + $(OBJS)\coredll_slidercmn.obj \ + $(OBJS)\coredll_spinbtncmn.obj \ $(OBJS)\coredll_spinctrlcmn.obj \ $(OBJS)\coredll_srchcmn.obj \ $(OBJS)\coredll_statbar.obj \ + $(OBJS)\coredll_statbmpcmn.obj \ + $(OBJS)\coredll_statboxcmn.obj \ + $(OBJS)\coredll_statlinecmn.obj \ $(OBJS)\coredll_stattextcmn.obj \ $(OBJS)\coredll_stockitem.obj \ $(OBJS)\coredll_tbarbase.obj \ @@ -3375,9 +3450,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_artstd.obj \ $(OBJS)\coredll_arttango.obj \ $(OBJS)\coredll_bmpbase.obj \ + $(OBJS)\coredll_bmpbtncmn.obj \ $(OBJS)\coredll_bookctrl.obj \ $(OBJS)\coredll_btncmn.obj \ $(OBJS)\coredll_cairo.obj \ + $(OBJS)\coredll_calctrlcmn.obj \ + $(OBJS)\coredll_checkboxcmn.obj \ + $(OBJS)\coredll_checklstcmn.obj \ $(OBJS)\coredll_choiccmn.obj \ $(OBJS)\coredll_clipcmn.obj \ $(OBJS)\coredll_clrpickercmn.obj \ @@ -3394,6 +3473,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_dcbufcmn.obj \ $(OBJS)\coredll_dcgraph.obj \ $(OBJS)\coredll_dcsvg.obj \ + $(OBJS)\coredll_dirctrlcmn.obj \ $(OBJS)\coredll_dlgcmn.obj \ $(OBJS)\coredll_dndcmn.obj \ $(OBJS)\coredll_dobjcmn.obj \ @@ -3420,6 +3500,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_geometry.obj \ $(OBJS)\coredll_gifdecod.obj \ $(OBJS)\coredll_graphcmn.obj \ + $(OBJS)\coredll_gridcmn.obj \ $(OBJS)\coredll_headercolcmn.obj \ $(OBJS)\coredll_headerctrlcmn.obj \ $(OBJS)\coredll_helpbase.obj \ @@ -3444,23 +3525,32 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_menucmn.obj \ $(OBJS)\coredll_mousemanager.obj \ $(OBJS)\coredll_nbkbase.obj \ + $(OBJS)\coredll_odcombocmn.obj \ $(OBJS)\coredll_overlaycmn.obj \ $(OBJS)\coredll_ownerdrwcmn.obj \ $(OBJS)\coredll_paper.obj \ + $(OBJS)\coredll_panelcmn.obj \ $(OBJS)\coredll_persist.obj \ $(OBJS)\coredll_pickerbase.obj \ $(OBJS)\coredll_popupcmn.obj \ $(OBJS)\coredll_prntbase.obj \ $(OBJS)\coredll_quantize.obj \ + $(OBJS)\coredll_radiobtncmn.obj \ $(OBJS)\coredll_radiocmn.obj \ $(OBJS)\coredll_rearrangectrl.obj \ $(OBJS)\coredll_rendcmn.obj \ $(OBJS)\coredll_rgncmn.obj \ + $(OBJS)\coredll_scrolbarcmn.obj \ $(OBJS)\coredll_settcmn.obj \ $(OBJS)\coredll_sizer.obj \ + $(OBJS)\coredll_slidercmn.obj \ + $(OBJS)\coredll_spinbtncmn.obj \ $(OBJS)\coredll_spinctrlcmn.obj \ $(OBJS)\coredll_srchcmn.obj \ $(OBJS)\coredll_statbar.obj \ + $(OBJS)\coredll_statbmpcmn.obj \ + $(OBJS)\coredll_statboxcmn.obj \ + $(OBJS)\coredll_statlinecmn.obj \ $(OBJS)\coredll_stattextcmn.obj \ $(OBJS)\coredll_stockitem.obj \ $(OBJS)\coredll_tbarbase.obj \ @@ -3632,9 +3722,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_artstd.obj \ $(OBJS)\corelib_arttango.obj \ $(OBJS)\corelib_bmpbase.obj \ + $(OBJS)\corelib_bmpbtncmn.obj \ $(OBJS)\corelib_bookctrl.obj \ $(OBJS)\corelib_btncmn.obj \ $(OBJS)\corelib_cairo.obj \ + $(OBJS)\corelib_calctrlcmn.obj \ + $(OBJS)\corelib_checkboxcmn.obj \ + $(OBJS)\corelib_checklstcmn.obj \ $(OBJS)\corelib_choiccmn.obj \ $(OBJS)\corelib_clipcmn.obj \ $(OBJS)\corelib_clrpickercmn.obj \ @@ -3651,6 +3745,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_dcbufcmn.obj \ $(OBJS)\corelib_dcgraph.obj \ $(OBJS)\corelib_dcsvg.obj \ + $(OBJS)\corelib_dirctrlcmn.obj \ $(OBJS)\corelib_dlgcmn.obj \ $(OBJS)\corelib_dndcmn.obj \ $(OBJS)\corelib_dobjcmn.obj \ @@ -3677,6 +3772,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_geometry.obj \ $(OBJS)\corelib_gifdecod.obj \ $(OBJS)\corelib_graphcmn.obj \ + $(OBJS)\corelib_gridcmn.obj \ $(OBJS)\corelib_headercolcmn.obj \ $(OBJS)\corelib_headerctrlcmn.obj \ $(OBJS)\corelib_helpbase.obj \ @@ -3701,23 +3797,32 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_menucmn.obj \ $(OBJS)\corelib_mousemanager.obj \ $(OBJS)\corelib_nbkbase.obj \ + $(OBJS)\corelib_odcombocmn.obj \ $(OBJS)\corelib_overlaycmn.obj \ $(OBJS)\corelib_ownerdrwcmn.obj \ $(OBJS)\corelib_paper.obj \ + $(OBJS)\corelib_panelcmn.obj \ $(OBJS)\corelib_persist.obj \ $(OBJS)\corelib_pickerbase.obj \ $(OBJS)\corelib_popupcmn.obj \ $(OBJS)\corelib_prntbase.obj \ $(OBJS)\corelib_quantize.obj \ + $(OBJS)\corelib_radiobtncmn.obj \ $(OBJS)\corelib_radiocmn.obj \ $(OBJS)\corelib_rearrangectrl.obj \ $(OBJS)\corelib_rendcmn.obj \ $(OBJS)\corelib_rgncmn.obj \ + $(OBJS)\corelib_scrolbarcmn.obj \ $(OBJS)\corelib_settcmn.obj \ $(OBJS)\corelib_sizer.obj \ + $(OBJS)\corelib_slidercmn.obj \ + $(OBJS)\corelib_spinbtncmn.obj \ $(OBJS)\corelib_spinctrlcmn.obj \ $(OBJS)\corelib_srchcmn.obj \ $(OBJS)\corelib_statbar.obj \ + $(OBJS)\corelib_statbmpcmn.obj \ + $(OBJS)\corelib_statboxcmn.obj \ + $(OBJS)\corelib_statlinecmn.obj \ $(OBJS)\corelib_stattextcmn.obj \ $(OBJS)\corelib_stockitem.obj \ $(OBJS)\corelib_tbarbase.obj \ @@ -3880,9 +3985,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_artstd.obj \ $(OBJS)\corelib_arttango.obj \ $(OBJS)\corelib_bmpbase.obj \ + $(OBJS)\corelib_bmpbtncmn.obj \ $(OBJS)\corelib_bookctrl.obj \ $(OBJS)\corelib_btncmn.obj \ $(OBJS)\corelib_cairo.obj \ + $(OBJS)\corelib_calctrlcmn.obj \ + $(OBJS)\corelib_checkboxcmn.obj \ + $(OBJS)\corelib_checklstcmn.obj \ $(OBJS)\corelib_choiccmn.obj \ $(OBJS)\corelib_clipcmn.obj \ $(OBJS)\corelib_clrpickercmn.obj \ @@ -3899,6 +4008,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_dcbufcmn.obj \ $(OBJS)\corelib_dcgraph.obj \ $(OBJS)\corelib_dcsvg.obj \ + $(OBJS)\corelib_dirctrlcmn.obj \ $(OBJS)\corelib_dlgcmn.obj \ $(OBJS)\corelib_dndcmn.obj \ $(OBJS)\corelib_dobjcmn.obj \ @@ -3925,6 +4035,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_geometry.obj \ $(OBJS)\corelib_gifdecod.obj \ $(OBJS)\corelib_graphcmn.obj \ + $(OBJS)\corelib_gridcmn.obj \ $(OBJS)\corelib_headercolcmn.obj \ $(OBJS)\corelib_headerctrlcmn.obj \ $(OBJS)\corelib_helpbase.obj \ @@ -3949,23 +4060,32 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_menucmn.obj \ $(OBJS)\corelib_mousemanager.obj \ $(OBJS)\corelib_nbkbase.obj \ + $(OBJS)\corelib_odcombocmn.obj \ $(OBJS)\corelib_overlaycmn.obj \ $(OBJS)\corelib_ownerdrwcmn.obj \ $(OBJS)\corelib_paper.obj \ + $(OBJS)\corelib_panelcmn.obj \ $(OBJS)\corelib_persist.obj \ $(OBJS)\corelib_pickerbase.obj \ $(OBJS)\corelib_popupcmn.obj \ $(OBJS)\corelib_prntbase.obj \ $(OBJS)\corelib_quantize.obj \ + $(OBJS)\corelib_radiobtncmn.obj \ $(OBJS)\corelib_radiocmn.obj \ $(OBJS)\corelib_rearrangectrl.obj \ $(OBJS)\corelib_rendcmn.obj \ $(OBJS)\corelib_rgncmn.obj \ + $(OBJS)\corelib_scrolbarcmn.obj \ $(OBJS)\corelib_settcmn.obj \ $(OBJS)\corelib_sizer.obj \ + $(OBJS)\corelib_slidercmn.obj \ + $(OBJS)\corelib_spinbtncmn.obj \ $(OBJS)\corelib_spinctrlcmn.obj \ $(OBJS)\corelib_srchcmn.obj \ $(OBJS)\corelib_statbar.obj \ + $(OBJS)\corelib_statbmpcmn.obj \ + $(OBJS)\corelib_statboxcmn.obj \ + $(OBJS)\corelib_statlinecmn.obj \ $(OBJS)\corelib_stattextcmn.obj \ $(OBJS)\corelib_stockitem.obj \ $(OBJS)\corelib_tbarbase.obj \ @@ -7138,6 +7258,11 @@ $(OBJS)\monodll_bmpbase.obj: ..\..\src\common\bmpbase.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\bmpbase.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_bmpbtncmn.obj: ..\..\src\common\bmpbtncmn.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\bmpbtncmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_bookctrl.obj: ..\..\src\common\bookctrl.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\bookctrl.cpp @@ -7153,6 +7278,26 @@ $(OBJS)\monodll_cairo.obj: ..\..\src\common\cairo.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\cairo.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_checkboxcmn.obj: ..\..\src\common\checkboxcmn.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\checkboxcmn.cpp +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_checklstcmn.obj: ..\..\src\common\checklstcmn.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\checklstcmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_choiccmn.obj: ..\..\src\common\choiccmn.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\choiccmn.cpp @@ -7233,6 +7378,11 @@ $(OBJS)\monodll_dcsvg.obj: ..\..\src\common\dcsvg.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dcsvg.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_dirctrlcmn.obj: ..\..\src\common\dirctrlcmn.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dirctrlcmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dlgcmn.cpp @@ -7363,6 +7513,11 @@ $(OBJS)\monodll_graphcmn.obj: ..\..\src\common\graphcmn.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\graphcmn.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_gridcmn.obj: ..\..\src\common\gridcmn.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\gridcmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_headercolcmn.obj: ..\..\src\common\headercolcmn.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\headercolcmn.cpp @@ -7483,6 +7638,11 @@ $(OBJS)\monodll_nbkbase.obj: ..\..\src\common\nbkbase.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\nbkbase.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\odcombocmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\overlaycmn.cpp @@ -7498,6 +7658,11 @@ $(OBJS)\monodll_paper.obj: ..\..\src\common\paper.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\paper.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_panelcmn.obj: ..\..\src\common\panelcmn.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\panelcmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_persist.obj: ..\..\src\common\persist.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\persist.cpp @@ -7523,6 +7688,11 @@ $(OBJS)\monodll_quantize.obj: ..\..\src\common\quantize.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\quantize.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_radiobtncmn.obj: ..\..\src\common\radiobtncmn.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\radiobtncmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_radiocmn.obj: ..\..\src\common\radiocmn.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\radiocmn.cpp @@ -7543,6 +7713,11 @@ $(OBJS)\monodll_rgncmn.obj: ..\..\src\common\rgncmn.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\rgncmn.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_scrolbarcmn.obj: ..\..\src\common\scrolbarcmn.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\scrolbarcmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_settcmn.obj: ..\..\src\common\settcmn.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\settcmn.cpp @@ -7553,6 +7728,16 @@ $(OBJS)\monodll_sizer.obj: ..\..\src\common\sizer.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\sizer.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_slidercmn.obj: ..\..\src\common\slidercmn.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\slidercmn.cpp +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_spinbtncmn.obj: ..\..\src\common\spinbtncmn.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\spinbtncmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_spinctrlcmn.obj: ..\..\src\common\spinctrlcmn.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\spinctrlcmn.cpp @@ -7568,6 +7753,21 @@ $(OBJS)\monodll_statbar.obj: ..\..\src\common\statbar.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\statbar.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_statbmpcmn.obj: ..\..\src\common\statbmpcmn.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\statbmpcmn.cpp +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_statboxcmn.obj: ..\..\src\common\statboxcmn.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\statboxcmn.cpp +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_statlinecmn.obj: ..\..\src\common\statlinecmn.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\statlinecmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_stattextcmn.obj: ..\..\src\common\stattextcmn.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\stattextcmn.cpp @@ -7823,11 +8023,6 @@ $(OBJS)\monodll_bmpcboxcmn.obj: ..\..\src\common\bmpcboxcmn.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\bmpcboxcmn.cpp !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\monodll_datavcmn.obj: ..\..\src\common\datavcmn.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\datavcmn.cpp @@ -9385,6 +9580,11 @@ $(OBJS)\monolib_bmpbase.obj: ..\..\src\common\bmpbase.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\bmpbase.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_bmpbtncmn.obj: ..\..\src\common\bmpbtncmn.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\bmpbtncmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_bookctrl.obj: ..\..\src\common\bookctrl.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\bookctrl.cpp @@ -9400,6 +9600,26 @@ $(OBJS)\monolib_cairo.obj: ..\..\src\common\cairo.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\cairo.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_checkboxcmn.obj: ..\..\src\common\checkboxcmn.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\checkboxcmn.cpp +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_checklstcmn.obj: ..\..\src\common\checklstcmn.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\checklstcmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_choiccmn.obj: ..\..\src\common\choiccmn.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\choiccmn.cpp @@ -9480,6 +9700,11 @@ $(OBJS)\monolib_dcsvg.obj: ..\..\src\common\dcsvg.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dcsvg.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_dirctrlcmn.obj: ..\..\src\common\dirctrlcmn.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dirctrlcmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dlgcmn.cpp @@ -9610,6 +9835,11 @@ $(OBJS)\monolib_graphcmn.obj: ..\..\src\common\graphcmn.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\graphcmn.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_gridcmn.obj: ..\..\src\common\gridcmn.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\gridcmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_headercolcmn.obj: ..\..\src\common\headercolcmn.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\headercolcmn.cpp @@ -9730,6 +9960,11 @@ $(OBJS)\monolib_nbkbase.obj: ..\..\src\common\nbkbase.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\nbkbase.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\odcombocmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\overlaycmn.cpp @@ -9745,6 +9980,11 @@ $(OBJS)\monolib_paper.obj: ..\..\src\common\paper.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\paper.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_panelcmn.obj: ..\..\src\common\panelcmn.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\panelcmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_persist.obj: ..\..\src\common\persist.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\persist.cpp @@ -9770,6 +10010,11 @@ $(OBJS)\monolib_quantize.obj: ..\..\src\common\quantize.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\quantize.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_radiobtncmn.obj: ..\..\src\common\radiobtncmn.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\radiobtncmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_radiocmn.obj: ..\..\src\common\radiocmn.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\radiocmn.cpp @@ -9790,6 +10035,11 @@ $(OBJS)\monolib_rgncmn.obj: ..\..\src\common\rgncmn.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\rgncmn.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_scrolbarcmn.obj: ..\..\src\common\scrolbarcmn.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\scrolbarcmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_settcmn.obj: ..\..\src\common\settcmn.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\settcmn.cpp @@ -9800,6 +10050,16 @@ $(OBJS)\monolib_sizer.obj: ..\..\src\common\sizer.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\sizer.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_slidercmn.obj: ..\..\src\common\slidercmn.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\slidercmn.cpp +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_spinbtncmn.obj: ..\..\src\common\spinbtncmn.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\spinbtncmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_spinctrlcmn.obj: ..\..\src\common\spinctrlcmn.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\spinctrlcmn.cpp @@ -9815,6 +10075,21 @@ $(OBJS)\monolib_statbar.obj: ..\..\src\common\statbar.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\statbar.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_statbmpcmn.obj: ..\..\src\common\statbmpcmn.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\statbmpcmn.cpp +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_statboxcmn.obj: ..\..\src\common\statboxcmn.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\statboxcmn.cpp +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_statlinecmn.obj: ..\..\src\common\statlinecmn.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\statlinecmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_stattextcmn.obj: ..\..\src\common\stattextcmn.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\stattextcmn.cpp @@ -10070,11 +10345,6 @@ $(OBJS)\monolib_bmpcboxcmn.obj: ..\..\src\common\bmpcboxcmn.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\bmpcboxcmn.cpp !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\monolib_datavcmn.obj: ..\..\src\common\datavcmn.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\datavcmn.cpp @@ -11623,6 +11893,11 @@ $(OBJS)\coredll_bmpbase.obj: ..\..\src\common\bmpbase.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\bmpbase.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_bmpbtncmn.obj: ..\..\src\common\bmpbtncmn.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\bmpbtncmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\coredll_bookctrl.obj: ..\..\src\common\bookctrl.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\bookctrl.cpp @@ -11638,6 +11913,21 @@ $(OBJS)\coredll_cairo.obj: ..\..\src\common\cairo.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\cairo.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_checkboxcmn.obj: ..\..\src\common\checkboxcmn.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\checkboxcmn.cpp +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_checklstcmn.obj: ..\..\src\common\checklstcmn.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\checklstcmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\coredll_choiccmn.obj: ..\..\src\common\choiccmn.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\choiccmn.cpp @@ -11718,6 +12008,11 @@ $(OBJS)\coredll_dcsvg.obj: ..\..\src\common\dcsvg.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\dcsvg.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_dirctrlcmn.obj: ..\..\src\common\dirctrlcmn.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\dirctrlcmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\coredll_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\dlgcmn.cpp @@ -11848,6 +12143,11 @@ $(OBJS)\coredll_graphcmn.obj: ..\..\src\common\graphcmn.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\graphcmn.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_gridcmn.obj: ..\..\src\common\gridcmn.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\gridcmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\coredll_headercolcmn.obj: ..\..\src\common\headercolcmn.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\headercolcmn.cpp @@ -11968,6 +12268,11 @@ $(OBJS)\coredll_nbkbase.obj: ..\..\src\common\nbkbase.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\nbkbase.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\odcombocmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\coredll_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\overlaycmn.cpp @@ -11983,6 +12288,11 @@ $(OBJS)\coredll_paper.obj: ..\..\src\common\paper.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\paper.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_panelcmn.obj: ..\..\src\common\panelcmn.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\panelcmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\coredll_persist.obj: ..\..\src\common\persist.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\persist.cpp @@ -12008,6 +12318,11 @@ $(OBJS)\coredll_quantize.obj: ..\..\src\common\quantize.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\quantize.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_radiobtncmn.obj: ..\..\src\common\radiobtncmn.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\radiobtncmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\coredll_radiocmn.obj: ..\..\src\common\radiocmn.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\radiocmn.cpp @@ -12028,6 +12343,11 @@ $(OBJS)\coredll_rgncmn.obj: ..\..\src\common\rgncmn.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\rgncmn.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_scrolbarcmn.obj: ..\..\src\common\scrolbarcmn.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\scrolbarcmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\coredll_settcmn.obj: ..\..\src\common\settcmn.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\settcmn.cpp @@ -12038,6 +12358,16 @@ $(OBJS)\coredll_sizer.obj: ..\..\src\common\sizer.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\sizer.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_slidercmn.obj: ..\..\src\common\slidercmn.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\slidercmn.cpp +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_spinbtncmn.obj: ..\..\src\common\spinbtncmn.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\spinbtncmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\coredll_spinctrlcmn.obj: ..\..\src\common\spinctrlcmn.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\spinctrlcmn.cpp @@ -12053,6 +12383,21 @@ $(OBJS)\coredll_statbar.obj: ..\..\src\common\statbar.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\statbar.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_statbmpcmn.obj: ..\..\src\common\statbmpcmn.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\statbmpcmn.cpp +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_statboxcmn.obj: ..\..\src\common\statboxcmn.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\statboxcmn.cpp +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_statlinecmn.obj: ..\..\src\common\statlinecmn.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\statlinecmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\coredll_stattextcmn.obj: ..\..\src\common\stattextcmn.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\stattextcmn.cpp @@ -12938,6 +13283,11 @@ $(OBJS)\corelib_bmpbase.obj: ..\..\src\common\bmpbase.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\bmpbase.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_bmpbtncmn.obj: ..\..\src\common\bmpbtncmn.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\bmpbtncmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\corelib_bookctrl.obj: ..\..\src\common\bookctrl.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\bookctrl.cpp @@ -12953,6 +13303,21 @@ $(OBJS)\corelib_cairo.obj: ..\..\src\common\cairo.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\cairo.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_checkboxcmn.obj: ..\..\src\common\checkboxcmn.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\checkboxcmn.cpp +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_checklstcmn.obj: ..\..\src\common\checklstcmn.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\checklstcmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\corelib_choiccmn.obj: ..\..\src\common\choiccmn.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\choiccmn.cpp @@ -13033,6 +13398,11 @@ $(OBJS)\corelib_dcsvg.obj: ..\..\src\common\dcsvg.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\dcsvg.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_dirctrlcmn.obj: ..\..\src\common\dirctrlcmn.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\dirctrlcmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\corelib_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\dlgcmn.cpp @@ -13163,6 +13533,11 @@ $(OBJS)\corelib_graphcmn.obj: ..\..\src\common\graphcmn.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\graphcmn.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_gridcmn.obj: ..\..\src\common\gridcmn.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\gridcmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\corelib_headercolcmn.obj: ..\..\src\common\headercolcmn.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\headercolcmn.cpp @@ -13283,6 +13658,11 @@ $(OBJS)\corelib_nbkbase.obj: ..\..\src\common\nbkbase.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\nbkbase.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\odcombocmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\corelib_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\overlaycmn.cpp @@ -13298,6 +13678,11 @@ $(OBJS)\corelib_paper.obj: ..\..\src\common\paper.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\paper.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_panelcmn.obj: ..\..\src\common\panelcmn.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\panelcmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\corelib_persist.obj: ..\..\src\common\persist.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\persist.cpp @@ -13323,6 +13708,11 @@ $(OBJS)\corelib_quantize.obj: ..\..\src\common\quantize.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\quantize.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_radiobtncmn.obj: ..\..\src\common\radiobtncmn.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\radiobtncmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\corelib_radiocmn.obj: ..\..\src\common\radiocmn.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\radiocmn.cpp @@ -13343,6 +13733,11 @@ $(OBJS)\corelib_rgncmn.obj: ..\..\src\common\rgncmn.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\rgncmn.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_scrolbarcmn.obj: ..\..\src\common\scrolbarcmn.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\scrolbarcmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\corelib_settcmn.obj: ..\..\src\common\settcmn.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\settcmn.cpp @@ -13353,6 +13748,16 @@ $(OBJS)\corelib_sizer.obj: ..\..\src\common\sizer.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\sizer.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_slidercmn.obj: ..\..\src\common\slidercmn.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\slidercmn.cpp +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_spinbtncmn.obj: ..\..\src\common\spinbtncmn.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\spinbtncmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\corelib_spinctrlcmn.obj: ..\..\src\common\spinctrlcmn.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\spinctrlcmn.cpp @@ -13368,6 +13773,21 @@ $(OBJS)\corelib_statbar.obj: ..\..\src\common\statbar.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\statbar.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_statbmpcmn.obj: ..\..\src\common\statbmpcmn.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\statbmpcmn.cpp +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_statboxcmn.obj: ..\..\src\common\statboxcmn.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\statboxcmn.cpp +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_statlinecmn.obj: ..\..\src\common\statlinecmn.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\statlinecmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\corelib_stattextcmn.obj: ..\..\src\common\stattextcmn.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\stattextcmn.cpp diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc index 7716e034a1..7df486ff82 100644 --- a/build/msw/makefile.gcc +++ b/build/msw/makefile.gcc @@ -1802,9 +1802,13 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_artstd.o \ $(OBJS)\monodll_arttango.o \ $(OBJS)\monodll_bmpbase.o \ + $(OBJS)\monodll_bmpbtncmn.o \ $(OBJS)\monodll_bookctrl.o \ $(OBJS)\monodll_btncmn.o \ $(OBJS)\monodll_cairo.o \ + $(OBJS)\monodll_calctrlcmn.o \ + $(OBJS)\monodll_checkboxcmn.o \ + $(OBJS)\monodll_checklstcmn.o \ $(OBJS)\monodll_choiccmn.o \ $(OBJS)\monodll_clipcmn.o \ $(OBJS)\monodll_clrpickercmn.o \ @@ -1821,6 +1825,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_dcbufcmn.o \ $(OBJS)\monodll_dcgraph.o \ $(OBJS)\monodll_dcsvg.o \ + $(OBJS)\monodll_dirctrlcmn.o \ $(OBJS)\monodll_dlgcmn.o \ $(OBJS)\monodll_dndcmn.o \ $(OBJS)\monodll_dobjcmn.o \ @@ -1847,6 +1852,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_geometry.o \ $(OBJS)\monodll_gifdecod.o \ $(OBJS)\monodll_graphcmn.o \ + $(OBJS)\monodll_gridcmn.o \ $(OBJS)\monodll_headercolcmn.o \ $(OBJS)\monodll_headerctrlcmn.o \ $(OBJS)\monodll_helpbase.o \ @@ -1871,23 +1877,32 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_menucmn.o \ $(OBJS)\monodll_mousemanager.o \ $(OBJS)\monodll_nbkbase.o \ + $(OBJS)\monodll_odcombocmn.o \ $(OBJS)\monodll_overlaycmn.o \ $(OBJS)\monodll_ownerdrwcmn.o \ $(OBJS)\monodll_paper.o \ + $(OBJS)\monodll_panelcmn.o \ $(OBJS)\monodll_persist.o \ $(OBJS)\monodll_pickerbase.o \ $(OBJS)\monodll_popupcmn.o \ $(OBJS)\monodll_prntbase.o \ $(OBJS)\monodll_quantize.o \ + $(OBJS)\monodll_radiobtncmn.o \ $(OBJS)\monodll_radiocmn.o \ $(OBJS)\monodll_rearrangectrl.o \ $(OBJS)\monodll_rendcmn.o \ $(OBJS)\monodll_rgncmn.o \ + $(OBJS)\monodll_scrolbarcmn.o \ $(OBJS)\monodll_settcmn.o \ $(OBJS)\monodll_sizer.o \ + $(OBJS)\monodll_slidercmn.o \ + $(OBJS)\monodll_spinbtncmn.o \ $(OBJS)\monodll_spinctrlcmn.o \ $(OBJS)\monodll_srchcmn.o \ $(OBJS)\monodll_statbar.o \ + $(OBJS)\monodll_statbmpcmn.o \ + $(OBJS)\monodll_statboxcmn.o \ + $(OBJS)\monodll_statlinecmn.o \ $(OBJS)\monodll_stattextcmn.o \ $(OBJS)\monodll_stockitem.o \ $(OBJS)\monodll_tbarbase.o \ @@ -2052,9 +2067,13 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_artstd.o \ $(OBJS)\monodll_arttango.o \ $(OBJS)\monodll_bmpbase.o \ + $(OBJS)\monodll_bmpbtncmn.o \ $(OBJS)\monodll_bookctrl.o \ $(OBJS)\monodll_btncmn.o \ $(OBJS)\monodll_cairo.o \ + $(OBJS)\monodll_calctrlcmn.o \ + $(OBJS)\monodll_checkboxcmn.o \ + $(OBJS)\monodll_checklstcmn.o \ $(OBJS)\monodll_choiccmn.o \ $(OBJS)\monodll_clipcmn.o \ $(OBJS)\monodll_clrpickercmn.o \ @@ -2071,6 +2090,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_dcbufcmn.o \ $(OBJS)\monodll_dcgraph.o \ $(OBJS)\monodll_dcsvg.o \ + $(OBJS)\monodll_dirctrlcmn.o \ $(OBJS)\monodll_dlgcmn.o \ $(OBJS)\monodll_dndcmn.o \ $(OBJS)\monodll_dobjcmn.o \ @@ -2097,6 +2117,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_geometry.o \ $(OBJS)\monodll_gifdecod.o \ $(OBJS)\monodll_graphcmn.o \ + $(OBJS)\monodll_gridcmn.o \ $(OBJS)\monodll_headercolcmn.o \ $(OBJS)\monodll_headerctrlcmn.o \ $(OBJS)\monodll_helpbase.o \ @@ -2121,23 +2142,32 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_menucmn.o \ $(OBJS)\monodll_mousemanager.o \ $(OBJS)\monodll_nbkbase.o \ + $(OBJS)\monodll_odcombocmn.o \ $(OBJS)\monodll_overlaycmn.o \ $(OBJS)\monodll_ownerdrwcmn.o \ $(OBJS)\monodll_paper.o \ + $(OBJS)\monodll_panelcmn.o \ $(OBJS)\monodll_persist.o \ $(OBJS)\monodll_pickerbase.o \ $(OBJS)\monodll_popupcmn.o \ $(OBJS)\monodll_prntbase.o \ $(OBJS)\monodll_quantize.o \ + $(OBJS)\monodll_radiobtncmn.o \ $(OBJS)\monodll_radiocmn.o \ $(OBJS)\monodll_rearrangectrl.o \ $(OBJS)\monodll_rendcmn.o \ $(OBJS)\monodll_rgncmn.o \ + $(OBJS)\monodll_scrolbarcmn.o \ $(OBJS)\monodll_settcmn.o \ $(OBJS)\monodll_sizer.o \ + $(OBJS)\monodll_slidercmn.o \ + $(OBJS)\monodll_spinbtncmn.o \ $(OBJS)\monodll_spinctrlcmn.o \ $(OBJS)\monodll_srchcmn.o \ $(OBJS)\monodll_statbar.o \ + $(OBJS)\monodll_statbmpcmn.o \ + $(OBJS)\monodll_statboxcmn.o \ + $(OBJS)\monodll_statlinecmn.o \ $(OBJS)\monodll_stattextcmn.o \ $(OBJS)\monodll_stockitem.o \ $(OBJS)\monodll_tbarbase.o \ @@ -2532,9 +2562,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_artstd.o \ $(OBJS)\monolib_arttango.o \ $(OBJS)\monolib_bmpbase.o \ + $(OBJS)\monolib_bmpbtncmn.o \ $(OBJS)\monolib_bookctrl.o \ $(OBJS)\monolib_btncmn.o \ $(OBJS)\monolib_cairo.o \ + $(OBJS)\monolib_calctrlcmn.o \ + $(OBJS)\monolib_checkboxcmn.o \ + $(OBJS)\monolib_checklstcmn.o \ $(OBJS)\monolib_choiccmn.o \ $(OBJS)\monolib_clipcmn.o \ $(OBJS)\monolib_clrpickercmn.o \ @@ -2551,6 +2585,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_dcbufcmn.o \ $(OBJS)\monolib_dcgraph.o \ $(OBJS)\monolib_dcsvg.o \ + $(OBJS)\monolib_dirctrlcmn.o \ $(OBJS)\monolib_dlgcmn.o \ $(OBJS)\monolib_dndcmn.o \ $(OBJS)\monolib_dobjcmn.o \ @@ -2577,6 +2612,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_geometry.o \ $(OBJS)\monolib_gifdecod.o \ $(OBJS)\monolib_graphcmn.o \ + $(OBJS)\monolib_gridcmn.o \ $(OBJS)\monolib_headercolcmn.o \ $(OBJS)\monolib_headerctrlcmn.o \ $(OBJS)\monolib_helpbase.o \ @@ -2601,23 +2637,32 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_menucmn.o \ $(OBJS)\monolib_mousemanager.o \ $(OBJS)\monolib_nbkbase.o \ + $(OBJS)\monolib_odcombocmn.o \ $(OBJS)\monolib_overlaycmn.o \ $(OBJS)\monolib_ownerdrwcmn.o \ $(OBJS)\monolib_paper.o \ + $(OBJS)\monolib_panelcmn.o \ $(OBJS)\monolib_persist.o \ $(OBJS)\monolib_pickerbase.o \ $(OBJS)\monolib_popupcmn.o \ $(OBJS)\monolib_prntbase.o \ $(OBJS)\monolib_quantize.o \ + $(OBJS)\monolib_radiobtncmn.o \ $(OBJS)\monolib_radiocmn.o \ $(OBJS)\monolib_rearrangectrl.o \ $(OBJS)\monolib_rendcmn.o \ $(OBJS)\monolib_rgncmn.o \ + $(OBJS)\monolib_scrolbarcmn.o \ $(OBJS)\monolib_settcmn.o \ $(OBJS)\monolib_sizer.o \ + $(OBJS)\monolib_slidercmn.o \ + $(OBJS)\monolib_spinbtncmn.o \ $(OBJS)\monolib_spinctrlcmn.o \ $(OBJS)\monolib_srchcmn.o \ $(OBJS)\monolib_statbar.o \ + $(OBJS)\monolib_statbmpcmn.o \ + $(OBJS)\monolib_statboxcmn.o \ + $(OBJS)\monolib_statlinecmn.o \ $(OBJS)\monolib_stattextcmn.o \ $(OBJS)\monolib_stockitem.o \ $(OBJS)\monolib_tbarbase.o \ @@ -2782,9 +2827,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_artstd.o \ $(OBJS)\monolib_arttango.o \ $(OBJS)\monolib_bmpbase.o \ + $(OBJS)\monolib_bmpbtncmn.o \ $(OBJS)\monolib_bookctrl.o \ $(OBJS)\monolib_btncmn.o \ $(OBJS)\monolib_cairo.o \ + $(OBJS)\monolib_calctrlcmn.o \ + $(OBJS)\monolib_checkboxcmn.o \ + $(OBJS)\monolib_checklstcmn.o \ $(OBJS)\monolib_choiccmn.o \ $(OBJS)\monolib_clipcmn.o \ $(OBJS)\monolib_clrpickercmn.o \ @@ -2801,6 +2850,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_dcbufcmn.o \ $(OBJS)\monolib_dcgraph.o \ $(OBJS)\monolib_dcsvg.o \ + $(OBJS)\monolib_dirctrlcmn.o \ $(OBJS)\monolib_dlgcmn.o \ $(OBJS)\monolib_dndcmn.o \ $(OBJS)\monolib_dobjcmn.o \ @@ -2827,6 +2877,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_geometry.o \ $(OBJS)\monolib_gifdecod.o \ $(OBJS)\monolib_graphcmn.o \ + $(OBJS)\monolib_gridcmn.o \ $(OBJS)\monolib_headercolcmn.o \ $(OBJS)\monolib_headerctrlcmn.o \ $(OBJS)\monolib_helpbase.o \ @@ -2851,23 +2902,32 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_menucmn.o \ $(OBJS)\monolib_mousemanager.o \ $(OBJS)\monolib_nbkbase.o \ + $(OBJS)\monolib_odcombocmn.o \ $(OBJS)\monolib_overlaycmn.o \ $(OBJS)\monolib_ownerdrwcmn.o \ $(OBJS)\monolib_paper.o \ + $(OBJS)\monolib_panelcmn.o \ $(OBJS)\monolib_persist.o \ $(OBJS)\monolib_pickerbase.o \ $(OBJS)\monolib_popupcmn.o \ $(OBJS)\monolib_prntbase.o \ $(OBJS)\monolib_quantize.o \ + $(OBJS)\monolib_radiobtncmn.o \ $(OBJS)\monolib_radiocmn.o \ $(OBJS)\monolib_rearrangectrl.o \ $(OBJS)\monolib_rendcmn.o \ $(OBJS)\monolib_rgncmn.o \ + $(OBJS)\monolib_scrolbarcmn.o \ $(OBJS)\monolib_settcmn.o \ $(OBJS)\monolib_sizer.o \ + $(OBJS)\monolib_slidercmn.o \ + $(OBJS)\monolib_spinbtncmn.o \ $(OBJS)\monolib_spinctrlcmn.o \ $(OBJS)\monolib_srchcmn.o \ $(OBJS)\monolib_statbar.o \ + $(OBJS)\monolib_statbmpcmn.o \ + $(OBJS)\monolib_statboxcmn.o \ + $(OBJS)\monolib_statlinecmn.o \ $(OBJS)\monolib_stattextcmn.o \ $(OBJS)\monolib_stockitem.o \ $(OBJS)\monolib_tbarbase.o \ @@ -3160,9 +3220,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_artstd.o \ $(OBJS)\coredll_arttango.o \ $(OBJS)\coredll_bmpbase.o \ + $(OBJS)\coredll_bmpbtncmn.o \ $(OBJS)\coredll_bookctrl.o \ $(OBJS)\coredll_btncmn.o \ $(OBJS)\coredll_cairo.o \ + $(OBJS)\coredll_calctrlcmn.o \ + $(OBJS)\coredll_checkboxcmn.o \ + $(OBJS)\coredll_checklstcmn.o \ $(OBJS)\coredll_choiccmn.o \ $(OBJS)\coredll_clipcmn.o \ $(OBJS)\coredll_clrpickercmn.o \ @@ -3179,6 +3243,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_dcbufcmn.o \ $(OBJS)\coredll_dcgraph.o \ $(OBJS)\coredll_dcsvg.o \ + $(OBJS)\coredll_dirctrlcmn.o \ $(OBJS)\coredll_dlgcmn.o \ $(OBJS)\coredll_dndcmn.o \ $(OBJS)\coredll_dobjcmn.o \ @@ -3205,6 +3270,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_geometry.o \ $(OBJS)\coredll_gifdecod.o \ $(OBJS)\coredll_graphcmn.o \ + $(OBJS)\coredll_gridcmn.o \ $(OBJS)\coredll_headercolcmn.o \ $(OBJS)\coredll_headerctrlcmn.o \ $(OBJS)\coredll_helpbase.o \ @@ -3229,23 +3295,32 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_menucmn.o \ $(OBJS)\coredll_mousemanager.o \ $(OBJS)\coredll_nbkbase.o \ + $(OBJS)\coredll_odcombocmn.o \ $(OBJS)\coredll_overlaycmn.o \ $(OBJS)\coredll_ownerdrwcmn.o \ $(OBJS)\coredll_paper.o \ + $(OBJS)\coredll_panelcmn.o \ $(OBJS)\coredll_persist.o \ $(OBJS)\coredll_pickerbase.o \ $(OBJS)\coredll_popupcmn.o \ $(OBJS)\coredll_prntbase.o \ $(OBJS)\coredll_quantize.o \ + $(OBJS)\coredll_radiobtncmn.o \ $(OBJS)\coredll_radiocmn.o \ $(OBJS)\coredll_rearrangectrl.o \ $(OBJS)\coredll_rendcmn.o \ $(OBJS)\coredll_rgncmn.o \ + $(OBJS)\coredll_scrolbarcmn.o \ $(OBJS)\coredll_settcmn.o \ $(OBJS)\coredll_sizer.o \ + $(OBJS)\coredll_slidercmn.o \ + $(OBJS)\coredll_spinbtncmn.o \ $(OBJS)\coredll_spinctrlcmn.o \ $(OBJS)\coredll_srchcmn.o \ $(OBJS)\coredll_statbar.o \ + $(OBJS)\coredll_statbmpcmn.o \ + $(OBJS)\coredll_statboxcmn.o \ + $(OBJS)\coredll_statlinecmn.o \ $(OBJS)\coredll_stattextcmn.o \ $(OBJS)\coredll_stockitem.o \ $(OBJS)\coredll_tbarbase.o \ @@ -3410,9 +3485,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_artstd.o \ $(OBJS)\coredll_arttango.o \ $(OBJS)\coredll_bmpbase.o \ + $(OBJS)\coredll_bmpbtncmn.o \ $(OBJS)\coredll_bookctrl.o \ $(OBJS)\coredll_btncmn.o \ $(OBJS)\coredll_cairo.o \ + $(OBJS)\coredll_calctrlcmn.o \ + $(OBJS)\coredll_checkboxcmn.o \ + $(OBJS)\coredll_checklstcmn.o \ $(OBJS)\coredll_choiccmn.o \ $(OBJS)\coredll_clipcmn.o \ $(OBJS)\coredll_clrpickercmn.o \ @@ -3429,6 +3508,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_dcbufcmn.o \ $(OBJS)\coredll_dcgraph.o \ $(OBJS)\coredll_dcsvg.o \ + $(OBJS)\coredll_dirctrlcmn.o \ $(OBJS)\coredll_dlgcmn.o \ $(OBJS)\coredll_dndcmn.o \ $(OBJS)\coredll_dobjcmn.o \ @@ -3455,6 +3535,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_geometry.o \ $(OBJS)\coredll_gifdecod.o \ $(OBJS)\coredll_graphcmn.o \ + $(OBJS)\coredll_gridcmn.o \ $(OBJS)\coredll_headercolcmn.o \ $(OBJS)\coredll_headerctrlcmn.o \ $(OBJS)\coredll_helpbase.o \ @@ -3479,23 +3560,32 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_menucmn.o \ $(OBJS)\coredll_mousemanager.o \ $(OBJS)\coredll_nbkbase.o \ + $(OBJS)\coredll_odcombocmn.o \ $(OBJS)\coredll_overlaycmn.o \ $(OBJS)\coredll_ownerdrwcmn.o \ $(OBJS)\coredll_paper.o \ + $(OBJS)\coredll_panelcmn.o \ $(OBJS)\coredll_persist.o \ $(OBJS)\coredll_pickerbase.o \ $(OBJS)\coredll_popupcmn.o \ $(OBJS)\coredll_prntbase.o \ $(OBJS)\coredll_quantize.o \ + $(OBJS)\coredll_radiobtncmn.o \ $(OBJS)\coredll_radiocmn.o \ $(OBJS)\coredll_rearrangectrl.o \ $(OBJS)\coredll_rendcmn.o \ $(OBJS)\coredll_rgncmn.o \ + $(OBJS)\coredll_scrolbarcmn.o \ $(OBJS)\coredll_settcmn.o \ $(OBJS)\coredll_sizer.o \ + $(OBJS)\coredll_slidercmn.o \ + $(OBJS)\coredll_spinbtncmn.o \ $(OBJS)\coredll_spinctrlcmn.o \ $(OBJS)\coredll_srchcmn.o \ $(OBJS)\coredll_statbar.o \ + $(OBJS)\coredll_statbmpcmn.o \ + $(OBJS)\coredll_statboxcmn.o \ + $(OBJS)\coredll_statlinecmn.o \ $(OBJS)\coredll_stattextcmn.o \ $(OBJS)\coredll_stockitem.o \ $(OBJS)\coredll_tbarbase.o \ @@ -3673,9 +3763,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_artstd.o \ $(OBJS)\corelib_arttango.o \ $(OBJS)\corelib_bmpbase.o \ + $(OBJS)\corelib_bmpbtncmn.o \ $(OBJS)\corelib_bookctrl.o \ $(OBJS)\corelib_btncmn.o \ $(OBJS)\corelib_cairo.o \ + $(OBJS)\corelib_calctrlcmn.o \ + $(OBJS)\corelib_checkboxcmn.o \ + $(OBJS)\corelib_checklstcmn.o \ $(OBJS)\corelib_choiccmn.o \ $(OBJS)\corelib_clipcmn.o \ $(OBJS)\corelib_clrpickercmn.o \ @@ -3692,6 +3786,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_dcbufcmn.o \ $(OBJS)\corelib_dcgraph.o \ $(OBJS)\corelib_dcsvg.o \ + $(OBJS)\corelib_dirctrlcmn.o \ $(OBJS)\corelib_dlgcmn.o \ $(OBJS)\corelib_dndcmn.o \ $(OBJS)\corelib_dobjcmn.o \ @@ -3718,6 +3813,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_geometry.o \ $(OBJS)\corelib_gifdecod.o \ $(OBJS)\corelib_graphcmn.o \ + $(OBJS)\corelib_gridcmn.o \ $(OBJS)\corelib_headercolcmn.o \ $(OBJS)\corelib_headerctrlcmn.o \ $(OBJS)\corelib_helpbase.o \ @@ -3742,23 +3838,32 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_menucmn.o \ $(OBJS)\corelib_mousemanager.o \ $(OBJS)\corelib_nbkbase.o \ + $(OBJS)\corelib_odcombocmn.o \ $(OBJS)\corelib_overlaycmn.o \ $(OBJS)\corelib_ownerdrwcmn.o \ $(OBJS)\corelib_paper.o \ + $(OBJS)\corelib_panelcmn.o \ $(OBJS)\corelib_persist.o \ $(OBJS)\corelib_pickerbase.o \ $(OBJS)\corelib_popupcmn.o \ $(OBJS)\corelib_prntbase.o \ $(OBJS)\corelib_quantize.o \ + $(OBJS)\corelib_radiobtncmn.o \ $(OBJS)\corelib_radiocmn.o \ $(OBJS)\corelib_rearrangectrl.o \ $(OBJS)\corelib_rendcmn.o \ $(OBJS)\corelib_rgncmn.o \ + $(OBJS)\corelib_scrolbarcmn.o \ $(OBJS)\corelib_settcmn.o \ $(OBJS)\corelib_sizer.o \ + $(OBJS)\corelib_slidercmn.o \ + $(OBJS)\corelib_spinbtncmn.o \ $(OBJS)\corelib_spinctrlcmn.o \ $(OBJS)\corelib_srchcmn.o \ $(OBJS)\corelib_statbar.o \ + $(OBJS)\corelib_statbmpcmn.o \ + $(OBJS)\corelib_statboxcmn.o \ + $(OBJS)\corelib_statlinecmn.o \ $(OBJS)\corelib_stattextcmn.o \ $(OBJS)\corelib_stockitem.o \ $(OBJS)\corelib_tbarbase.o \ @@ -3923,9 +4028,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_artstd.o \ $(OBJS)\corelib_arttango.o \ $(OBJS)\corelib_bmpbase.o \ + $(OBJS)\corelib_bmpbtncmn.o \ $(OBJS)\corelib_bookctrl.o \ $(OBJS)\corelib_btncmn.o \ $(OBJS)\corelib_cairo.o \ + $(OBJS)\corelib_calctrlcmn.o \ + $(OBJS)\corelib_checkboxcmn.o \ + $(OBJS)\corelib_checklstcmn.o \ $(OBJS)\corelib_choiccmn.o \ $(OBJS)\corelib_clipcmn.o \ $(OBJS)\corelib_clrpickercmn.o \ @@ -3942,6 +4051,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_dcbufcmn.o \ $(OBJS)\corelib_dcgraph.o \ $(OBJS)\corelib_dcsvg.o \ + $(OBJS)\corelib_dirctrlcmn.o \ $(OBJS)\corelib_dlgcmn.o \ $(OBJS)\corelib_dndcmn.o \ $(OBJS)\corelib_dobjcmn.o \ @@ -3968,6 +4078,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_geometry.o \ $(OBJS)\corelib_gifdecod.o \ $(OBJS)\corelib_graphcmn.o \ + $(OBJS)\corelib_gridcmn.o \ $(OBJS)\corelib_headercolcmn.o \ $(OBJS)\corelib_headerctrlcmn.o \ $(OBJS)\corelib_helpbase.o \ @@ -3992,23 +4103,32 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_menucmn.o \ $(OBJS)\corelib_mousemanager.o \ $(OBJS)\corelib_nbkbase.o \ + $(OBJS)\corelib_odcombocmn.o \ $(OBJS)\corelib_overlaycmn.o \ $(OBJS)\corelib_ownerdrwcmn.o \ $(OBJS)\corelib_paper.o \ + $(OBJS)\corelib_panelcmn.o \ $(OBJS)\corelib_persist.o \ $(OBJS)\corelib_pickerbase.o \ $(OBJS)\corelib_popupcmn.o \ $(OBJS)\corelib_prntbase.o \ $(OBJS)\corelib_quantize.o \ + $(OBJS)\corelib_radiobtncmn.o \ $(OBJS)\corelib_radiocmn.o \ $(OBJS)\corelib_rearrangectrl.o \ $(OBJS)\corelib_rendcmn.o \ $(OBJS)\corelib_rgncmn.o \ + $(OBJS)\corelib_scrolbarcmn.o \ $(OBJS)\corelib_settcmn.o \ $(OBJS)\corelib_sizer.o \ + $(OBJS)\corelib_slidercmn.o \ + $(OBJS)\corelib_spinbtncmn.o \ $(OBJS)\corelib_spinctrlcmn.o \ $(OBJS)\corelib_srchcmn.o \ $(OBJS)\corelib_statbar.o \ + $(OBJS)\corelib_statbmpcmn.o \ + $(OBJS)\corelib_statboxcmn.o \ + $(OBJS)\corelib_statlinecmn.o \ $(OBJS)\corelib_stattextcmn.o \ $(OBJS)\corelib_stockitem.o \ $(OBJS)\corelib_tbarbase.o \ @@ -7288,6 +7408,11 @@ $(OBJS)\monodll_bmpbase.o: ../../src/common/bmpbase.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_bmpbtncmn.o: ../../src/common/bmpbtncmn.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monodll_bookctrl.o: ../../src/common/bookctrl.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -7303,6 +7428,26 @@ $(OBJS)\monodll_cairo.o: ../../src/common/cairo.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_calctrlcmn.o: ../../src/common/calctrlcmn.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_calctrlcmn.o: ../../src/common/calctrlcmn.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_checkboxcmn.o: ../../src/common/checkboxcmn.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_checklstcmn.o: ../../src/common/checklstcmn.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monodll_choiccmn.o: ../../src/common/choiccmn.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -7383,6 +7528,11 @@ $(OBJS)\monodll_dcsvg.o: ../../src/common/dcsvg.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_dirctrlcmn.o: ../../src/common/dirctrlcmn.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monodll_dlgcmn.o: ../../src/common/dlgcmn.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -7513,6 +7663,11 @@ $(OBJS)\monodll_graphcmn.o: ../../src/common/graphcmn.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_gridcmn.o: ../../src/common/gridcmn.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monodll_headercolcmn.o: ../../src/common/headercolcmn.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -7633,6 +7788,11 @@ $(OBJS)\monodll_nbkbase.o: ../../src/common/nbkbase.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_odcombocmn.o: ../../src/common/odcombocmn.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monodll_overlaycmn.o: ../../src/common/overlaycmn.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -7648,6 +7808,11 @@ $(OBJS)\monodll_paper.o: ../../src/common/paper.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_panelcmn.o: ../../src/common/panelcmn.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monodll_persist.o: ../../src/common/persist.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -7673,6 +7838,11 @@ $(OBJS)\monodll_quantize.o: ../../src/common/quantize.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_radiobtncmn.o: ../../src/common/radiobtncmn.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monodll_radiocmn.o: ../../src/common/radiocmn.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -7693,6 +7863,11 @@ $(OBJS)\monodll_rgncmn.o: ../../src/common/rgncmn.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_scrolbarcmn.o: ../../src/common/scrolbarcmn.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monodll_settcmn.o: ../../src/common/settcmn.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -7703,6 +7878,16 @@ $(OBJS)\monodll_sizer.o: ../../src/common/sizer.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_slidercmn.o: ../../src/common/slidercmn.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_spinbtncmn.o: ../../src/common/spinbtncmn.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monodll_spinctrlcmn.o: ../../src/common/spinctrlcmn.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -7718,6 +7903,21 @@ $(OBJS)\monodll_statbar.o: ../../src/common/statbar.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_statbmpcmn.o: ../../src/common/statbmpcmn.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_statboxcmn.o: ../../src/common/statboxcmn.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_statlinecmn.o: ../../src/common/statlinecmn.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monodll_stattextcmn.o: ../../src/common/stattextcmn.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -7973,11 +8173,6 @@ $(OBJS)\monodll_bmpcboxcmn.o: ../../src/common/bmpcboxcmn.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< endif -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_calctrlcmn.o: ../../src/common/calctrlcmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - ifeq ($(USE_GUI),1) $(OBJS)\monodll_datavcmn.o: ../../src/common/datavcmn.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -9535,6 +9730,11 @@ $(OBJS)\monolib_bmpbase.o: ../../src/common/bmpbase.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_bmpbtncmn.o: ../../src/common/bmpbtncmn.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monolib_bookctrl.o: ../../src/common/bookctrl.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -9550,6 +9750,26 @@ $(OBJS)\monolib_cairo.o: ../../src/common/cairo.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_calctrlcmn.o: ../../src/common/calctrlcmn.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_calctrlcmn.o: ../../src/common/calctrlcmn.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_checkboxcmn.o: ../../src/common/checkboxcmn.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_checklstcmn.o: ../../src/common/checklstcmn.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monolib_choiccmn.o: ../../src/common/choiccmn.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -9630,6 +9850,11 @@ $(OBJS)\monolib_dcsvg.o: ../../src/common/dcsvg.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_dirctrlcmn.o: ../../src/common/dirctrlcmn.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monolib_dlgcmn.o: ../../src/common/dlgcmn.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -9760,6 +9985,11 @@ $(OBJS)\monolib_graphcmn.o: ../../src/common/graphcmn.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_gridcmn.o: ../../src/common/gridcmn.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monolib_headercolcmn.o: ../../src/common/headercolcmn.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -9880,6 +10110,11 @@ $(OBJS)\monolib_nbkbase.o: ../../src/common/nbkbase.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_odcombocmn.o: ../../src/common/odcombocmn.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monolib_overlaycmn.o: ../../src/common/overlaycmn.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -9895,6 +10130,11 @@ $(OBJS)\monolib_paper.o: ../../src/common/paper.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_panelcmn.o: ../../src/common/panelcmn.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monolib_persist.o: ../../src/common/persist.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -9920,6 +10160,11 @@ $(OBJS)\monolib_quantize.o: ../../src/common/quantize.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_radiobtncmn.o: ../../src/common/radiobtncmn.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monolib_radiocmn.o: ../../src/common/radiocmn.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -9940,6 +10185,11 @@ $(OBJS)\monolib_rgncmn.o: ../../src/common/rgncmn.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_scrolbarcmn.o: ../../src/common/scrolbarcmn.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monolib_settcmn.o: ../../src/common/settcmn.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -9950,6 +10200,16 @@ $(OBJS)\monolib_sizer.o: ../../src/common/sizer.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_slidercmn.o: ../../src/common/slidercmn.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_spinbtncmn.o: ../../src/common/spinbtncmn.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monolib_spinctrlcmn.o: ../../src/common/spinctrlcmn.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -9965,6 +10225,21 @@ $(OBJS)\monolib_statbar.o: ../../src/common/statbar.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_statbmpcmn.o: ../../src/common/statbmpcmn.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_statboxcmn.o: ../../src/common/statboxcmn.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_statlinecmn.o: ../../src/common/statlinecmn.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monolib_stattextcmn.o: ../../src/common/stattextcmn.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -10220,11 +10495,6 @@ $(OBJS)\monolib_bmpcboxcmn.o: ../../src/common/bmpcboxcmn.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< endif -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_calctrlcmn.o: ../../src/common/calctrlcmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - ifeq ($(USE_GUI),1) $(OBJS)\monolib_datavcmn.o: ../../src/common/datavcmn.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -11773,6 +12043,11 @@ $(OBJS)\coredll_bmpbase.o: ../../src/common/bmpbase.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\coredll_bmpbtncmn.o: ../../src/common/bmpbtncmn.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\coredll_bookctrl.o: ../../src/common/bookctrl.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< @@ -11788,6 +12063,21 @@ $(OBJS)\coredll_cairo.o: ../../src/common/cairo.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\coredll_calctrlcmn.o: ../../src/common/calctrlcmn.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\coredll_checkboxcmn.o: ../../src/common/checkboxcmn.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\coredll_checklstcmn.o: ../../src/common/checklstcmn.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\coredll_choiccmn.o: ../../src/common/choiccmn.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< @@ -11868,6 +12158,11 @@ $(OBJS)\coredll_dcsvg.o: ../../src/common/dcsvg.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\coredll_dirctrlcmn.o: ../../src/common/dirctrlcmn.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\coredll_dlgcmn.o: ../../src/common/dlgcmn.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< @@ -11998,6 +12293,11 @@ $(OBJS)\coredll_graphcmn.o: ../../src/common/graphcmn.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\coredll_gridcmn.o: ../../src/common/gridcmn.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\coredll_headercolcmn.o: ../../src/common/headercolcmn.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< @@ -12118,6 +12418,11 @@ $(OBJS)\coredll_nbkbase.o: ../../src/common/nbkbase.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\coredll_odcombocmn.o: ../../src/common/odcombocmn.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\coredll_overlaycmn.o: ../../src/common/overlaycmn.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< @@ -12133,6 +12438,11 @@ $(OBJS)\coredll_paper.o: ../../src/common/paper.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\coredll_panelcmn.o: ../../src/common/panelcmn.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\coredll_persist.o: ../../src/common/persist.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< @@ -12158,6 +12468,11 @@ $(OBJS)\coredll_quantize.o: ../../src/common/quantize.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\coredll_radiobtncmn.o: ../../src/common/radiobtncmn.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\coredll_radiocmn.o: ../../src/common/radiocmn.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< @@ -12178,6 +12493,11 @@ $(OBJS)\coredll_rgncmn.o: ../../src/common/rgncmn.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\coredll_scrolbarcmn.o: ../../src/common/scrolbarcmn.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\coredll_settcmn.o: ../../src/common/settcmn.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< @@ -12188,6 +12508,16 @@ $(OBJS)\coredll_sizer.o: ../../src/common/sizer.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\coredll_slidercmn.o: ../../src/common/slidercmn.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\coredll_spinbtncmn.o: ../../src/common/spinbtncmn.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\coredll_spinctrlcmn.o: ../../src/common/spinctrlcmn.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< @@ -12203,6 +12533,21 @@ $(OBJS)\coredll_statbar.o: ../../src/common/statbar.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\coredll_statbmpcmn.o: ../../src/common/statbmpcmn.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\coredll_statboxcmn.o: ../../src/common/statboxcmn.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\coredll_statlinecmn.o: ../../src/common/statlinecmn.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\coredll_stattextcmn.o: ../../src/common/stattextcmn.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< @@ -13088,6 +13433,11 @@ $(OBJS)\corelib_bmpbase.o: ../../src/common/bmpbase.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\corelib_bmpbtncmn.o: ../../src/common/bmpbtncmn.cpp + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\corelib_bookctrl.o: ../../src/common/bookctrl.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< @@ -13103,6 +13453,21 @@ $(OBJS)\corelib_cairo.o: ../../src/common/cairo.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\corelib_calctrlcmn.o: ../../src/common/calctrlcmn.cpp + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\corelib_checkboxcmn.o: ../../src/common/checkboxcmn.cpp + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\corelib_checklstcmn.o: ../../src/common/checklstcmn.cpp + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\corelib_choiccmn.o: ../../src/common/choiccmn.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< @@ -13183,6 +13548,11 @@ $(OBJS)\corelib_dcsvg.o: ../../src/common/dcsvg.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\corelib_dirctrlcmn.o: ../../src/common/dirctrlcmn.cpp + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\corelib_dlgcmn.o: ../../src/common/dlgcmn.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< @@ -13313,6 +13683,11 @@ $(OBJS)\corelib_graphcmn.o: ../../src/common/graphcmn.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\corelib_gridcmn.o: ../../src/common/gridcmn.cpp + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\corelib_headercolcmn.o: ../../src/common/headercolcmn.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< @@ -13433,6 +13808,11 @@ $(OBJS)\corelib_nbkbase.o: ../../src/common/nbkbase.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\corelib_odcombocmn.o: ../../src/common/odcombocmn.cpp + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\corelib_overlaycmn.o: ../../src/common/overlaycmn.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< @@ -13448,6 +13828,11 @@ $(OBJS)\corelib_paper.o: ../../src/common/paper.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\corelib_panelcmn.o: ../../src/common/panelcmn.cpp + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\corelib_persist.o: ../../src/common/persist.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< @@ -13473,6 +13858,11 @@ $(OBJS)\corelib_quantize.o: ../../src/common/quantize.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\corelib_radiobtncmn.o: ../../src/common/radiobtncmn.cpp + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\corelib_radiocmn.o: ../../src/common/radiocmn.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< @@ -13493,6 +13883,11 @@ $(OBJS)\corelib_rgncmn.o: ../../src/common/rgncmn.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\corelib_scrolbarcmn.o: ../../src/common/scrolbarcmn.cpp + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\corelib_settcmn.o: ../../src/common/settcmn.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< @@ -13503,6 +13898,16 @@ $(OBJS)\corelib_sizer.o: ../../src/common/sizer.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\corelib_slidercmn.o: ../../src/common/slidercmn.cpp + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\corelib_spinbtncmn.o: ../../src/common/spinbtncmn.cpp + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\corelib_spinctrlcmn.o: ../../src/common/spinctrlcmn.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< @@ -13518,6 +13923,21 @@ $(OBJS)\corelib_statbar.o: ../../src/common/statbar.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\corelib_statbmpcmn.o: ../../src/common/statbmpcmn.cpp + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\corelib_statboxcmn.o: ../../src/common/statboxcmn.cpp + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\corelib_statlinecmn.o: ../../src/common/statlinecmn.cpp + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\corelib_stattextcmn.o: ../../src/common/stattextcmn.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc index b178e1f125..b0090620fc 100644 --- a/build/msw/makefile.vc +++ b/build/msw/makefile.vc @@ -1999,9 +1999,13 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_artstd.obj \ $(OBJS)\monodll_arttango.obj \ $(OBJS)\monodll_bmpbase.obj \ + $(OBJS)\monodll_bmpbtncmn.obj \ $(OBJS)\monodll_bookctrl.obj \ $(OBJS)\monodll_btncmn.obj \ $(OBJS)\monodll_cairo.obj \ + $(OBJS)\monodll_calctrlcmn.obj \ + $(OBJS)\monodll_checkboxcmn.obj \ + $(OBJS)\monodll_checklstcmn.obj \ $(OBJS)\monodll_choiccmn.obj \ $(OBJS)\monodll_clipcmn.obj \ $(OBJS)\monodll_clrpickercmn.obj \ @@ -2018,6 +2022,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_dcbufcmn.obj \ $(OBJS)\monodll_dcgraph.obj \ $(OBJS)\monodll_dcsvg.obj \ + $(OBJS)\monodll_dirctrlcmn.obj \ $(OBJS)\monodll_dlgcmn.obj \ $(OBJS)\monodll_dndcmn.obj \ $(OBJS)\monodll_dobjcmn.obj \ @@ -2044,6 +2049,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_geometry.obj \ $(OBJS)\monodll_gifdecod.obj \ $(OBJS)\monodll_graphcmn.obj \ + $(OBJS)\monodll_gridcmn.obj \ $(OBJS)\monodll_headercolcmn.obj \ $(OBJS)\monodll_headerctrlcmn.obj \ $(OBJS)\monodll_helpbase.obj \ @@ -2068,23 +2074,32 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_menucmn.obj \ $(OBJS)\monodll_mousemanager.obj \ $(OBJS)\monodll_nbkbase.obj \ + $(OBJS)\monodll_odcombocmn.obj \ $(OBJS)\monodll_overlaycmn.obj \ $(OBJS)\monodll_ownerdrwcmn.obj \ $(OBJS)\monodll_paper.obj \ + $(OBJS)\monodll_panelcmn.obj \ $(OBJS)\monodll_persist.obj \ $(OBJS)\monodll_pickerbase.obj \ $(OBJS)\monodll_popupcmn.obj \ $(OBJS)\monodll_prntbase.obj \ $(OBJS)\monodll_quantize.obj \ + $(OBJS)\monodll_radiobtncmn.obj \ $(OBJS)\monodll_radiocmn.obj \ $(OBJS)\monodll_rearrangectrl.obj \ $(OBJS)\monodll_rendcmn.obj \ $(OBJS)\monodll_rgncmn.obj \ + $(OBJS)\monodll_scrolbarcmn.obj \ $(OBJS)\monodll_settcmn.obj \ $(OBJS)\monodll_sizer.obj \ + $(OBJS)\monodll_slidercmn.obj \ + $(OBJS)\monodll_spinbtncmn.obj \ $(OBJS)\monodll_spinctrlcmn.obj \ $(OBJS)\monodll_srchcmn.obj \ $(OBJS)\monodll_statbar.obj \ + $(OBJS)\monodll_statbmpcmn.obj \ + $(OBJS)\monodll_statboxcmn.obj \ + $(OBJS)\monodll_statlinecmn.obj \ $(OBJS)\monodll_stattextcmn.obj \ $(OBJS)\monodll_stockitem.obj \ $(OBJS)\monodll_tbarbase.obj \ @@ -2247,9 +2262,13 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_artstd.obj \ $(OBJS)\monodll_arttango.obj \ $(OBJS)\monodll_bmpbase.obj \ + $(OBJS)\monodll_bmpbtncmn.obj \ $(OBJS)\monodll_bookctrl.obj \ $(OBJS)\monodll_btncmn.obj \ $(OBJS)\monodll_cairo.obj \ + $(OBJS)\monodll_calctrlcmn.obj \ + $(OBJS)\monodll_checkboxcmn.obj \ + $(OBJS)\monodll_checklstcmn.obj \ $(OBJS)\monodll_choiccmn.obj \ $(OBJS)\monodll_clipcmn.obj \ $(OBJS)\monodll_clrpickercmn.obj \ @@ -2266,6 +2285,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_dcbufcmn.obj \ $(OBJS)\monodll_dcgraph.obj \ $(OBJS)\monodll_dcsvg.obj \ + $(OBJS)\monodll_dirctrlcmn.obj \ $(OBJS)\monodll_dlgcmn.obj \ $(OBJS)\monodll_dndcmn.obj \ $(OBJS)\monodll_dobjcmn.obj \ @@ -2292,6 +2312,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_geometry.obj \ $(OBJS)\monodll_gifdecod.obj \ $(OBJS)\monodll_graphcmn.obj \ + $(OBJS)\monodll_gridcmn.obj \ $(OBJS)\monodll_headercolcmn.obj \ $(OBJS)\monodll_headerctrlcmn.obj \ $(OBJS)\monodll_helpbase.obj \ @@ -2316,23 +2337,32 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_menucmn.obj \ $(OBJS)\monodll_mousemanager.obj \ $(OBJS)\monodll_nbkbase.obj \ + $(OBJS)\monodll_odcombocmn.obj \ $(OBJS)\monodll_overlaycmn.obj \ $(OBJS)\monodll_ownerdrwcmn.obj \ $(OBJS)\monodll_paper.obj \ + $(OBJS)\monodll_panelcmn.obj \ $(OBJS)\monodll_persist.obj \ $(OBJS)\monodll_pickerbase.obj \ $(OBJS)\monodll_popupcmn.obj \ $(OBJS)\monodll_prntbase.obj \ $(OBJS)\monodll_quantize.obj \ + $(OBJS)\monodll_radiobtncmn.obj \ $(OBJS)\monodll_radiocmn.obj \ $(OBJS)\monodll_rearrangectrl.obj \ $(OBJS)\monodll_rendcmn.obj \ $(OBJS)\monodll_rgncmn.obj \ + $(OBJS)\monodll_scrolbarcmn.obj \ $(OBJS)\monodll_settcmn.obj \ $(OBJS)\monodll_sizer.obj \ + $(OBJS)\monodll_slidercmn.obj \ + $(OBJS)\monodll_spinbtncmn.obj \ $(OBJS)\monodll_spinctrlcmn.obj \ $(OBJS)\monodll_srchcmn.obj \ $(OBJS)\monodll_statbar.obj \ + $(OBJS)\monodll_statbmpcmn.obj \ + $(OBJS)\monodll_statboxcmn.obj \ + $(OBJS)\monodll_statlinecmn.obj \ $(OBJS)\monodll_stattextcmn.obj \ $(OBJS)\monodll_stockitem.obj \ $(OBJS)\monodll_tbarbase.obj \ @@ -2729,9 +2759,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_artstd.obj \ $(OBJS)\monolib_arttango.obj \ $(OBJS)\monolib_bmpbase.obj \ + $(OBJS)\monolib_bmpbtncmn.obj \ $(OBJS)\monolib_bookctrl.obj \ $(OBJS)\monolib_btncmn.obj \ $(OBJS)\monolib_cairo.obj \ + $(OBJS)\monolib_calctrlcmn.obj \ + $(OBJS)\monolib_checkboxcmn.obj \ + $(OBJS)\monolib_checklstcmn.obj \ $(OBJS)\monolib_choiccmn.obj \ $(OBJS)\monolib_clipcmn.obj \ $(OBJS)\monolib_clrpickercmn.obj \ @@ -2748,6 +2782,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_dcbufcmn.obj \ $(OBJS)\monolib_dcgraph.obj \ $(OBJS)\monolib_dcsvg.obj \ + $(OBJS)\monolib_dirctrlcmn.obj \ $(OBJS)\monolib_dlgcmn.obj \ $(OBJS)\monolib_dndcmn.obj \ $(OBJS)\monolib_dobjcmn.obj \ @@ -2774,6 +2809,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_geometry.obj \ $(OBJS)\monolib_gifdecod.obj \ $(OBJS)\monolib_graphcmn.obj \ + $(OBJS)\monolib_gridcmn.obj \ $(OBJS)\monolib_headercolcmn.obj \ $(OBJS)\monolib_headerctrlcmn.obj \ $(OBJS)\monolib_helpbase.obj \ @@ -2798,23 +2834,32 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_menucmn.obj \ $(OBJS)\monolib_mousemanager.obj \ $(OBJS)\monolib_nbkbase.obj \ + $(OBJS)\monolib_odcombocmn.obj \ $(OBJS)\monolib_overlaycmn.obj \ $(OBJS)\monolib_ownerdrwcmn.obj \ $(OBJS)\monolib_paper.obj \ + $(OBJS)\monolib_panelcmn.obj \ $(OBJS)\monolib_persist.obj \ $(OBJS)\monolib_pickerbase.obj \ $(OBJS)\monolib_popupcmn.obj \ $(OBJS)\monolib_prntbase.obj \ $(OBJS)\monolib_quantize.obj \ + $(OBJS)\monolib_radiobtncmn.obj \ $(OBJS)\monolib_radiocmn.obj \ $(OBJS)\monolib_rearrangectrl.obj \ $(OBJS)\monolib_rendcmn.obj \ $(OBJS)\monolib_rgncmn.obj \ + $(OBJS)\monolib_scrolbarcmn.obj \ $(OBJS)\monolib_settcmn.obj \ $(OBJS)\monolib_sizer.obj \ + $(OBJS)\monolib_slidercmn.obj \ + $(OBJS)\monolib_spinbtncmn.obj \ $(OBJS)\monolib_spinctrlcmn.obj \ $(OBJS)\monolib_srchcmn.obj \ $(OBJS)\monolib_statbar.obj \ + $(OBJS)\monolib_statbmpcmn.obj \ + $(OBJS)\monolib_statboxcmn.obj \ + $(OBJS)\monolib_statlinecmn.obj \ $(OBJS)\monolib_stattextcmn.obj \ $(OBJS)\monolib_stockitem.obj \ $(OBJS)\monolib_tbarbase.obj \ @@ -2977,9 +3022,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_artstd.obj \ $(OBJS)\monolib_arttango.obj \ $(OBJS)\monolib_bmpbase.obj \ + $(OBJS)\monolib_bmpbtncmn.obj \ $(OBJS)\monolib_bookctrl.obj \ $(OBJS)\monolib_btncmn.obj \ $(OBJS)\monolib_cairo.obj \ + $(OBJS)\monolib_calctrlcmn.obj \ + $(OBJS)\monolib_checkboxcmn.obj \ + $(OBJS)\monolib_checklstcmn.obj \ $(OBJS)\monolib_choiccmn.obj \ $(OBJS)\monolib_clipcmn.obj \ $(OBJS)\monolib_clrpickercmn.obj \ @@ -2996,6 +3045,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_dcbufcmn.obj \ $(OBJS)\monolib_dcgraph.obj \ $(OBJS)\monolib_dcsvg.obj \ + $(OBJS)\monolib_dirctrlcmn.obj \ $(OBJS)\monolib_dlgcmn.obj \ $(OBJS)\monolib_dndcmn.obj \ $(OBJS)\monolib_dobjcmn.obj \ @@ -3022,6 +3072,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_geometry.obj \ $(OBJS)\monolib_gifdecod.obj \ $(OBJS)\monolib_graphcmn.obj \ + $(OBJS)\monolib_gridcmn.obj \ $(OBJS)\monolib_headercolcmn.obj \ $(OBJS)\monolib_headerctrlcmn.obj \ $(OBJS)\monolib_helpbase.obj \ @@ -3046,23 +3097,32 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_menucmn.obj \ $(OBJS)\monolib_mousemanager.obj \ $(OBJS)\monolib_nbkbase.obj \ + $(OBJS)\monolib_odcombocmn.obj \ $(OBJS)\monolib_overlaycmn.obj \ $(OBJS)\monolib_ownerdrwcmn.obj \ $(OBJS)\monolib_paper.obj \ + $(OBJS)\monolib_panelcmn.obj \ $(OBJS)\monolib_persist.obj \ $(OBJS)\monolib_pickerbase.obj \ $(OBJS)\monolib_popupcmn.obj \ $(OBJS)\monolib_prntbase.obj \ $(OBJS)\monolib_quantize.obj \ + $(OBJS)\monolib_radiobtncmn.obj \ $(OBJS)\monolib_radiocmn.obj \ $(OBJS)\monolib_rearrangectrl.obj \ $(OBJS)\monolib_rendcmn.obj \ $(OBJS)\monolib_rgncmn.obj \ + $(OBJS)\monolib_scrolbarcmn.obj \ $(OBJS)\monolib_settcmn.obj \ $(OBJS)\monolib_sizer.obj \ + $(OBJS)\monolib_slidercmn.obj \ + $(OBJS)\monolib_spinbtncmn.obj \ $(OBJS)\monolib_spinctrlcmn.obj \ $(OBJS)\monolib_srchcmn.obj \ $(OBJS)\monolib_statbar.obj \ + $(OBJS)\monolib_statbmpcmn.obj \ + $(OBJS)\monolib_statboxcmn.obj \ + $(OBJS)\monolib_statlinecmn.obj \ $(OBJS)\monolib_stattextcmn.obj \ $(OBJS)\monolib_stockitem.obj \ $(OBJS)\monolib_tbarbase.obj \ @@ -3407,9 +3467,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_artstd.obj \ $(OBJS)\coredll_arttango.obj \ $(OBJS)\coredll_bmpbase.obj \ + $(OBJS)\coredll_bmpbtncmn.obj \ $(OBJS)\coredll_bookctrl.obj \ $(OBJS)\coredll_btncmn.obj \ $(OBJS)\coredll_cairo.obj \ + $(OBJS)\coredll_calctrlcmn.obj \ + $(OBJS)\coredll_checkboxcmn.obj \ + $(OBJS)\coredll_checklstcmn.obj \ $(OBJS)\coredll_choiccmn.obj \ $(OBJS)\coredll_clipcmn.obj \ $(OBJS)\coredll_clrpickercmn.obj \ @@ -3426,6 +3490,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_dcbufcmn.obj \ $(OBJS)\coredll_dcgraph.obj \ $(OBJS)\coredll_dcsvg.obj \ + $(OBJS)\coredll_dirctrlcmn.obj \ $(OBJS)\coredll_dlgcmn.obj \ $(OBJS)\coredll_dndcmn.obj \ $(OBJS)\coredll_dobjcmn.obj \ @@ -3452,6 +3517,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_geometry.obj \ $(OBJS)\coredll_gifdecod.obj \ $(OBJS)\coredll_graphcmn.obj \ + $(OBJS)\coredll_gridcmn.obj \ $(OBJS)\coredll_headercolcmn.obj \ $(OBJS)\coredll_headerctrlcmn.obj \ $(OBJS)\coredll_helpbase.obj \ @@ -3476,23 +3542,32 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_menucmn.obj \ $(OBJS)\coredll_mousemanager.obj \ $(OBJS)\coredll_nbkbase.obj \ + $(OBJS)\coredll_odcombocmn.obj \ $(OBJS)\coredll_overlaycmn.obj \ $(OBJS)\coredll_ownerdrwcmn.obj \ $(OBJS)\coredll_paper.obj \ + $(OBJS)\coredll_panelcmn.obj \ $(OBJS)\coredll_persist.obj \ $(OBJS)\coredll_pickerbase.obj \ $(OBJS)\coredll_popupcmn.obj \ $(OBJS)\coredll_prntbase.obj \ $(OBJS)\coredll_quantize.obj \ + $(OBJS)\coredll_radiobtncmn.obj \ $(OBJS)\coredll_radiocmn.obj \ $(OBJS)\coredll_rearrangectrl.obj \ $(OBJS)\coredll_rendcmn.obj \ $(OBJS)\coredll_rgncmn.obj \ + $(OBJS)\coredll_scrolbarcmn.obj \ $(OBJS)\coredll_settcmn.obj \ $(OBJS)\coredll_sizer.obj \ + $(OBJS)\coredll_slidercmn.obj \ + $(OBJS)\coredll_spinbtncmn.obj \ $(OBJS)\coredll_spinctrlcmn.obj \ $(OBJS)\coredll_srchcmn.obj \ $(OBJS)\coredll_statbar.obj \ + $(OBJS)\coredll_statbmpcmn.obj \ + $(OBJS)\coredll_statboxcmn.obj \ + $(OBJS)\coredll_statlinecmn.obj \ $(OBJS)\coredll_stattextcmn.obj \ $(OBJS)\coredll_stockitem.obj \ $(OBJS)\coredll_tbarbase.obj \ @@ -3655,9 +3730,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_artstd.obj \ $(OBJS)\coredll_arttango.obj \ $(OBJS)\coredll_bmpbase.obj \ + $(OBJS)\coredll_bmpbtncmn.obj \ $(OBJS)\coredll_bookctrl.obj \ $(OBJS)\coredll_btncmn.obj \ $(OBJS)\coredll_cairo.obj \ + $(OBJS)\coredll_calctrlcmn.obj \ + $(OBJS)\coredll_checkboxcmn.obj \ + $(OBJS)\coredll_checklstcmn.obj \ $(OBJS)\coredll_choiccmn.obj \ $(OBJS)\coredll_clipcmn.obj \ $(OBJS)\coredll_clrpickercmn.obj \ @@ -3674,6 +3753,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_dcbufcmn.obj \ $(OBJS)\coredll_dcgraph.obj \ $(OBJS)\coredll_dcsvg.obj \ + $(OBJS)\coredll_dirctrlcmn.obj \ $(OBJS)\coredll_dlgcmn.obj \ $(OBJS)\coredll_dndcmn.obj \ $(OBJS)\coredll_dobjcmn.obj \ @@ -3700,6 +3780,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_geometry.obj \ $(OBJS)\coredll_gifdecod.obj \ $(OBJS)\coredll_graphcmn.obj \ + $(OBJS)\coredll_gridcmn.obj \ $(OBJS)\coredll_headercolcmn.obj \ $(OBJS)\coredll_headerctrlcmn.obj \ $(OBJS)\coredll_helpbase.obj \ @@ -3724,23 +3805,32 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_menucmn.obj \ $(OBJS)\coredll_mousemanager.obj \ $(OBJS)\coredll_nbkbase.obj \ + $(OBJS)\coredll_odcombocmn.obj \ $(OBJS)\coredll_overlaycmn.obj \ $(OBJS)\coredll_ownerdrwcmn.obj \ $(OBJS)\coredll_paper.obj \ + $(OBJS)\coredll_panelcmn.obj \ $(OBJS)\coredll_persist.obj \ $(OBJS)\coredll_pickerbase.obj \ $(OBJS)\coredll_popupcmn.obj \ $(OBJS)\coredll_prntbase.obj \ $(OBJS)\coredll_quantize.obj \ + $(OBJS)\coredll_radiobtncmn.obj \ $(OBJS)\coredll_radiocmn.obj \ $(OBJS)\coredll_rearrangectrl.obj \ $(OBJS)\coredll_rendcmn.obj \ $(OBJS)\coredll_rgncmn.obj \ + $(OBJS)\coredll_scrolbarcmn.obj \ $(OBJS)\coredll_settcmn.obj \ $(OBJS)\coredll_sizer.obj \ + $(OBJS)\coredll_slidercmn.obj \ + $(OBJS)\coredll_spinbtncmn.obj \ $(OBJS)\coredll_spinctrlcmn.obj \ $(OBJS)\coredll_srchcmn.obj \ $(OBJS)\coredll_statbar.obj \ + $(OBJS)\coredll_statbmpcmn.obj \ + $(OBJS)\coredll_statboxcmn.obj \ + $(OBJS)\coredll_statlinecmn.obj \ $(OBJS)\coredll_stattextcmn.obj \ $(OBJS)\coredll_stockitem.obj \ $(OBJS)\coredll_tbarbase.obj \ @@ -3918,9 +4008,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_artstd.obj \ $(OBJS)\corelib_arttango.obj \ $(OBJS)\corelib_bmpbase.obj \ + $(OBJS)\corelib_bmpbtncmn.obj \ $(OBJS)\corelib_bookctrl.obj \ $(OBJS)\corelib_btncmn.obj \ $(OBJS)\corelib_cairo.obj \ + $(OBJS)\corelib_calctrlcmn.obj \ + $(OBJS)\corelib_checkboxcmn.obj \ + $(OBJS)\corelib_checklstcmn.obj \ $(OBJS)\corelib_choiccmn.obj \ $(OBJS)\corelib_clipcmn.obj \ $(OBJS)\corelib_clrpickercmn.obj \ @@ -3937,6 +4031,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_dcbufcmn.obj \ $(OBJS)\corelib_dcgraph.obj \ $(OBJS)\corelib_dcsvg.obj \ + $(OBJS)\corelib_dirctrlcmn.obj \ $(OBJS)\corelib_dlgcmn.obj \ $(OBJS)\corelib_dndcmn.obj \ $(OBJS)\corelib_dobjcmn.obj \ @@ -3963,6 +4058,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_geometry.obj \ $(OBJS)\corelib_gifdecod.obj \ $(OBJS)\corelib_graphcmn.obj \ + $(OBJS)\corelib_gridcmn.obj \ $(OBJS)\corelib_headercolcmn.obj \ $(OBJS)\corelib_headerctrlcmn.obj \ $(OBJS)\corelib_helpbase.obj \ @@ -3987,23 +4083,32 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_menucmn.obj \ $(OBJS)\corelib_mousemanager.obj \ $(OBJS)\corelib_nbkbase.obj \ + $(OBJS)\corelib_odcombocmn.obj \ $(OBJS)\corelib_overlaycmn.obj \ $(OBJS)\corelib_ownerdrwcmn.obj \ $(OBJS)\corelib_paper.obj \ + $(OBJS)\corelib_panelcmn.obj \ $(OBJS)\corelib_persist.obj \ $(OBJS)\corelib_pickerbase.obj \ $(OBJS)\corelib_popupcmn.obj \ $(OBJS)\corelib_prntbase.obj \ $(OBJS)\corelib_quantize.obj \ + $(OBJS)\corelib_radiobtncmn.obj \ $(OBJS)\corelib_radiocmn.obj \ $(OBJS)\corelib_rearrangectrl.obj \ $(OBJS)\corelib_rendcmn.obj \ $(OBJS)\corelib_rgncmn.obj \ + $(OBJS)\corelib_scrolbarcmn.obj \ $(OBJS)\corelib_settcmn.obj \ $(OBJS)\corelib_sizer.obj \ + $(OBJS)\corelib_slidercmn.obj \ + $(OBJS)\corelib_spinbtncmn.obj \ $(OBJS)\corelib_spinctrlcmn.obj \ $(OBJS)\corelib_srchcmn.obj \ $(OBJS)\corelib_statbar.obj \ + $(OBJS)\corelib_statbmpcmn.obj \ + $(OBJS)\corelib_statboxcmn.obj \ + $(OBJS)\corelib_statlinecmn.obj \ $(OBJS)\corelib_stattextcmn.obj \ $(OBJS)\corelib_stockitem.obj \ $(OBJS)\corelib_tbarbase.obj \ @@ -4166,9 +4271,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_artstd.obj \ $(OBJS)\corelib_arttango.obj \ $(OBJS)\corelib_bmpbase.obj \ + $(OBJS)\corelib_bmpbtncmn.obj \ $(OBJS)\corelib_bookctrl.obj \ $(OBJS)\corelib_btncmn.obj \ $(OBJS)\corelib_cairo.obj \ + $(OBJS)\corelib_calctrlcmn.obj \ + $(OBJS)\corelib_checkboxcmn.obj \ + $(OBJS)\corelib_checklstcmn.obj \ $(OBJS)\corelib_choiccmn.obj \ $(OBJS)\corelib_clipcmn.obj \ $(OBJS)\corelib_clrpickercmn.obj \ @@ -4185,6 +4294,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_dcbufcmn.obj \ $(OBJS)\corelib_dcgraph.obj \ $(OBJS)\corelib_dcsvg.obj \ + $(OBJS)\corelib_dirctrlcmn.obj \ $(OBJS)\corelib_dlgcmn.obj \ $(OBJS)\corelib_dndcmn.obj \ $(OBJS)\corelib_dobjcmn.obj \ @@ -4211,6 +4321,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_geometry.obj \ $(OBJS)\corelib_gifdecod.obj \ $(OBJS)\corelib_graphcmn.obj \ + $(OBJS)\corelib_gridcmn.obj \ $(OBJS)\corelib_headercolcmn.obj \ $(OBJS)\corelib_headerctrlcmn.obj \ $(OBJS)\corelib_helpbase.obj \ @@ -4235,23 +4346,32 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_menucmn.obj \ $(OBJS)\corelib_mousemanager.obj \ $(OBJS)\corelib_nbkbase.obj \ + $(OBJS)\corelib_odcombocmn.obj \ $(OBJS)\corelib_overlaycmn.obj \ $(OBJS)\corelib_ownerdrwcmn.obj \ $(OBJS)\corelib_paper.obj \ + $(OBJS)\corelib_panelcmn.obj \ $(OBJS)\corelib_persist.obj \ $(OBJS)\corelib_pickerbase.obj \ $(OBJS)\corelib_popupcmn.obj \ $(OBJS)\corelib_prntbase.obj \ $(OBJS)\corelib_quantize.obj \ + $(OBJS)\corelib_radiobtncmn.obj \ $(OBJS)\corelib_radiocmn.obj \ $(OBJS)\corelib_rearrangectrl.obj \ $(OBJS)\corelib_rendcmn.obj \ $(OBJS)\corelib_rgncmn.obj \ + $(OBJS)\corelib_scrolbarcmn.obj \ $(OBJS)\corelib_settcmn.obj \ $(OBJS)\corelib_sizer.obj \ + $(OBJS)\corelib_slidercmn.obj \ + $(OBJS)\corelib_spinbtncmn.obj \ $(OBJS)\corelib_spinctrlcmn.obj \ $(OBJS)\corelib_srchcmn.obj \ $(OBJS)\corelib_statbar.obj \ + $(OBJS)\corelib_statbmpcmn.obj \ + $(OBJS)\corelib_statboxcmn.obj \ + $(OBJS)\corelib_statlinecmn.obj \ $(OBJS)\corelib_stattextcmn.obj \ $(OBJS)\corelib_stockitem.obj \ $(OBJS)\corelib_tbarbase.obj \ @@ -7718,6 +7838,11 @@ $(OBJS)\monodll_bmpbase.obj: ..\..\src\common\bmpbase.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\bmpbase.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_bmpbtncmn.obj: ..\..\src\common\bmpbtncmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\bmpbtncmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_bookctrl.obj: ..\..\src\common\bookctrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\bookctrl.cpp @@ -7733,6 +7858,26 @@ $(OBJS)\monodll_cairo.obj: ..\..\src\common\cairo.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\cairo.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_checkboxcmn.obj: ..\..\src\common\checkboxcmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\checkboxcmn.cpp +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_checklstcmn.obj: ..\..\src\common\checklstcmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\checklstcmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_choiccmn.obj: ..\..\src\common\choiccmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\choiccmn.cpp @@ -7813,6 +7958,11 @@ $(OBJS)\monodll_dcsvg.obj: ..\..\src\common\dcsvg.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dcsvg.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_dirctrlcmn.obj: ..\..\src\common\dirctrlcmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dirctrlcmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dlgcmn.cpp @@ -7943,6 +8093,11 @@ $(OBJS)\monodll_graphcmn.obj: ..\..\src\common\graphcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\graphcmn.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_gridcmn.obj: ..\..\src\common\gridcmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\gridcmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_headercolcmn.obj: ..\..\src\common\headercolcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\headercolcmn.cpp @@ -8063,6 +8218,11 @@ $(OBJS)\monodll_nbkbase.obj: ..\..\src\common\nbkbase.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\nbkbase.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\odcombocmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\overlaycmn.cpp @@ -8078,6 +8238,11 @@ $(OBJS)\monodll_paper.obj: ..\..\src\common\paper.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\paper.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_panelcmn.obj: ..\..\src\common\panelcmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\panelcmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_persist.obj: ..\..\src\common\persist.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\persist.cpp @@ -8103,6 +8268,11 @@ $(OBJS)\monodll_quantize.obj: ..\..\src\common\quantize.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\quantize.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_radiobtncmn.obj: ..\..\src\common\radiobtncmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\radiobtncmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_radiocmn.obj: ..\..\src\common\radiocmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\radiocmn.cpp @@ -8123,6 +8293,11 @@ $(OBJS)\monodll_rgncmn.obj: ..\..\src\common\rgncmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\rgncmn.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_scrolbarcmn.obj: ..\..\src\common\scrolbarcmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\scrolbarcmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_settcmn.obj: ..\..\src\common\settcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\settcmn.cpp @@ -8133,6 +8308,16 @@ $(OBJS)\monodll_sizer.obj: ..\..\src\common\sizer.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\sizer.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_slidercmn.obj: ..\..\src\common\slidercmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\slidercmn.cpp +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_spinbtncmn.obj: ..\..\src\common\spinbtncmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\spinbtncmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_spinctrlcmn.obj: ..\..\src\common\spinctrlcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\spinctrlcmn.cpp @@ -8148,6 +8333,21 @@ $(OBJS)\monodll_statbar.obj: ..\..\src\common\statbar.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\statbar.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_statbmpcmn.obj: ..\..\src\common\statbmpcmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\statbmpcmn.cpp +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_statboxcmn.obj: ..\..\src\common\statboxcmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\statboxcmn.cpp +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_statlinecmn.obj: ..\..\src\common\statlinecmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\statlinecmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_stattextcmn.obj: ..\..\src\common\stattextcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\stattextcmn.cpp @@ -8403,11 +8603,6 @@ $(OBJS)\monodll_bmpcboxcmn.obj: ..\..\src\common\bmpcboxcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\bmpcboxcmn.cpp !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\monodll_datavcmn.obj: ..\..\src\common\datavcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\datavcmn.cpp @@ -9965,6 +10160,11 @@ $(OBJS)\monolib_bmpbase.obj: ..\..\src\common\bmpbase.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\bmpbase.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_bmpbtncmn.obj: ..\..\src\common\bmpbtncmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\bmpbtncmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_bookctrl.obj: ..\..\src\common\bookctrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\bookctrl.cpp @@ -9980,6 +10180,26 @@ $(OBJS)\monolib_cairo.obj: ..\..\src\common\cairo.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\cairo.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_checkboxcmn.obj: ..\..\src\common\checkboxcmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\checkboxcmn.cpp +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_checklstcmn.obj: ..\..\src\common\checklstcmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\checklstcmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_choiccmn.obj: ..\..\src\common\choiccmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\choiccmn.cpp @@ -10060,6 +10280,11 @@ $(OBJS)\monolib_dcsvg.obj: ..\..\src\common\dcsvg.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dcsvg.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_dirctrlcmn.obj: ..\..\src\common\dirctrlcmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dirctrlcmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dlgcmn.cpp @@ -10190,6 +10415,11 @@ $(OBJS)\monolib_graphcmn.obj: ..\..\src\common\graphcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\graphcmn.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_gridcmn.obj: ..\..\src\common\gridcmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\gridcmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_headercolcmn.obj: ..\..\src\common\headercolcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\headercolcmn.cpp @@ -10310,6 +10540,11 @@ $(OBJS)\monolib_nbkbase.obj: ..\..\src\common\nbkbase.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\nbkbase.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\odcombocmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\overlaycmn.cpp @@ -10325,6 +10560,11 @@ $(OBJS)\monolib_paper.obj: ..\..\src\common\paper.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\paper.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_panelcmn.obj: ..\..\src\common\panelcmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\panelcmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_persist.obj: ..\..\src\common\persist.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\persist.cpp @@ -10350,6 +10590,11 @@ $(OBJS)\monolib_quantize.obj: ..\..\src\common\quantize.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\quantize.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_radiobtncmn.obj: ..\..\src\common\radiobtncmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\radiobtncmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_radiocmn.obj: ..\..\src\common\radiocmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\radiocmn.cpp @@ -10370,6 +10615,11 @@ $(OBJS)\monolib_rgncmn.obj: ..\..\src\common\rgncmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\rgncmn.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_scrolbarcmn.obj: ..\..\src\common\scrolbarcmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\scrolbarcmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_settcmn.obj: ..\..\src\common\settcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\settcmn.cpp @@ -10380,6 +10630,16 @@ $(OBJS)\monolib_sizer.obj: ..\..\src\common\sizer.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\sizer.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_slidercmn.obj: ..\..\src\common\slidercmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\slidercmn.cpp +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_spinbtncmn.obj: ..\..\src\common\spinbtncmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\spinbtncmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_spinctrlcmn.obj: ..\..\src\common\spinctrlcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\spinctrlcmn.cpp @@ -10395,6 +10655,21 @@ $(OBJS)\monolib_statbar.obj: ..\..\src\common\statbar.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\statbar.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_statbmpcmn.obj: ..\..\src\common\statbmpcmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\statbmpcmn.cpp +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_statboxcmn.obj: ..\..\src\common\statboxcmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\statboxcmn.cpp +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_statlinecmn.obj: ..\..\src\common\statlinecmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\statlinecmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_stattextcmn.obj: ..\..\src\common\stattextcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\stattextcmn.cpp @@ -10650,11 +10925,6 @@ $(OBJS)\monolib_bmpcboxcmn.obj: ..\..\src\common\bmpcboxcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\bmpcboxcmn.cpp !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\monolib_datavcmn.obj: ..\..\src\common\datavcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\datavcmn.cpp @@ -12203,6 +12473,11 @@ $(OBJS)\coredll_bmpbase.obj: ..\..\src\common\bmpbase.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\bmpbase.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_bmpbtncmn.obj: ..\..\src\common\bmpbtncmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\bmpbtncmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\coredll_bookctrl.obj: ..\..\src\common\bookctrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\bookctrl.cpp @@ -12218,6 +12493,21 @@ $(OBJS)\coredll_cairo.obj: ..\..\src\common\cairo.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\cairo.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_checkboxcmn.obj: ..\..\src\common\checkboxcmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\checkboxcmn.cpp +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_checklstcmn.obj: ..\..\src\common\checklstcmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\checklstcmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\coredll_choiccmn.obj: ..\..\src\common\choiccmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\choiccmn.cpp @@ -12298,6 +12588,11 @@ $(OBJS)\coredll_dcsvg.obj: ..\..\src\common\dcsvg.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\dcsvg.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_dirctrlcmn.obj: ..\..\src\common\dirctrlcmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\dirctrlcmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\coredll_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\dlgcmn.cpp @@ -12428,6 +12723,11 @@ $(OBJS)\coredll_graphcmn.obj: ..\..\src\common\graphcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\graphcmn.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_gridcmn.obj: ..\..\src\common\gridcmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\gridcmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\coredll_headercolcmn.obj: ..\..\src\common\headercolcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\headercolcmn.cpp @@ -12548,6 +12848,11 @@ $(OBJS)\coredll_nbkbase.obj: ..\..\src\common\nbkbase.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\nbkbase.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\odcombocmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\coredll_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\overlaycmn.cpp @@ -12563,6 +12868,11 @@ $(OBJS)\coredll_paper.obj: ..\..\src\common\paper.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\paper.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_panelcmn.obj: ..\..\src\common\panelcmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\panelcmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\coredll_persist.obj: ..\..\src\common\persist.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\persist.cpp @@ -12588,6 +12898,11 @@ $(OBJS)\coredll_quantize.obj: ..\..\src\common\quantize.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\quantize.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_radiobtncmn.obj: ..\..\src\common\radiobtncmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\radiobtncmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\coredll_radiocmn.obj: ..\..\src\common\radiocmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\radiocmn.cpp @@ -12608,6 +12923,11 @@ $(OBJS)\coredll_rgncmn.obj: ..\..\src\common\rgncmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\rgncmn.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_scrolbarcmn.obj: ..\..\src\common\scrolbarcmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\scrolbarcmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\coredll_settcmn.obj: ..\..\src\common\settcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\settcmn.cpp @@ -12618,6 +12938,16 @@ $(OBJS)\coredll_sizer.obj: ..\..\src\common\sizer.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\sizer.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_slidercmn.obj: ..\..\src\common\slidercmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\slidercmn.cpp +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_spinbtncmn.obj: ..\..\src\common\spinbtncmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\spinbtncmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\coredll_spinctrlcmn.obj: ..\..\src\common\spinctrlcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\spinctrlcmn.cpp @@ -12633,6 +12963,21 @@ $(OBJS)\coredll_statbar.obj: ..\..\src\common\statbar.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\statbar.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_statbmpcmn.obj: ..\..\src\common\statbmpcmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\statbmpcmn.cpp +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_statboxcmn.obj: ..\..\src\common\statboxcmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\statboxcmn.cpp +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_statlinecmn.obj: ..\..\src\common\statlinecmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\statlinecmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\coredll_stattextcmn.obj: ..\..\src\common\stattextcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\stattextcmn.cpp @@ -13518,6 +13863,11 @@ $(OBJS)\corelib_bmpbase.obj: ..\..\src\common\bmpbase.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\bmpbase.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_bmpbtncmn.obj: ..\..\src\common\bmpbtncmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\bmpbtncmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\corelib_bookctrl.obj: ..\..\src\common\bookctrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\bookctrl.cpp @@ -13533,6 +13883,21 @@ $(OBJS)\corelib_cairo.obj: ..\..\src\common\cairo.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\cairo.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_checkboxcmn.obj: ..\..\src\common\checkboxcmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\checkboxcmn.cpp +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_checklstcmn.obj: ..\..\src\common\checklstcmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\checklstcmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\corelib_choiccmn.obj: ..\..\src\common\choiccmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\choiccmn.cpp @@ -13613,6 +13978,11 @@ $(OBJS)\corelib_dcsvg.obj: ..\..\src\common\dcsvg.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\dcsvg.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_dirctrlcmn.obj: ..\..\src\common\dirctrlcmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\dirctrlcmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\corelib_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\dlgcmn.cpp @@ -13743,6 +14113,11 @@ $(OBJS)\corelib_graphcmn.obj: ..\..\src\common\graphcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\graphcmn.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_gridcmn.obj: ..\..\src\common\gridcmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\gridcmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\corelib_headercolcmn.obj: ..\..\src\common\headercolcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\headercolcmn.cpp @@ -13863,6 +14238,11 @@ $(OBJS)\corelib_nbkbase.obj: ..\..\src\common\nbkbase.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\nbkbase.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\odcombocmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\corelib_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\overlaycmn.cpp @@ -13878,6 +14258,11 @@ $(OBJS)\corelib_paper.obj: ..\..\src\common\paper.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\paper.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_panelcmn.obj: ..\..\src\common\panelcmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\panelcmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\corelib_persist.obj: ..\..\src\common\persist.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\persist.cpp @@ -13903,6 +14288,11 @@ $(OBJS)\corelib_quantize.obj: ..\..\src\common\quantize.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\quantize.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_radiobtncmn.obj: ..\..\src\common\radiobtncmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\radiobtncmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\corelib_radiocmn.obj: ..\..\src\common\radiocmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\radiocmn.cpp @@ -13923,6 +14313,11 @@ $(OBJS)\corelib_rgncmn.obj: ..\..\src\common\rgncmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\rgncmn.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_scrolbarcmn.obj: ..\..\src\common\scrolbarcmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\scrolbarcmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\corelib_settcmn.obj: ..\..\src\common\settcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\settcmn.cpp @@ -13933,6 +14328,16 @@ $(OBJS)\corelib_sizer.obj: ..\..\src\common\sizer.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\sizer.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_slidercmn.obj: ..\..\src\common\slidercmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\slidercmn.cpp +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_spinbtncmn.obj: ..\..\src\common\spinbtncmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\spinbtncmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\corelib_spinctrlcmn.obj: ..\..\src\common\spinctrlcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\spinctrlcmn.cpp @@ -13948,6 +14353,21 @@ $(OBJS)\corelib_statbar.obj: ..\..\src\common\statbar.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\statbar.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_statbmpcmn.obj: ..\..\src\common\statbmpcmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\statbmpcmn.cpp +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_statboxcmn.obj: ..\..\src\common\statboxcmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\statboxcmn.cpp +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_statlinecmn.obj: ..\..\src\common\statlinecmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\statlinecmn.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\corelib_stattextcmn.obj: ..\..\src\common\stattextcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\stattextcmn.cpp diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat index 944fdd8c6d..d7c6345bb0 100644 --- a/build/msw/makefile.wat +++ b/build/msw/makefile.wat @@ -357,9 +357,13 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_artstd.obj & $(OBJS)\monodll_arttango.obj & $(OBJS)\monodll_bmpbase.obj & + $(OBJS)\monodll_bmpbtncmn.obj & $(OBJS)\monodll_bookctrl.obj & $(OBJS)\monodll_btncmn.obj & $(OBJS)\monodll_cairo.obj & + $(OBJS)\monodll_calctrlcmn.obj & + $(OBJS)\monodll_checkboxcmn.obj & + $(OBJS)\monodll_checklstcmn.obj & $(OBJS)\monodll_choiccmn.obj & $(OBJS)\monodll_clipcmn.obj & $(OBJS)\monodll_clrpickercmn.obj & @@ -376,6 +380,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_dcbufcmn.obj & $(OBJS)\monodll_dcgraph.obj & $(OBJS)\monodll_dcsvg.obj & + $(OBJS)\monodll_dirctrlcmn.obj & $(OBJS)\monodll_dlgcmn.obj & $(OBJS)\monodll_dndcmn.obj & $(OBJS)\monodll_dobjcmn.obj & @@ -402,6 +407,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_geometry.obj & $(OBJS)\monodll_gifdecod.obj & $(OBJS)\monodll_graphcmn.obj & + $(OBJS)\monodll_gridcmn.obj & $(OBJS)\monodll_headercolcmn.obj & $(OBJS)\monodll_headerctrlcmn.obj & $(OBJS)\monodll_helpbase.obj & @@ -426,23 +432,32 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_menucmn.obj & $(OBJS)\monodll_mousemanager.obj & $(OBJS)\monodll_nbkbase.obj & + $(OBJS)\monodll_odcombocmn.obj & $(OBJS)\monodll_overlaycmn.obj & $(OBJS)\monodll_ownerdrwcmn.obj & $(OBJS)\monodll_paper.obj & + $(OBJS)\monodll_panelcmn.obj & $(OBJS)\monodll_persist.obj & $(OBJS)\monodll_pickerbase.obj & $(OBJS)\monodll_popupcmn.obj & $(OBJS)\monodll_prntbase.obj & $(OBJS)\monodll_quantize.obj & + $(OBJS)\monodll_radiobtncmn.obj & $(OBJS)\monodll_radiocmn.obj & $(OBJS)\monodll_rearrangectrl.obj & $(OBJS)\monodll_rendcmn.obj & $(OBJS)\monodll_rgncmn.obj & + $(OBJS)\monodll_scrolbarcmn.obj & $(OBJS)\monodll_settcmn.obj & $(OBJS)\monodll_sizer.obj & + $(OBJS)\monodll_slidercmn.obj & + $(OBJS)\monodll_spinbtncmn.obj & $(OBJS)\monodll_spinctrlcmn.obj & $(OBJS)\monodll_srchcmn.obj & $(OBJS)\monodll_statbar.obj & + $(OBJS)\monodll_statbmpcmn.obj & + $(OBJS)\monodll_statboxcmn.obj & + $(OBJS)\monodll_statlinecmn.obj & $(OBJS)\monodll_stattextcmn.obj & $(OBJS)\monodll_stockitem.obj & $(OBJS)\monodll_tbarbase.obj & @@ -607,9 +622,13 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_artstd.obj & $(OBJS)\monodll_arttango.obj & $(OBJS)\monodll_bmpbase.obj & + $(OBJS)\monodll_bmpbtncmn.obj & $(OBJS)\monodll_bookctrl.obj & $(OBJS)\monodll_btncmn.obj & $(OBJS)\monodll_cairo.obj & + $(OBJS)\monodll_calctrlcmn.obj & + $(OBJS)\monodll_checkboxcmn.obj & + $(OBJS)\monodll_checklstcmn.obj & $(OBJS)\monodll_choiccmn.obj & $(OBJS)\monodll_clipcmn.obj & $(OBJS)\monodll_clrpickercmn.obj & @@ -626,6 +645,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_dcbufcmn.obj & $(OBJS)\monodll_dcgraph.obj & $(OBJS)\monodll_dcsvg.obj & + $(OBJS)\monodll_dirctrlcmn.obj & $(OBJS)\monodll_dlgcmn.obj & $(OBJS)\monodll_dndcmn.obj & $(OBJS)\monodll_dobjcmn.obj & @@ -652,6 +672,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_geometry.obj & $(OBJS)\monodll_gifdecod.obj & $(OBJS)\monodll_graphcmn.obj & + $(OBJS)\monodll_gridcmn.obj & $(OBJS)\monodll_headercolcmn.obj & $(OBJS)\monodll_headerctrlcmn.obj & $(OBJS)\monodll_helpbase.obj & @@ -676,23 +697,32 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_menucmn.obj & $(OBJS)\monodll_mousemanager.obj & $(OBJS)\monodll_nbkbase.obj & + $(OBJS)\monodll_odcombocmn.obj & $(OBJS)\monodll_overlaycmn.obj & $(OBJS)\monodll_ownerdrwcmn.obj & $(OBJS)\monodll_paper.obj & + $(OBJS)\monodll_panelcmn.obj & $(OBJS)\monodll_persist.obj & $(OBJS)\monodll_pickerbase.obj & $(OBJS)\monodll_popupcmn.obj & $(OBJS)\monodll_prntbase.obj & $(OBJS)\monodll_quantize.obj & + $(OBJS)\monodll_radiobtncmn.obj & $(OBJS)\monodll_radiocmn.obj & $(OBJS)\monodll_rearrangectrl.obj & $(OBJS)\monodll_rendcmn.obj & $(OBJS)\monodll_rgncmn.obj & + $(OBJS)\monodll_scrolbarcmn.obj & $(OBJS)\monodll_settcmn.obj & $(OBJS)\monodll_sizer.obj & + $(OBJS)\monodll_slidercmn.obj & + $(OBJS)\monodll_spinbtncmn.obj & $(OBJS)\monodll_spinctrlcmn.obj & $(OBJS)\monodll_srchcmn.obj & $(OBJS)\monodll_statbar.obj & + $(OBJS)\monodll_statbmpcmn.obj & + $(OBJS)\monodll_statboxcmn.obj & + $(OBJS)\monodll_statlinecmn.obj & $(OBJS)\monodll_stattextcmn.obj & $(OBJS)\monodll_stockitem.obj & $(OBJS)\monodll_tbarbase.obj & @@ -1092,9 +1122,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_artstd.obj & $(OBJS)\monolib_arttango.obj & $(OBJS)\monolib_bmpbase.obj & + $(OBJS)\monolib_bmpbtncmn.obj & $(OBJS)\monolib_bookctrl.obj & $(OBJS)\monolib_btncmn.obj & $(OBJS)\monolib_cairo.obj & + $(OBJS)\monolib_calctrlcmn.obj & + $(OBJS)\monolib_checkboxcmn.obj & + $(OBJS)\monolib_checklstcmn.obj & $(OBJS)\monolib_choiccmn.obj & $(OBJS)\monolib_clipcmn.obj & $(OBJS)\monolib_clrpickercmn.obj & @@ -1111,6 +1145,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_dcbufcmn.obj & $(OBJS)\monolib_dcgraph.obj & $(OBJS)\monolib_dcsvg.obj & + $(OBJS)\monolib_dirctrlcmn.obj & $(OBJS)\monolib_dlgcmn.obj & $(OBJS)\monolib_dndcmn.obj & $(OBJS)\monolib_dobjcmn.obj & @@ -1137,6 +1172,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_geometry.obj & $(OBJS)\monolib_gifdecod.obj & $(OBJS)\monolib_graphcmn.obj & + $(OBJS)\monolib_gridcmn.obj & $(OBJS)\monolib_headercolcmn.obj & $(OBJS)\monolib_headerctrlcmn.obj & $(OBJS)\monolib_helpbase.obj & @@ -1161,23 +1197,32 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_menucmn.obj & $(OBJS)\monolib_mousemanager.obj & $(OBJS)\monolib_nbkbase.obj & + $(OBJS)\monolib_odcombocmn.obj & $(OBJS)\monolib_overlaycmn.obj & $(OBJS)\monolib_ownerdrwcmn.obj & $(OBJS)\monolib_paper.obj & + $(OBJS)\monolib_panelcmn.obj & $(OBJS)\monolib_persist.obj & $(OBJS)\monolib_pickerbase.obj & $(OBJS)\monolib_popupcmn.obj & $(OBJS)\monolib_prntbase.obj & $(OBJS)\monolib_quantize.obj & + $(OBJS)\monolib_radiobtncmn.obj & $(OBJS)\monolib_radiocmn.obj & $(OBJS)\monolib_rearrangectrl.obj & $(OBJS)\monolib_rendcmn.obj & $(OBJS)\monolib_rgncmn.obj & + $(OBJS)\monolib_scrolbarcmn.obj & $(OBJS)\monolib_settcmn.obj & $(OBJS)\monolib_sizer.obj & + $(OBJS)\monolib_slidercmn.obj & + $(OBJS)\monolib_spinbtncmn.obj & $(OBJS)\monolib_spinctrlcmn.obj & $(OBJS)\monolib_srchcmn.obj & $(OBJS)\monolib_statbar.obj & + $(OBJS)\monolib_statbmpcmn.obj & + $(OBJS)\monolib_statboxcmn.obj & + $(OBJS)\monolib_statlinecmn.obj & $(OBJS)\monolib_stattextcmn.obj & $(OBJS)\monolib_stockitem.obj & $(OBJS)\monolib_tbarbase.obj & @@ -1342,9 +1387,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_artstd.obj & $(OBJS)\monolib_arttango.obj & $(OBJS)\monolib_bmpbase.obj & + $(OBJS)\monolib_bmpbtncmn.obj & $(OBJS)\monolib_bookctrl.obj & $(OBJS)\monolib_btncmn.obj & $(OBJS)\monolib_cairo.obj & + $(OBJS)\monolib_calctrlcmn.obj & + $(OBJS)\monolib_checkboxcmn.obj & + $(OBJS)\monolib_checklstcmn.obj & $(OBJS)\monolib_choiccmn.obj & $(OBJS)\monolib_clipcmn.obj & $(OBJS)\monolib_clrpickercmn.obj & @@ -1361,6 +1410,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_dcbufcmn.obj & $(OBJS)\monolib_dcgraph.obj & $(OBJS)\monolib_dcsvg.obj & + $(OBJS)\monolib_dirctrlcmn.obj & $(OBJS)\monolib_dlgcmn.obj & $(OBJS)\monolib_dndcmn.obj & $(OBJS)\monolib_dobjcmn.obj & @@ -1387,6 +1437,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_geometry.obj & $(OBJS)\monolib_gifdecod.obj & $(OBJS)\monolib_graphcmn.obj & + $(OBJS)\monolib_gridcmn.obj & $(OBJS)\monolib_headercolcmn.obj & $(OBJS)\monolib_headerctrlcmn.obj & $(OBJS)\monolib_helpbase.obj & @@ -1411,23 +1462,32 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_menucmn.obj & $(OBJS)\monolib_mousemanager.obj & $(OBJS)\monolib_nbkbase.obj & + $(OBJS)\monolib_odcombocmn.obj & $(OBJS)\monolib_overlaycmn.obj & $(OBJS)\monolib_ownerdrwcmn.obj & $(OBJS)\monolib_paper.obj & + $(OBJS)\monolib_panelcmn.obj & $(OBJS)\monolib_persist.obj & $(OBJS)\monolib_pickerbase.obj & $(OBJS)\monolib_popupcmn.obj & $(OBJS)\monolib_prntbase.obj & $(OBJS)\monolib_quantize.obj & + $(OBJS)\monolib_radiobtncmn.obj & $(OBJS)\monolib_radiocmn.obj & $(OBJS)\monolib_rearrangectrl.obj & $(OBJS)\monolib_rendcmn.obj & $(OBJS)\monolib_rgncmn.obj & + $(OBJS)\monolib_scrolbarcmn.obj & $(OBJS)\monolib_settcmn.obj & $(OBJS)\monolib_sizer.obj & + $(OBJS)\monolib_slidercmn.obj & + $(OBJS)\monolib_spinbtncmn.obj & $(OBJS)\monolib_spinctrlcmn.obj & $(OBJS)\monolib_srchcmn.obj & $(OBJS)\monolib_statbar.obj & + $(OBJS)\monolib_statbmpcmn.obj & + $(OBJS)\monolib_statboxcmn.obj & + $(OBJS)\monolib_statlinecmn.obj & $(OBJS)\monolib_stattextcmn.obj & $(OBJS)\monolib_stockitem.obj & $(OBJS)\monolib_tbarbase.obj & @@ -1731,9 +1791,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_artstd.obj & $(OBJS)\coredll_arttango.obj & $(OBJS)\coredll_bmpbase.obj & + $(OBJS)\coredll_bmpbtncmn.obj & $(OBJS)\coredll_bookctrl.obj & $(OBJS)\coredll_btncmn.obj & $(OBJS)\coredll_cairo.obj & + $(OBJS)\coredll_calctrlcmn.obj & + $(OBJS)\coredll_checkboxcmn.obj & + $(OBJS)\coredll_checklstcmn.obj & $(OBJS)\coredll_choiccmn.obj & $(OBJS)\coredll_clipcmn.obj & $(OBJS)\coredll_clrpickercmn.obj & @@ -1750,6 +1814,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_dcbufcmn.obj & $(OBJS)\coredll_dcgraph.obj & $(OBJS)\coredll_dcsvg.obj & + $(OBJS)\coredll_dirctrlcmn.obj & $(OBJS)\coredll_dlgcmn.obj & $(OBJS)\coredll_dndcmn.obj & $(OBJS)\coredll_dobjcmn.obj & @@ -1776,6 +1841,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_geometry.obj & $(OBJS)\coredll_gifdecod.obj & $(OBJS)\coredll_graphcmn.obj & + $(OBJS)\coredll_gridcmn.obj & $(OBJS)\coredll_headercolcmn.obj & $(OBJS)\coredll_headerctrlcmn.obj & $(OBJS)\coredll_helpbase.obj & @@ -1800,23 +1866,32 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_menucmn.obj & $(OBJS)\coredll_mousemanager.obj & $(OBJS)\coredll_nbkbase.obj & + $(OBJS)\coredll_odcombocmn.obj & $(OBJS)\coredll_overlaycmn.obj & $(OBJS)\coredll_ownerdrwcmn.obj & $(OBJS)\coredll_paper.obj & + $(OBJS)\coredll_panelcmn.obj & $(OBJS)\coredll_persist.obj & $(OBJS)\coredll_pickerbase.obj & $(OBJS)\coredll_popupcmn.obj & $(OBJS)\coredll_prntbase.obj & $(OBJS)\coredll_quantize.obj & + $(OBJS)\coredll_radiobtncmn.obj & $(OBJS)\coredll_radiocmn.obj & $(OBJS)\coredll_rearrangectrl.obj & $(OBJS)\coredll_rendcmn.obj & $(OBJS)\coredll_rgncmn.obj & + $(OBJS)\coredll_scrolbarcmn.obj & $(OBJS)\coredll_settcmn.obj & $(OBJS)\coredll_sizer.obj & + $(OBJS)\coredll_slidercmn.obj & + $(OBJS)\coredll_spinbtncmn.obj & $(OBJS)\coredll_spinctrlcmn.obj & $(OBJS)\coredll_srchcmn.obj & $(OBJS)\coredll_statbar.obj & + $(OBJS)\coredll_statbmpcmn.obj & + $(OBJS)\coredll_statboxcmn.obj & + $(OBJS)\coredll_statlinecmn.obj & $(OBJS)\coredll_stattextcmn.obj & $(OBJS)\coredll_stockitem.obj & $(OBJS)\coredll_tbarbase.obj & @@ -1981,9 +2056,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_artstd.obj & $(OBJS)\coredll_arttango.obj & $(OBJS)\coredll_bmpbase.obj & + $(OBJS)\coredll_bmpbtncmn.obj & $(OBJS)\coredll_bookctrl.obj & $(OBJS)\coredll_btncmn.obj & $(OBJS)\coredll_cairo.obj & + $(OBJS)\coredll_calctrlcmn.obj & + $(OBJS)\coredll_checkboxcmn.obj & + $(OBJS)\coredll_checklstcmn.obj & $(OBJS)\coredll_choiccmn.obj & $(OBJS)\coredll_clipcmn.obj & $(OBJS)\coredll_clrpickercmn.obj & @@ -2000,6 +2079,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_dcbufcmn.obj & $(OBJS)\coredll_dcgraph.obj & $(OBJS)\coredll_dcsvg.obj & + $(OBJS)\coredll_dirctrlcmn.obj & $(OBJS)\coredll_dlgcmn.obj & $(OBJS)\coredll_dndcmn.obj & $(OBJS)\coredll_dobjcmn.obj & @@ -2026,6 +2106,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_geometry.obj & $(OBJS)\coredll_gifdecod.obj & $(OBJS)\coredll_graphcmn.obj & + $(OBJS)\coredll_gridcmn.obj & $(OBJS)\coredll_headercolcmn.obj & $(OBJS)\coredll_headerctrlcmn.obj & $(OBJS)\coredll_helpbase.obj & @@ -2050,23 +2131,32 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_menucmn.obj & $(OBJS)\coredll_mousemanager.obj & $(OBJS)\coredll_nbkbase.obj & + $(OBJS)\coredll_odcombocmn.obj & $(OBJS)\coredll_overlaycmn.obj & $(OBJS)\coredll_ownerdrwcmn.obj & $(OBJS)\coredll_paper.obj & + $(OBJS)\coredll_panelcmn.obj & $(OBJS)\coredll_persist.obj & $(OBJS)\coredll_pickerbase.obj & $(OBJS)\coredll_popupcmn.obj & $(OBJS)\coredll_prntbase.obj & $(OBJS)\coredll_quantize.obj & + $(OBJS)\coredll_radiobtncmn.obj & $(OBJS)\coredll_radiocmn.obj & $(OBJS)\coredll_rearrangectrl.obj & $(OBJS)\coredll_rendcmn.obj & $(OBJS)\coredll_rgncmn.obj & + $(OBJS)\coredll_scrolbarcmn.obj & $(OBJS)\coredll_settcmn.obj & $(OBJS)\coredll_sizer.obj & + $(OBJS)\coredll_slidercmn.obj & + $(OBJS)\coredll_spinbtncmn.obj & $(OBJS)\coredll_spinctrlcmn.obj & $(OBJS)\coredll_srchcmn.obj & $(OBJS)\coredll_statbar.obj & + $(OBJS)\coredll_statbmpcmn.obj & + $(OBJS)\coredll_statboxcmn.obj & + $(OBJS)\coredll_statlinecmn.obj & $(OBJS)\coredll_stattextcmn.obj & $(OBJS)\coredll_stockitem.obj & $(OBJS)\coredll_tbarbase.obj & @@ -2246,9 +2336,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_artstd.obj & $(OBJS)\corelib_arttango.obj & $(OBJS)\corelib_bmpbase.obj & + $(OBJS)\corelib_bmpbtncmn.obj & $(OBJS)\corelib_bookctrl.obj & $(OBJS)\corelib_btncmn.obj & $(OBJS)\corelib_cairo.obj & + $(OBJS)\corelib_calctrlcmn.obj & + $(OBJS)\corelib_checkboxcmn.obj & + $(OBJS)\corelib_checklstcmn.obj & $(OBJS)\corelib_choiccmn.obj & $(OBJS)\corelib_clipcmn.obj & $(OBJS)\corelib_clrpickercmn.obj & @@ -2265,6 +2359,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_dcbufcmn.obj & $(OBJS)\corelib_dcgraph.obj & $(OBJS)\corelib_dcsvg.obj & + $(OBJS)\corelib_dirctrlcmn.obj & $(OBJS)\corelib_dlgcmn.obj & $(OBJS)\corelib_dndcmn.obj & $(OBJS)\corelib_dobjcmn.obj & @@ -2291,6 +2386,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_geometry.obj & $(OBJS)\corelib_gifdecod.obj & $(OBJS)\corelib_graphcmn.obj & + $(OBJS)\corelib_gridcmn.obj & $(OBJS)\corelib_headercolcmn.obj & $(OBJS)\corelib_headerctrlcmn.obj & $(OBJS)\corelib_helpbase.obj & @@ -2315,23 +2411,32 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_menucmn.obj & $(OBJS)\corelib_mousemanager.obj & $(OBJS)\corelib_nbkbase.obj & + $(OBJS)\corelib_odcombocmn.obj & $(OBJS)\corelib_overlaycmn.obj & $(OBJS)\corelib_ownerdrwcmn.obj & $(OBJS)\corelib_paper.obj & + $(OBJS)\corelib_panelcmn.obj & $(OBJS)\corelib_persist.obj & $(OBJS)\corelib_pickerbase.obj & $(OBJS)\corelib_popupcmn.obj & $(OBJS)\corelib_prntbase.obj & $(OBJS)\corelib_quantize.obj & + $(OBJS)\corelib_radiobtncmn.obj & $(OBJS)\corelib_radiocmn.obj & $(OBJS)\corelib_rearrangectrl.obj & $(OBJS)\corelib_rendcmn.obj & $(OBJS)\corelib_rgncmn.obj & + $(OBJS)\corelib_scrolbarcmn.obj & $(OBJS)\corelib_settcmn.obj & $(OBJS)\corelib_sizer.obj & + $(OBJS)\corelib_slidercmn.obj & + $(OBJS)\corelib_spinbtncmn.obj & $(OBJS)\corelib_spinctrlcmn.obj & $(OBJS)\corelib_srchcmn.obj & $(OBJS)\corelib_statbar.obj & + $(OBJS)\corelib_statbmpcmn.obj & + $(OBJS)\corelib_statboxcmn.obj & + $(OBJS)\corelib_statlinecmn.obj & $(OBJS)\corelib_stattextcmn.obj & $(OBJS)\corelib_stockitem.obj & $(OBJS)\corelib_tbarbase.obj & @@ -2496,9 +2601,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_artstd.obj & $(OBJS)\corelib_arttango.obj & $(OBJS)\corelib_bmpbase.obj & + $(OBJS)\corelib_bmpbtncmn.obj & $(OBJS)\corelib_bookctrl.obj & $(OBJS)\corelib_btncmn.obj & $(OBJS)\corelib_cairo.obj & + $(OBJS)\corelib_calctrlcmn.obj & + $(OBJS)\corelib_checkboxcmn.obj & + $(OBJS)\corelib_checklstcmn.obj & $(OBJS)\corelib_choiccmn.obj & $(OBJS)\corelib_clipcmn.obj & $(OBJS)\corelib_clrpickercmn.obj & @@ -2515,6 +2624,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_dcbufcmn.obj & $(OBJS)\corelib_dcgraph.obj & $(OBJS)\corelib_dcsvg.obj & + $(OBJS)\corelib_dirctrlcmn.obj & $(OBJS)\corelib_dlgcmn.obj & $(OBJS)\corelib_dndcmn.obj & $(OBJS)\corelib_dobjcmn.obj & @@ -2541,6 +2651,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_geometry.obj & $(OBJS)\corelib_gifdecod.obj & $(OBJS)\corelib_graphcmn.obj & + $(OBJS)\corelib_gridcmn.obj & $(OBJS)\corelib_headercolcmn.obj & $(OBJS)\corelib_headerctrlcmn.obj & $(OBJS)\corelib_helpbase.obj & @@ -2565,23 +2676,32 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_menucmn.obj & $(OBJS)\corelib_mousemanager.obj & $(OBJS)\corelib_nbkbase.obj & + $(OBJS)\corelib_odcombocmn.obj & $(OBJS)\corelib_overlaycmn.obj & $(OBJS)\corelib_ownerdrwcmn.obj & $(OBJS)\corelib_paper.obj & + $(OBJS)\corelib_panelcmn.obj & $(OBJS)\corelib_persist.obj & $(OBJS)\corelib_pickerbase.obj & $(OBJS)\corelib_popupcmn.obj & $(OBJS)\corelib_prntbase.obj & $(OBJS)\corelib_quantize.obj & + $(OBJS)\corelib_radiobtncmn.obj & $(OBJS)\corelib_radiocmn.obj & $(OBJS)\corelib_rearrangectrl.obj & $(OBJS)\corelib_rendcmn.obj & $(OBJS)\corelib_rgncmn.obj & + $(OBJS)\corelib_scrolbarcmn.obj & $(OBJS)\corelib_settcmn.obj & $(OBJS)\corelib_sizer.obj & + $(OBJS)\corelib_slidercmn.obj & + $(OBJS)\corelib_spinbtncmn.obj & $(OBJS)\corelib_spinctrlcmn.obj & $(OBJS)\corelib_srchcmn.obj & $(OBJS)\corelib_statbar.obj & + $(OBJS)\corelib_statbmpcmn.obj & + $(OBJS)\corelib_statboxcmn.obj & + $(OBJS)\corelib_statlinecmn.obj & $(OBJS)\corelib_stattextcmn.obj & $(OBJS)\corelib_stockitem.obj & $(OBJS)\corelib_tbarbase.obj & @@ -7547,6 +7667,11 @@ $(OBJS)\monodll_bmpbase.obj : .AUTODEPEND ..\..\src\common\bmpbase.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monodll_bmpbtncmn.obj : .AUTODEPEND ..\..\src\common\bmpbtncmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monodll_bookctrl.obj : .AUTODEPEND ..\..\src\common\bookctrl.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -7562,6 +7687,26 @@ $(OBJS)\monodll_cairo.obj : .AUTODEPEND ..\..\src\common\cairo.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monodll_calctrlcmn.obj : .AUTODEPEND ..\..\src\common\calctrlcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\monodll_calctrlcmn.obj : .AUTODEPEND ..\..\src\common\calctrlcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\monodll_checkboxcmn.obj : .AUTODEPEND ..\..\src\common\checkboxcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\monodll_checklstcmn.obj : .AUTODEPEND ..\..\src\common\checklstcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monodll_choiccmn.obj : .AUTODEPEND ..\..\src\common\choiccmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -7642,6 +7787,11 @@ $(OBJS)\monodll_dcsvg.obj : .AUTODEPEND ..\..\src\common\dcsvg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monodll_dirctrlcmn.obj : .AUTODEPEND ..\..\src\common\dirctrlcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monodll_dlgcmn.obj : .AUTODEPEND ..\..\src\common\dlgcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -7772,6 +7922,11 @@ $(OBJS)\monodll_graphcmn.obj : .AUTODEPEND ..\..\src\common\graphcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monodll_gridcmn.obj : .AUTODEPEND ..\..\src\common\gridcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monodll_headercolcmn.obj : .AUTODEPEND ..\..\src\common\headercolcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -7892,6 +8047,11 @@ $(OBJS)\monodll_nbkbase.obj : .AUTODEPEND ..\..\src\common\nbkbase.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monodll_odcombocmn.obj : .AUTODEPEND ..\..\src\common\odcombocmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monodll_overlaycmn.obj : .AUTODEPEND ..\..\src\common\overlaycmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -7907,6 +8067,11 @@ $(OBJS)\monodll_paper.obj : .AUTODEPEND ..\..\src\common\paper.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monodll_panelcmn.obj : .AUTODEPEND ..\..\src\common\panelcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monodll_persist.obj : .AUTODEPEND ..\..\src\common\persist.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -7932,6 +8097,11 @@ $(OBJS)\monodll_quantize.obj : .AUTODEPEND ..\..\src\common\quantize.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monodll_radiobtncmn.obj : .AUTODEPEND ..\..\src\common\radiobtncmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monodll_radiocmn.obj : .AUTODEPEND ..\..\src\common\radiocmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -7952,6 +8122,11 @@ $(OBJS)\monodll_rgncmn.obj : .AUTODEPEND ..\..\src\common\rgncmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monodll_scrolbarcmn.obj : .AUTODEPEND ..\..\src\common\scrolbarcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monodll_settcmn.obj : .AUTODEPEND ..\..\src\common\settcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -7962,6 +8137,16 @@ $(OBJS)\monodll_sizer.obj : .AUTODEPEND ..\..\src\common\sizer.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monodll_slidercmn.obj : .AUTODEPEND ..\..\src\common\slidercmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\monodll_spinbtncmn.obj : .AUTODEPEND ..\..\src\common\spinbtncmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monodll_spinctrlcmn.obj : .AUTODEPEND ..\..\src\common\spinctrlcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -7977,6 +8162,21 @@ $(OBJS)\monodll_statbar.obj : .AUTODEPEND ..\..\src\common\statbar.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monodll_statbmpcmn.obj : .AUTODEPEND ..\..\src\common\statbmpcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\monodll_statboxcmn.obj : .AUTODEPEND ..\..\src\common\statboxcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\monodll_statlinecmn.obj : .AUTODEPEND ..\..\src\common\statlinecmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monodll_stattextcmn.obj : .AUTODEPEND ..\..\src\common\stattextcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -8232,11 +8432,6 @@ $(OBJS)\monodll_bmpcboxcmn.obj : .AUTODEPEND ..\..\src\common\bmpcboxcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 -$(OBJS)\monodll_calctrlcmn.obj : .AUTODEPEND ..\..\src\common\calctrlcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - !ifeq USE_GUI 1 $(OBJS)\monodll_datavcmn.obj : .AUTODEPEND ..\..\src\common\datavcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -9794,6 +9989,11 @@ $(OBJS)\monolib_bmpbase.obj : .AUTODEPEND ..\..\src\common\bmpbase.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monolib_bmpbtncmn.obj : .AUTODEPEND ..\..\src\common\bmpbtncmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monolib_bookctrl.obj : .AUTODEPEND ..\..\src\common\bookctrl.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -9809,6 +10009,26 @@ $(OBJS)\monolib_cairo.obj : .AUTODEPEND ..\..\src\common\cairo.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monolib_calctrlcmn.obj : .AUTODEPEND ..\..\src\common\calctrlcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\monolib_calctrlcmn.obj : .AUTODEPEND ..\..\src\common\calctrlcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\monolib_checkboxcmn.obj : .AUTODEPEND ..\..\src\common\checkboxcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\monolib_checklstcmn.obj : .AUTODEPEND ..\..\src\common\checklstcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monolib_choiccmn.obj : .AUTODEPEND ..\..\src\common\choiccmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -9889,6 +10109,11 @@ $(OBJS)\monolib_dcsvg.obj : .AUTODEPEND ..\..\src\common\dcsvg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monolib_dirctrlcmn.obj : .AUTODEPEND ..\..\src\common\dirctrlcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monolib_dlgcmn.obj : .AUTODEPEND ..\..\src\common\dlgcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -10019,6 +10244,11 @@ $(OBJS)\monolib_graphcmn.obj : .AUTODEPEND ..\..\src\common\graphcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monolib_gridcmn.obj : .AUTODEPEND ..\..\src\common\gridcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monolib_headercolcmn.obj : .AUTODEPEND ..\..\src\common\headercolcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -10139,6 +10369,11 @@ $(OBJS)\monolib_nbkbase.obj : .AUTODEPEND ..\..\src\common\nbkbase.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monolib_odcombocmn.obj : .AUTODEPEND ..\..\src\common\odcombocmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monolib_overlaycmn.obj : .AUTODEPEND ..\..\src\common\overlaycmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -10154,6 +10389,11 @@ $(OBJS)\monolib_paper.obj : .AUTODEPEND ..\..\src\common\paper.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monolib_panelcmn.obj : .AUTODEPEND ..\..\src\common\panelcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monolib_persist.obj : .AUTODEPEND ..\..\src\common\persist.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -10179,6 +10419,11 @@ $(OBJS)\monolib_quantize.obj : .AUTODEPEND ..\..\src\common\quantize.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monolib_radiobtncmn.obj : .AUTODEPEND ..\..\src\common\radiobtncmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monolib_radiocmn.obj : .AUTODEPEND ..\..\src\common\radiocmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -10199,6 +10444,11 @@ $(OBJS)\monolib_rgncmn.obj : .AUTODEPEND ..\..\src\common\rgncmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monolib_scrolbarcmn.obj : .AUTODEPEND ..\..\src\common\scrolbarcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monolib_settcmn.obj : .AUTODEPEND ..\..\src\common\settcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -10209,6 +10459,16 @@ $(OBJS)\monolib_sizer.obj : .AUTODEPEND ..\..\src\common\sizer.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monolib_slidercmn.obj : .AUTODEPEND ..\..\src\common\slidercmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\monolib_spinbtncmn.obj : .AUTODEPEND ..\..\src\common\spinbtncmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monolib_spinctrlcmn.obj : .AUTODEPEND ..\..\src\common\spinctrlcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -10224,6 +10484,21 @@ $(OBJS)\monolib_statbar.obj : .AUTODEPEND ..\..\src\common\statbar.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monolib_statbmpcmn.obj : .AUTODEPEND ..\..\src\common\statbmpcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\monolib_statboxcmn.obj : .AUTODEPEND ..\..\src\common\statboxcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\monolib_statlinecmn.obj : .AUTODEPEND ..\..\src\common\statlinecmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monolib_stattextcmn.obj : .AUTODEPEND ..\..\src\common\stattextcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -10479,11 +10754,6 @@ $(OBJS)\monolib_bmpcboxcmn.obj : .AUTODEPEND ..\..\src\common\bmpcboxcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 -$(OBJS)\monolib_calctrlcmn.obj : .AUTODEPEND ..\..\src\common\calctrlcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - !ifeq USE_GUI 1 $(OBJS)\monolib_datavcmn.obj : .AUTODEPEND ..\..\src\common\datavcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -12032,6 +12302,11 @@ $(OBJS)\coredll_bmpbase.obj : .AUTODEPEND ..\..\src\common\bmpbase.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\coredll_bmpbtncmn.obj : .AUTODEPEND ..\..\src\common\bmpbtncmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\coredll_bookctrl.obj : .AUTODEPEND ..\..\src\common\bookctrl.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -12047,6 +12322,21 @@ $(OBJS)\coredll_cairo.obj : .AUTODEPEND ..\..\src\common\cairo.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\coredll_calctrlcmn.obj : .AUTODEPEND ..\..\src\common\calctrlcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\coredll_checkboxcmn.obj : .AUTODEPEND ..\..\src\common\checkboxcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\coredll_checklstcmn.obj : .AUTODEPEND ..\..\src\common\checklstcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\coredll_choiccmn.obj : .AUTODEPEND ..\..\src\common\choiccmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -12127,6 +12417,11 @@ $(OBJS)\coredll_dcsvg.obj : .AUTODEPEND ..\..\src\common\dcsvg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\coredll_dirctrlcmn.obj : .AUTODEPEND ..\..\src\common\dirctrlcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\coredll_dlgcmn.obj : .AUTODEPEND ..\..\src\common\dlgcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -12257,6 +12552,11 @@ $(OBJS)\coredll_graphcmn.obj : .AUTODEPEND ..\..\src\common\graphcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\coredll_gridcmn.obj : .AUTODEPEND ..\..\src\common\gridcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\coredll_headercolcmn.obj : .AUTODEPEND ..\..\src\common\headercolcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -12377,6 +12677,11 @@ $(OBJS)\coredll_nbkbase.obj : .AUTODEPEND ..\..\src\common\nbkbase.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\coredll_odcombocmn.obj : .AUTODEPEND ..\..\src\common\odcombocmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\coredll_overlaycmn.obj : .AUTODEPEND ..\..\src\common\overlaycmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -12392,6 +12697,11 @@ $(OBJS)\coredll_paper.obj : .AUTODEPEND ..\..\src\common\paper.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\coredll_panelcmn.obj : .AUTODEPEND ..\..\src\common\panelcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\coredll_persist.obj : .AUTODEPEND ..\..\src\common\persist.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -12417,6 +12727,11 @@ $(OBJS)\coredll_quantize.obj : .AUTODEPEND ..\..\src\common\quantize.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\coredll_radiobtncmn.obj : .AUTODEPEND ..\..\src\common\radiobtncmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\coredll_radiocmn.obj : .AUTODEPEND ..\..\src\common\radiocmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -12437,6 +12752,11 @@ $(OBJS)\coredll_rgncmn.obj : .AUTODEPEND ..\..\src\common\rgncmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\coredll_scrolbarcmn.obj : .AUTODEPEND ..\..\src\common\scrolbarcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\coredll_settcmn.obj : .AUTODEPEND ..\..\src\common\settcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -12447,6 +12767,16 @@ $(OBJS)\coredll_sizer.obj : .AUTODEPEND ..\..\src\common\sizer.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\coredll_slidercmn.obj : .AUTODEPEND ..\..\src\common\slidercmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\coredll_spinbtncmn.obj : .AUTODEPEND ..\..\src\common\spinbtncmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\coredll_spinctrlcmn.obj : .AUTODEPEND ..\..\src\common\spinctrlcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -12462,6 +12792,21 @@ $(OBJS)\coredll_statbar.obj : .AUTODEPEND ..\..\src\common\statbar.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\coredll_statbmpcmn.obj : .AUTODEPEND ..\..\src\common\statbmpcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\coredll_statboxcmn.obj : .AUTODEPEND ..\..\src\common\statboxcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\coredll_statlinecmn.obj : .AUTODEPEND ..\..\src\common\statlinecmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\coredll_stattextcmn.obj : .AUTODEPEND ..\..\src\common\stattextcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -13347,6 +13692,11 @@ $(OBJS)\corelib_bmpbase.obj : .AUTODEPEND ..\..\src\common\bmpbase.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\corelib_bmpbtncmn.obj : .AUTODEPEND ..\..\src\common\bmpbtncmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\corelib_bookctrl.obj : .AUTODEPEND ..\..\src\common\bookctrl.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -13362,6 +13712,21 @@ $(OBJS)\corelib_cairo.obj : .AUTODEPEND ..\..\src\common\cairo.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\corelib_calctrlcmn.obj : .AUTODEPEND ..\..\src\common\calctrlcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\corelib_checkboxcmn.obj : .AUTODEPEND ..\..\src\common\checkboxcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\corelib_checklstcmn.obj : .AUTODEPEND ..\..\src\common\checklstcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\corelib_choiccmn.obj : .AUTODEPEND ..\..\src\common\choiccmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -13442,6 +13807,11 @@ $(OBJS)\corelib_dcsvg.obj : .AUTODEPEND ..\..\src\common\dcsvg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\corelib_dirctrlcmn.obj : .AUTODEPEND ..\..\src\common\dirctrlcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\corelib_dlgcmn.obj : .AUTODEPEND ..\..\src\common\dlgcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -13572,6 +13942,11 @@ $(OBJS)\corelib_graphcmn.obj : .AUTODEPEND ..\..\src\common\graphcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\corelib_gridcmn.obj : .AUTODEPEND ..\..\src\common\gridcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\corelib_headercolcmn.obj : .AUTODEPEND ..\..\src\common\headercolcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -13692,6 +14067,11 @@ $(OBJS)\corelib_nbkbase.obj : .AUTODEPEND ..\..\src\common\nbkbase.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\corelib_odcombocmn.obj : .AUTODEPEND ..\..\src\common\odcombocmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\corelib_overlaycmn.obj : .AUTODEPEND ..\..\src\common\overlaycmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -13707,6 +14087,11 @@ $(OBJS)\corelib_paper.obj : .AUTODEPEND ..\..\src\common\paper.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\corelib_panelcmn.obj : .AUTODEPEND ..\..\src\common\panelcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\corelib_persist.obj : .AUTODEPEND ..\..\src\common\persist.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -13732,6 +14117,11 @@ $(OBJS)\corelib_quantize.obj : .AUTODEPEND ..\..\src\common\quantize.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\corelib_radiobtncmn.obj : .AUTODEPEND ..\..\src\common\radiobtncmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\corelib_radiocmn.obj : .AUTODEPEND ..\..\src\common\radiocmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -13752,6 +14142,11 @@ $(OBJS)\corelib_rgncmn.obj : .AUTODEPEND ..\..\src\common\rgncmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\corelib_scrolbarcmn.obj : .AUTODEPEND ..\..\src\common\scrolbarcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\corelib_settcmn.obj : .AUTODEPEND ..\..\src\common\settcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -13762,6 +14157,16 @@ $(OBJS)\corelib_sizer.obj : .AUTODEPEND ..\..\src\common\sizer.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\corelib_slidercmn.obj : .AUTODEPEND ..\..\src\common\slidercmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\corelib_spinbtncmn.obj : .AUTODEPEND ..\..\src\common\spinbtncmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\corelib_spinctrlcmn.obj : .AUTODEPEND ..\..\src\common\spinctrlcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -13777,6 +14182,21 @@ $(OBJS)\corelib_statbar.obj : .AUTODEPEND ..\..\src\common\statbar.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\corelib_statbmpcmn.obj : .AUTODEPEND ..\..\src\common\statbmpcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\corelib_statboxcmn.obj : .AUTODEPEND ..\..\src\common\statboxcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\corelib_statlinecmn.obj : .AUTODEPEND ..\..\src\common\statlinecmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\corelib_stattextcmn.obj : .AUTODEPEND ..\..\src\common\stattextcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< diff --git a/build/msw/wx_base.dsp b/build/msw/wx_base.dsp index a8b526d996..0729616750 100644 --- a/build/msw/wx_base.dsp +++ b/build/msw/wx_base.dsp @@ -1455,6 +1455,10 @@ SOURCE=..\..\include\wx\regex.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\rtti.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\scopedarray.h # End Source File # Begin Source File @@ -1655,10 +1659,26 @@ SOURCE=..\..\include\wx\xti.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\xtictor.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\xtihandler.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\xtiprop.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\xtistrm.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\xtitypes.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\zipstrm.h # End Source File # Begin Source File diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp index c6ae284ca6..c4b6d2e12e 100644 --- a/build/msw/wx_core.dsp +++ b/build/msw/wx_core.dsp @@ -276,6 +276,10 @@ SOURCE=..\..\src\common\bmpbase.cpp # End Source File # Begin Source File +SOURCE=..\..\src\common\bmpbtncmn.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\common\bookctrl.cpp # End Source File # Begin Source File @@ -288,6 +292,18 @@ SOURCE=..\..\src\common\cairo.cpp # End Source File # Begin Source File +SOURCE=..\..\src\common\calctrlcmn.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\common\checkboxcmn.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\common\checklstcmn.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\common\choiccmn.cpp # End Source File # Begin Source File @@ -352,6 +368,10 @@ SOURCE=..\..\src\common\dcsvg.cpp # End Source File # Begin Source File +SOURCE=..\..\src\common\dirctrlcmn.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\common\dlgcmn.cpp # End Source File # Begin Source File @@ -466,6 +486,10 @@ SOURCE=..\..\src\common\graphcmn.cpp # End Source File # Begin Source File +SOURCE=..\..\src\common\gridcmn.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\common\headercolcmn.cpp # End Source File # Begin Source File @@ -566,6 +590,10 @@ SOURCE=..\..\src\common\nbkbase.cpp # End Source File # Begin Source File +SOURCE=..\..\src\common\odcombocmn.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\common\overlaycmn.cpp # End Source File # Begin Source File @@ -574,6 +602,10 @@ SOURCE=..\..\src\common\ownerdrwcmn.cpp # End Source File # Begin Source File +SOURCE=..\..\src\common\panelcmn.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\common\paper.cpp # End Source File # Begin Source File @@ -598,6 +630,10 @@ SOURCE=..\..\src\common\quantize.cpp # End Source File # Begin Source File +SOURCE=..\..\src\common\radiobtncmn.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\common\radiocmn.cpp # End Source File # Begin Source File @@ -614,6 +650,10 @@ SOURCE=..\..\src\common\rgncmn.cpp # End Source File # Begin Source File +SOURCE=..\..\src\common\scrolbarcmn.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\common\settcmn.cpp # End Source File # Begin Source File @@ -622,6 +662,14 @@ SOURCE=..\..\src\common\sizer.cpp # End Source File # Begin Source File +SOURCE=..\..\src\common\slidercmn.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\common\spinbtncmn.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\common\spinctrlcmn.cpp # End Source File # Begin Source File @@ -634,6 +682,18 @@ SOURCE=..\..\src\common\statbar.cpp # End Source File # Begin Source File +SOURCE=..\..\src\common\statbmpcmn.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\common\statboxcmn.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\common\statlinecmn.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\common\stattextcmn.cpp # End Source File # Begin Source File diff --git a/build/msw/wx_vc7_base.vcproj b/build/msw/wx_vc7_base.vcproj index 5a0cb518e0..dc7b035939 100644 --- a/build/msw/wx_vc7_base.vcproj +++ b/build/msw/wx_vc7_base.vcproj @@ -1523,6 +1523,9 @@ + + @@ -1673,9 +1676,21 @@ + + + + + + + + diff --git a/build/msw/wx_vc7_core.vcproj b/build/msw/wx_vc7_core.vcproj index 1e7264a86c..a137071767 100644 --- a/build/msw/wx_vc7_core.vcproj +++ b/build/msw/wx_vc7_core.vcproj @@ -552,6 +552,9 @@ + + @@ -561,6 +564,15 @@ + + + + + + @@ -609,6 +621,9 @@ + + @@ -741,6 +756,9 @@ + + @@ -816,12 +834,18 @@ + + + + @@ -840,6 +864,9 @@ + + @@ -852,12 +879,21 @@ + + + + + + @@ -867,6 +903,15 @@ + + + + + + diff --git a/build/msw/wx_vc8_base.vcproj b/build/msw/wx_vc8_base.vcproj index bc510ea6ec..0c8af84704 100644 --- a/build/msw/wx_vc8_base.vcproj +++ b/build/msw/wx_vc8_base.vcproj @@ -2049,6 +2049,10 @@ RelativePath="..\..\include\wx\regex.h" > + + @@ -2249,10 +2253,26 @@ RelativePath="..\..\include\wx\xti.h" > + + + + + + + + diff --git a/build/msw/wx_vc8_core.vcproj b/build/msw/wx_vc8_core.vcproj index d0215bf848..1c1586ee31 100644 --- a/build/msw/wx_vc8_core.vcproj +++ b/build/msw/wx_vc8_core.vcproj @@ -770,6 +770,10 @@ RelativePath="..\..\src\common\bmpbase.cpp" > + + @@ -782,6 +786,18 @@ RelativePath="..\..\src\common\cairo.cpp" > + + + + + + @@ -846,6 +862,10 @@ RelativePath="..\..\src\common\dcsvg.cpp" > + + @@ -1022,6 +1042,10 @@ RelativePath="..\..\src\common\graphcmn.cpp" > + + @@ -1122,6 +1146,10 @@ RelativePath="..\..\src\common\nbkbase.cpp" > + + @@ -1130,6 +1158,10 @@ RelativePath="..\..\src\common\ownerdrwcmn.cpp" > + + @@ -1154,6 +1186,10 @@ RelativePath="..\..\src\common\quantize.cpp" > + + @@ -1170,6 +1206,10 @@ RelativePath="..\..\src\common\rgncmn.cpp" > + + @@ -1178,6 +1218,14 @@ RelativePath="..\..\src\common\sizer.cpp" > + + + + @@ -1190,6 +1238,18 @@ RelativePath="..\..\src\common\statbar.cpp" > + + + + + + diff --git a/build/msw/wx_vc9_base.vcproj b/build/msw/wx_vc9_base.vcproj index ebbe7e7669..6529869148 100644 --- a/build/msw/wx_vc9_base.vcproj +++ b/build/msw/wx_vc9_base.vcproj @@ -2045,6 +2045,10 @@ RelativePath="..\..\include\wx\regex.h" > + + @@ -2245,10 +2249,26 @@ RelativePath="..\..\include\wx\xti.h" > + + + + + + + + diff --git a/build/msw/wx_vc9_core.vcproj b/build/msw/wx_vc9_core.vcproj index ed98e2162d..cab5f59b3d 100644 --- a/build/msw/wx_vc9_core.vcproj +++ b/build/msw/wx_vc9_core.vcproj @@ -766,6 +766,10 @@ RelativePath="..\..\src\common\bmpbase.cpp" > + + @@ -778,6 +782,18 @@ RelativePath="..\..\src\common\cairo.cpp" > + + + + + + @@ -842,6 +858,10 @@ RelativePath="..\..\src\common\dcsvg.cpp" > + + @@ -1018,6 +1038,10 @@ RelativePath="..\..\src\common\graphcmn.cpp" > + + @@ -1118,6 +1142,10 @@ RelativePath="..\..\src\common\nbkbase.cpp" > + + @@ -1126,6 +1154,10 @@ RelativePath="..\..\src\common\ownerdrwcmn.cpp" > + + @@ -1150,6 +1182,10 @@ RelativePath="..\..\src\common\quantize.cpp" > + + @@ -1166,6 +1202,10 @@ RelativePath="..\..\src\common\rgncmn.cpp" > + + @@ -1174,6 +1214,14 @@ RelativePath="..\..\src\common\sizer.cpp" > + + + + @@ -1186,6 +1234,18 @@ RelativePath="..\..\src\common\statbar.cpp" > + + + + + + diff --git a/include/wx/defs.h b/include/wx/defs.h index cd23f91020..1e31dee1ba 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -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() +# 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 +# define wxTO_STRING_IMP(type) +# define wxFROM_STRING(type) wxFromStringConverter +# 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(data, result); } + +# define wxFROM_STRING(type) FromString##type +# define wxFROM_STRING_IMP(type) \ + inline void FromString##type( const wxString& data, wxVariantBase &result ) \ + { wxFromStringConverter(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 */ /* ---------------------------------------------------------------------------- */ diff --git a/include/wx/flags.h b/include/wx/flags.h index def2feb0d8..0b2ffe8dc8 100644 --- a/include/wx/flags.h +++ b/include/wx/flags.h @@ -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 diff --git a/include/wx/menu.h b/include/wx/menu.h index accb6f1d7e..50bdda2796 100644 --- a/include/wx/menu.h +++ b/include/wx/menu.h @@ -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; diff --git a/include/wx/notebook.h b/include/wx/notebook.h index 7810274385..2311156392 100644 --- a/include/wx/notebook.h +++ b/include/wx/notebook.h @@ -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); }; diff --git a/include/wx/object.h b/include/wx/object.h index 5c14734fdd..26bfc5b1e4 100644 --- a/include/wx/object.h +++ b/include/wx/object.h @@ -19,226 +19,12 @@ #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 diff --git a/include/wx/xti.h b/include/wx/xti.h index 45e474fa7c..75da3785c8 100644 --- a/include/wx/xti.h +++ b/include/wx/xti.h @@ -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 @@ -20,11 +20,11 @@ // 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 @@ -33,1593 +33,55 @@ // ---------------------------------------------------------------------------- #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 - -// 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() -# 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 -# define wxTO_STRING_IMP(type) -# define wxFROM_STRING(type) wxFromStringConverter -# 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(data, result); } -# define wxFROM_STRING(type) FromString##type -# define wxFROM_STRING_IMP(type) inline void FromString##type( const wxString& data , wxxVariant &result ) { wxFromStringConverter(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 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 -void wxSetFromString(const wxString &s , wxBitset &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 -void wxSetToString( wxString &s , const wxBitset &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 &data ) \ -{ \ - wxSetFromString( s , data ) ; \ -} \ - template<> void wxStringWriteValue( wxString &s , const wxBitset &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 -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 -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( s , data ) ; \ -} \ - template<> void wxStringWriteValue( wxString &s , const e& data ) \ -{ \ - wxFlagsToString( 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 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 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( 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 wxxVariant( const T& data , const wxString& name = wxEmptyString ) : - m_data(new wxxVariantDataT(data) ), m_name(name) {} - - ~wxxVariant() { delete m_data ; } - - // get a ref to the stored data - template T& Get(wxTEMPLATED_MEMBER_FIX(T)) - { - wxxVariantDataT *dataptr = dynamic_cast*> (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 const T& Get(wxTEMPLATED_MEMBER_FIX(T)) const - { - const wxxVariantDataT *dataptr = dynamic_cast*> (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 bool HasData(wxTEMPLATED_MEMBER_FIX(T)) const - { - const wxxVariantDataT *dataptr = dynamic_cast*> (m_data) ; - return dataptr != NULL ; - } - - // stores the data - template void Set(const T& data) const - { - delete m_data ; - m_data = new wxxVariantDataT(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 -void wxStringReadValue( const wxString &s , T &data ); - -template -void wxStringWriteValue( wxString &s , const T &data); - -template -void wxToStringConverter( const wxxVariant &v, wxString &s wxTEMPLATED_FUNCTION_FIX(T)) { wxStringWriteValue( s , v.wxTEMPLATED_MEMBER_CALL(Get , T) ) ; } - -template -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 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(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(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(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(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 -struct wxConstructorBridge_0 : public wxConstructorBridge -{ - void Create(wxObject * &o, wxxVariant *) - { - Class *obj = dynamic_cast(o); - obj->Create(); - } -}; - -struct wxConstructorBridge_Dummy : public wxConstructorBridge -{ - void Create(wxObject *&, wxxVariant *) - { - } -} ; - -#define wxCONSTRUCTOR_0(klass) \ - wxConstructorBridge_0 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 -struct wxConstructorBridge_1 : public wxConstructorBridge -{ - void Create(wxObject * &o, wxxVariant *args) - { - Class *obj = dynamic_cast(o); - obj->Create( - args[0].wxTEMPLATED_MEMBER_CALL(Get , T0) - ); - } -}; - -#define wxCONSTRUCTOR_1(klass,t0,v0) \ - wxConstructorBridge_1 constructor##klass ; \ - wxConstructorBridge* klass::ms_constructor = &constructor##klass ; \ - const wxChar *klass::ms_constructorProperties[] = { wxT(#v0) } ; \ - const int klass::ms_constructorPropertiesCount = 1 ; - -// 2 params - -template -struct wxConstructorBridge_2 : public wxConstructorBridge -{ - void Create(wxObject * &o, wxxVariant *args) - { - Class *obj = dynamic_cast(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 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 -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 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 -struct wxConstructorBridge_3 : public wxConstructorBridge -{ - void Create(wxObject * &o, wxxVariant *args) - { - Class *obj = dynamic_cast(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 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 -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 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 -struct wxConstructorBridge_4 : public wxConstructorBridge -{ - void Create(wxObject * &o, wxxVariant *args) - { - Class *obj = dynamic_cast(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 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 -struct wxConstructorBridge_5 : public wxConstructorBridge -{ - void Create(wxObject * &o, wxxVariant *args) - { - Class *obj = dynamic_cast(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 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 -struct wxConstructorBridge_6 : public wxConstructorBridge -{ - void Create(wxObject * &o, wxxVariant *args) - { - Class *obj = dynamic_cast(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 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 -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 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 -struct wxConstructorBridge_7 : public wxConstructorBridge -{ - void Create(wxObject * &o, wxxVariant *args) - { - Class *obj = dynamic_cast(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 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 -struct wxConstructorBridge_8 : public wxConstructorBridge -{ - void Create(wxObject * &o, wxxVariant *args) - { - Class *obj = dynamic_cast(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 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( 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 (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 (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 (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 (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 void wxListCollectionToVariantArray( const collection_t& coll , wxxVariantArray &value ) +template 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 void wxArrayCollectionToVariantArray( const collection_t& coll , wxxVariantArray &value ) +template 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__ diff --git a/include/wx/xtistrm.h b/include/wx/xtistrm.h index 0f62e428c7..acfce43942 100644 --- a/include/wx/xtistrm.h +++ b/include/wx/xtistrm.h @@ -12,12 +12,15 @@ #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 ¶m ) ; -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 diff --git a/include/wx/xtixml.h b/include/wx/xtixml.h index ce64af46cc..f11b4ec0be 100644 --- a/include/wx/xtixml.h +++ b/include/wx/xtixml.h @@ -12,20 +12,27 @@ #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 diff --git a/src/cocoa/bmpbuttn.mm b/src/cocoa/bmpbuttn.mm index 4c12d488ca..e3ebb7fd02 100644 --- a/src/cocoa/bmpbuttn.mm +++ b/src/cocoa/bmpbuttn.mm @@ -24,7 +24,6 @@ #import #import -IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxControl) BEGIN_EVENT_TABLE(wxBitmapButton, wxBitmapButtonBase) END_EVENT_TABLE() WX_IMPLEMENT_COCOA_OWNER(wxBitmapButton,NSButton,NSControl,NSView) diff --git a/src/cocoa/checkbox.mm b/src/cocoa/checkbox.mm index eba72f400c..373a1c4b33 100644 --- a/src/cocoa/checkbox.mm +++ b/src/cocoa/checkbox.mm @@ -26,7 +26,6 @@ #import #import -IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl) BEGIN_EVENT_TABLE(wxCheckBox, wxCheckBoxBase) END_EVENT_TABLE() WX_IMPLEMENT_COCOA_OWNER(wxCheckBox,NSButton,NSControl,NSView) diff --git a/src/cocoa/choice.mm b/src/cocoa/choice.mm index 30c9dab74a..0bec755e00 100644 --- a/src/cocoa/choice.mm +++ b/src/cocoa/choice.mm @@ -29,7 +29,6 @@ #import #import -IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControlWithItems) BEGIN_EVENT_TABLE(wxChoice, wxChoiceBase) END_EVENT_TABLE() // WX_IMPLEMENT_COCOA_OWNER(wxChoice,NSButton,NSControl,NSView) diff --git a/src/cocoa/colour.mm b/src/cocoa/colour.mm index d1dbbbe36c..df7e25e0d0 100644 --- a/src/cocoa/colour.mm +++ b/src/cocoa/colour.mm @@ -22,8 +22,6 @@ #import -IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject) - void wxColour::Init() { m_cocoaNSColor = NULL; diff --git a/src/cocoa/combobox.mm b/src/cocoa/combobox.mm index b34e2c8cae..14c8d35532 100644 --- a/src/cocoa/combobox.mm +++ b/src/cocoa/combobox.mm @@ -168,7 +168,6 @@ WX_IMPLEMENT_GET_OBJC_CLASS(wxPoserNSComboBox,NSComboBox) #import -IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl) BEGIN_EVENT_TABLE(wxComboBox, wxControl) END_EVENT_TABLE() WX_IMPLEMENT_COCOA_OWNER(wxComboBox,NSComboBox,NSTextField,NSView) diff --git a/src/cocoa/frame.mm b/src/cocoa/frame.mm index 3e791fa801..78b82d4f8c 100644 --- a/src/cocoa/frame.mm +++ b/src/cocoa/frame.mm @@ -34,8 +34,6 @@ BEGIN_EVENT_TABLE(wxFrame, wxFrameBase) END_EVENT_TABLE() -IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow) - void wxFrame::Init() { m_frameNSView = nil; diff --git a/src/cocoa/gauge.mm b/src/cocoa/gauge.mm index 0f1c122ac4..c2a48305f7 100644 --- a/src/cocoa/gauge.mm +++ b/src/cocoa/gauge.mm @@ -27,8 +27,6 @@ #include -IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl) - BEGIN_EVENT_TABLE(wxGauge, wxGaugeBase) END_EVENT_TABLE() // WX_IMPLEMENT_COCOA_OWNER(wxGauge,NSProgressIndicator,NSView,NSView) diff --git a/src/cocoa/listbox.mm b/src/cocoa/listbox.mm index 1b95e7912f..5f287ac195 100644 --- a/src/cocoa/listbox.mm +++ b/src/cocoa/listbox.mm @@ -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) diff --git a/src/cocoa/radiobut.mm b/src/cocoa/radiobut.mm index 09fd5804d0..3a5d0553b0 100644 --- a/src/cocoa/radiobut.mm +++ b/src/cocoa/radiobut.mm @@ -28,7 +28,6 @@ WX_DEFINE_LIST(wxRadioButtonList); -IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl) // wxRadioButtonBase == wxControl BEGIN_EVENT_TABLE(wxRadioButton, wxControl) END_EVENT_TABLE() diff --git a/src/cocoa/scrolbar.mm b/src/cocoa/scrolbar.mm index 1ce04db251..4ce46ec462 100644 --- a/src/cocoa/scrolbar.mm +++ b/src/cocoa/scrolbar.mm @@ -21,7 +21,6 @@ #import -IMPLEMENT_DYNAMIC_CLASS(wxScrollBar, wxControl) BEGIN_EVENT_TABLE(wxScrollBar, wxScrollBarBase) END_EVENT_TABLE() WX_IMPLEMENT_COCOA_OWNER(wxScrollBar,NSScroller,NSControl,NSView) diff --git a/src/cocoa/slider.mm b/src/cocoa/slider.mm index b469a2a67f..9610fc44bb 100644 --- a/src/cocoa/slider.mm +++ b/src/cocoa/slider.mm @@ -26,8 +26,7 @@ #import #import -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) diff --git a/src/cocoa/spinbutt.mm b/src/cocoa/spinbutt.mm index 2e3f8e9c4a..1be9d4f1ba 100644 --- a/src/cocoa/spinbutt.mm +++ b/src/cocoa/spinbutt.mm @@ -19,9 +19,6 @@ #import -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) diff --git a/src/cocoa/statbmp.mm b/src/cocoa/statbmp.mm index 653b81eafc..538c999181 100644 --- a/src/cocoa/statbmp.mm +++ b/src/cocoa/statbmp.mm @@ -21,8 +21,6 @@ #import -IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl) - BEGIN_EVENT_TABLE(wxStaticBitmap, wxControl) END_EVENT_TABLE() // WX_IMPLEMENT_COCOA_OWNER(wxStaticBitmap,NSTextField,NSControl,NSView) diff --git a/src/cocoa/statbox.mm b/src/cocoa/statbox.mm index 51458f094e..ac443b5aa0 100644 --- a/src/cocoa/statbox.mm +++ b/src/cocoa/statbox.mm @@ -23,7 +23,6 @@ #import #import -IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl) BEGIN_EVENT_TABLE(wxStaticBox, wxStaticBoxBase) END_EVENT_TABLE() WX_IMPLEMENT_COCOA_OWNER(wxStaticBox,NSBox,NSView,NSView) diff --git a/src/cocoa/statline2.mm b/src/cocoa/statline2.mm index b77cc99f5b..3caac1b864 100644 --- a/src/cocoa/statline2.mm +++ b/src/cocoa/statline2.mm @@ -19,7 +19,6 @@ #import -IMPLEMENT_DYNAMIC_CLASS(wxStaticLine, wxControl) BEGIN_EVENT_TABLE(wxStaticLine, wxStaticLineBase) END_EVENT_TABLE() // WX_IMPLEMENT_COCOA_OWNER(wxStaticLine,NSTextField,NSControl,NSView) diff --git a/src/cocoa/stattext.mm b/src/cocoa/stattext.mm index 35baa0afdc..ba9028a6f3 100644 --- a/src/cocoa/stattext.mm +++ b/src/cocoa/stattext.mm @@ -26,7 +26,6 @@ #import #include -IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl) BEGIN_EVENT_TABLE(wxStaticText, wxControl) END_EVENT_TABLE() WX_IMPLEMENT_COCOA_OWNER(wxStaticText,NSTextField,NSControl,NSView) diff --git a/src/cocoa/textctrl.mm b/src/cocoa/textctrl.mm index 3b1b5c1061..d60d410123 100644 --- a/src/cocoa/textctrl.mm +++ b/src/cocoa/textctrl.mm @@ -29,7 +29,6 @@ #include -IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxTextCtrlBase) BEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase) END_EVENT_TABLE() WX_IMPLEMENT_COCOA_OWNER(wxTextCtrl,NSTextField,NSControl,NSView) diff --git a/src/cocoa/window.mm b/src/cocoa/window.mm index 6e41a2ce5d..c7e8c56b08 100644 --- a/src/cocoa/window.mm +++ b/src/cocoa/window.mm @@ -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) diff --git a/src/common/btncmn.cpp b/src/common/btncmn.cpp index c0a943189b..fc96b64509 100644 --- a/src/common/btncmn.cpp +++ b/src/common/btncmn.cpp @@ -30,6 +30,68 @@ #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 // ============================================================================ diff --git a/src/common/calctrlcmn.cpp b/src/common/calctrlcmn.cpp index 9f1fd917c5..2f68eae14c 100644 --- a/src/common/calctrlcmn.cpp +++ b/src/common/calctrlcmn.cpp @@ -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 // ---------------------------------------------------------------------------- diff --git a/src/common/choiccmn.cpp b/src/common/choiccmn.cpp index 64f8a92347..5dd372a318 100644 --- a/src/common/choiccmn.cpp +++ b/src/common/choiccmn.cpp @@ -33,6 +33,67 @@ 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 // ============================================================================ diff --git a/src/common/colourcmn.cpp b/src/common/colourcmn.cpp index 654f712564..182d654f24 100644 --- a/src/common/colourcmn.cpp +++ b/src/common/colourcmn.cpp @@ -30,6 +30,59 @@ IMPLEMENT_VARIANT_OBJECT_EXPORTED(wxColour,WXDLLEXPORT) #endif + +// ---------------------------------------------------------------------------- +// XTI +// ---------------------------------------------------------------------------- + +#if wxUSE_EXTENDED_RTTI + +#include + +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 // ============================================================================ diff --git a/src/common/combocmn.cpp b/src/common/combocmn.cpp index 0b3a518a1b..3d0e5c5c48 100644 --- a/src/common/combocmn.cpp +++ b/src/common/combocmn.cpp @@ -41,6 +41,71 @@ #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 // ---------------------------------------------------------------------------- diff --git a/src/common/dlgcmn.cpp b/src/common/dlgcmn.cpp index 69e0180b86..6ac7f13029 100644 --- a/src/common/dlgcmn.cpp +++ b/src/common/dlgcmn.cpp @@ -48,6 +48,67 @@ #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 // ---------------------------------------------------------------------------- diff --git a/src/common/fontcmn.cpp b/src/common/fontcmn.cpp index 27154e9953..c6f2c50c6a 100644 --- a/src/common/fontcmn.cpp +++ b/src/common/fontcmn.cpp @@ -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 // ============================================================================ diff --git a/src/common/fontmap.cpp b/src/common/fontmap.cpp index c1c8cb1e80..4f969fa5d4 100644 --- a/src/common/fontmap.cpp +++ b/src/common/fontmap.cpp @@ -52,61 +52,62 @@ #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 diff --git a/src/common/framecmn.cpp b/src/common/framecmn.cpp index e888407f92..8f3d81c6e4 100644 --- a/src/common/framecmn.cpp +++ b/src/common/framecmn.cpp @@ -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 // ---------------------------------------------------------------------------- diff --git a/src/common/gaugecmn.cpp b/src/common/gaugecmn.cpp index b8711937e4..52b5e49c13 100644 --- a/src/common/gaugecmn.cpp +++ b/src/common/gaugecmn.cpp @@ -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 // ---------------------------------------------------------------------------- diff --git a/src/common/lboxcmn.cpp b/src/common/lboxcmn.cpp index 5d7abb469f..7e8b2be8e4 100644 --- a/src/common/lboxcmn.cpp +++ b/src/common/lboxcmn.cpp @@ -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 // ---------------------------------------------------------------------------- diff --git a/src/common/listctrlcmn.cpp b/src/common/listctrlcmn.cpp index 2fc20b7871..e2b18e9602 100644 --- a/src/common/listctrlcmn.cpp +++ b/src/common/listctrlcmn.cpp @@ -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 diff --git a/src/common/menucmn.cpp b/src/common/menucmn.cpp index 4c7abae78d..c556c59c2d 100644 --- a/src/common/menucmn.cpp +++ b/src/common/menucmn.cpp @@ -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( 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( 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 // ---------------------------------------------------------------------------- diff --git a/src/common/nbkbase.cpp b/src/common/nbkbase.cpp index e12ba34a90..6842afdb5b 100644 --- a/src/common/nbkbase.cpp +++ b/src/common/nbkbase.cpp @@ -38,6 +38,123 @@ 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( 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(this)->GetPage(i), GetPageText(i), + GetSelection() == int(i), GetPageImage(i) ); + list->Append( info ); + } + return m_pageInfos; +} + +#endif + // ---------------------------------------------------------------------------- // geometry // ---------------------------------------------------------------------------- diff --git a/src/common/radiocmn.cpp b/src/common/radiocmn.cpp index 9993161620..b9f2653b03 100644 --- a/src/common/radiocmn.cpp +++ b/src/common/radiocmn.cpp @@ -42,6 +42,71 @@ // 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") ); diff --git a/src/common/spinctrlcmn.cpp b/src/common/spinctrlcmn.cpp index 404f28a241..9129329b8d 100644 --- a/src/common/spinctrlcmn.cpp +++ b/src/common/spinctrlcmn.cpp @@ -31,4 +31,76 @@ 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 diff --git a/src/common/stattextcmn.cpp b/src/common/stattextcmn.cpp index a29445d7b1..9bea608b3d 100644 --- a/src/common/stattextcmn.cpp +++ b/src/common/stattextcmn.cpp @@ -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 // ---------------------------------------------------------------------------- diff --git a/src/common/textcmn.cpp b/src/common/textcmn.cpp index 473de1178f..d7ed630390 100644 --- a/src/common/textcmn.cpp +++ b/src/common/textcmn.cpp @@ -47,6 +47,80 @@ // 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 ); diff --git a/src/common/treebase.cpp b/src/common/treebase.cpp index 8ae07d6a8f..c8b9906307 100644 --- a/src/common/treebase.cpp +++ b/src/common/treebase.cpp @@ -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 // ---------------------------------------------------------------------------- diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp index 47308229a1..dc64619a86 100644 --- a/src/common/wincmn.cpp +++ b/src/common/wincmn.cpp @@ -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( 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 // ---------------------------------------------------------------------------- diff --git a/src/generic/calctrlg.cpp b/src/generic/calctrlg.cpp index 367de68c36..3bb4170e5f 100644 --- a/src/generic/calctrlg.cpp +++ b/src/generic/calctrlg.cpp @@ -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 // ============================================================================ diff --git a/src/generic/colour.cpp b/src/generic/colour.cpp index adc843d195..d4c9ed2013 100644 --- a/src/generic/colour.cpp +++ b/src/generic/colour.cpp @@ -22,8 +22,6 @@ #include "wx/gdicmn.h" #endif -IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject) - // Colour void wxColour::Init() diff --git a/src/generic/commandlinkbuttong.cpp b/src/generic/commandlinkbuttong.cpp index 2895e970ce..287bd7a46c 100644 --- a/src/generic/commandlinkbuttong.cpp +++ b/src/generic/commandlinkbuttong.cpp @@ -24,11 +24,7 @@ #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 diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp index a87c0812ca..fae330fa03 100644 --- a/src/generic/dirctrlg.cpp +++ b/src/generic/dirctrlg.cpp @@ -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) diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp index d9a1a800d4..45d61abdc8 100644 --- a/src/generic/grid.cpp +++ b/src/generic/grid.cpp @@ -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 ) diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp index 5a3ef5ac90..02b14b51f7 100644 --- a/src/generic/listctrl.cpp +++ b/src/generic/listctrl.cpp @@ -25,15 +25,6 @@ #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" diff --git a/src/generic/odcombo.cpp b/src/generic/odcombo.cpp index da2fa78027..b9818d560c 100644 --- a/src/generic/odcombo.cpp +++ b/src/generic/odcombo.cpp @@ -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() { } diff --git a/src/generic/panelg.cpp b/src/generic/panelg.cpp index 32e656f94e..6ca4edace5 100644 --- a/src/generic/panelg.cpp +++ b/src/generic/panelg.cpp @@ -38,55 +38,6 @@ // 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() diff --git a/src/generic/spinctlg.cpp b/src/generic/spinctlg.cpp index 1f2f3c2492..dcb3ada436 100644 --- a/src/generic/spinctlg.cpp +++ b/src/generic/spinctlg.cpp @@ -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()); diff --git a/src/generic/statbmpg.cpp b/src/generic/statbmpg.cpp index 8f6701dccb..63dac5b2ae 100644 --- a/src/generic/statbmpg.cpp +++ b/src/generic/statbmpg.cpp @@ -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, diff --git a/src/generic/statline.cpp b/src/generic/statline.cpp index 023745015d..e6edd9c7e9 100644 --- a/src/generic/statline.cpp +++ b/src/generic/statline.cpp @@ -36,8 +36,6 @@ // implementation // ============================================================================ -IMPLEMENT_DYNAMIC_CLASS(wxStaticLine, wxControl) - // ---------------------------------------------------------------------------- // wxStaticLine // ---------------------------------------------------------------------------- diff --git a/src/generic/treectlg.cpp b/src/generic/treectlg.cpp index cb13a8af3d..c3b739e4d3 100644 --- a/src/generic/treectlg.cpp +++ b/src/generic/treectlg.cpp @@ -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 // ----------------------------------------------------------------------------- diff --git a/src/gtk/bmpbuttn.cpp b/src/gtk/bmpbuttn.cpp index f6d2ee2e6e..55ca28b5c2 100644 --- a/src/gtk/bmpbuttn.cpp +++ b/src/gtk/bmpbuttn.cpp @@ -14,8 +14,6 @@ #include "wx/bmpbuttn.h" -IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton,wxButton) - bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap, diff --git a/src/gtk/checkbox.cpp b/src/gtk/checkbox.cpp index 5faa27c19b..415b5c4e64 100644 --- a/src/gtk/checkbox.cpp +++ b/src/gtk/checkbox.cpp @@ -90,8 +90,6 @@ static void gtk_checkbox_toggled_callback(GtkWidget *widget, wxCheckBox *cb) // wxCheckBox //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxCheckBox,wxControl) - wxCheckBox::wxCheckBox() { } diff --git a/src/gtk/choice.cpp b/src/gtk/choice.cpp index 462d9266ef..00170f2950 100644 --- a/src/gtk/choice.cpp +++ b/src/gtk/choice.cpp @@ -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; diff --git a/src/gtk/colour.cpp b/src/gtk/colour.cpp index 6a226d4d0b..322689db99 100644 --- a/src/gtk/colour.cpp +++ b/src/gtk/colour.cpp @@ -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); diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp index a0fb1e962d..23f4becc49 100644 --- a/src/gtk/combobox.cpp +++ b/src/gtk/combobox.cpp @@ -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) diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp index 05635a131e..7d17af90ad 100644 --- a/src/gtk/frame.cpp +++ b/src/gtk/frame.cpp @@ -32,8 +32,6 @@ // event tables // ---------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow) - // ============================================================================ // implementation // ============================================================================ diff --git a/src/gtk/gauge.cpp b/src/gtk/gauge.cpp index 91ab64a351..b867c30fa8 100644 --- a/src/gtk/gauge.cpp +++ b/src/gtk/gauge.cpp @@ -20,8 +20,6 @@ // wxGauge //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl) - bool wxGauge::Create( wxWindow *parent, wxWindowID id, int range, diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp index 60c03da203..06c62c2ff5 100644 --- a/src/gtk/listbox.cpp +++ b/src/gtk/listbox.cpp @@ -237,8 +237,6 @@ static gboolean gtk_listbox_searchequal_callback(GtkTreeModel * WXUNUSED(model), // wxListBox //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControlWithItems) - // ---------------------------------------------------------------------------- // construction // ---------------------------------------------------------------------------- diff --git a/src/gtk/radiobut.cpp b/src/gtk/radiobut.cpp index d2c5f73cfe..f465958df1 100644 --- a/src/gtk/radiobut.cpp +++ b/src/gtk/radiobut.cpp @@ -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, diff --git a/src/gtk/scrolbar.cpp b/src/gtk/scrolbar.cpp index 48bf5748ee..3ffb6eb2b7 100644 --- a/src/gtk/scrolbar.cpp +++ b/src/gtk/scrolbar.cpp @@ -118,8 +118,6 @@ gtk_button_release_event(GtkRange* range, GdkEventButton*, wxScrollBar* win) // wxScrollBar //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxScrollBar,wxControl) - wxScrollBar::wxScrollBar() { } diff --git a/src/gtk/slider.cpp b/src/gtk/slider.cpp index 83deaec5f3..7ded117773 100644 --- a/src/gtk/slider.cpp +++ b/src/gtk/slider.cpp @@ -272,8 +272,6 @@ static gchar* gtk_format_value(GtkScale*, double value, void*) // wxSlider //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxSlider,wxControl) - wxSlider::wxSlider() { m_pos = 0; diff --git a/src/gtk/spinbutt.cpp b/src/gtk/spinbutt.cpp index 9155e23d3f..c8e4780f12 100644 --- a/src/gtk/spinbutt.cpp +++ b/src/gtk/spinbutt.cpp @@ -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() diff --git a/src/gtk/spinctrl.cpp b/src/gtk/spinctrl.cpp index d84c02d39d..1d2b31a00c 100644 --- a/src/gtk/spinctrl.cpp +++ b/src/gtk/spinctrl.cpp @@ -352,8 +352,6 @@ wxSpinCtrlGTKBase::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) // wxSpinCtrl //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl, wxSpinCtrlGTKBase) - //----------------------------------------------------------------------------- // wxSpinCtrlDouble //----------------------------------------------------------------------------- diff --git a/src/gtk/statbmp.cpp b/src/gtk/statbmp.cpp index b12acdde77..a7e372c93d 100644 --- a/src/gtk/statbmp.cpp +++ b/src/gtk/statbmp.cpp @@ -20,8 +20,6 @@ // wxStaticBitmap //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap,wxControl) - wxStaticBitmap::wxStaticBitmap(void) { } diff --git a/src/gtk/statbox.cpp b/src/gtk/statbox.cpp index b7df8b6f58..151f04d0fa 100644 --- a/src/gtk/statbox.cpp +++ b/src/gtk/statbox.cpp @@ -48,8 +48,6 @@ static void size_allocate(GtkWidget* widget, GtkAllocation* alloc, void*) // wxStaticBox //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl) - wxStaticBox::wxStaticBox() { } diff --git a/src/gtk/statline.cpp b/src/gtk/statline.cpp index 9cb487fb6a..d19a152ccb 100644 --- a/src/gtk/statline.cpp +++ b/src/gtk/statline.cpp @@ -21,8 +21,6 @@ // wxStaticLine //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxStaticLine, wxControl) - wxStaticLine::wxStaticLine() { } diff --git a/src/gtk/stattext.cpp b/src/gtk/stattext.cpp index b3f96071ae..330253262a 100644 --- a/src/gtk/stattext.cpp +++ b/src/gtk/stattext.cpp @@ -19,8 +19,6 @@ // wxStaticText //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxStaticText,wxControl) - wxStaticText::wxStaticText() { } diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp index 8275b82b16..e88d1e2aed 100644 --- a/src/gtk/textctrl.cpp +++ b/src/gtk/textctrl.cpp @@ -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) diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp index 53c687fa08..26e7dc2b44 100644 --- a/src/gtk/window.cpp +++ b/src/gtk/window.cpp @@ -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() { diff --git a/src/gtk1/bmpbuttn.cpp b/src/gtk1/bmpbuttn.cpp index 18d3951163..109281084a 100644 --- a/src/gtk1/bmpbuttn.cpp +++ b/src/gtk1/bmpbuttn.cpp @@ -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 = diff --git a/src/gtk1/button.cpp b/src/gtk1/button.cpp index a388cc3474..cbcf71028c 100644 --- a/src/gtk1/button.cpp +++ b/src/gtk1/button.cpp @@ -94,8 +94,6 @@ gtk_button_style_set_callback( GtkWidget *m_widget, GtkStyle *WXUNUSED(style), w // wxButton //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxButton,wxControl) - wxButton::wxButton() { } diff --git a/src/gtk1/checkbox.cpp b/src/gtk1/checkbox.cpp index c895b7c82c..5d3dd8738c 100644 --- a/src/gtk1/checkbox.cpp +++ b/src/gtk1/checkbox.cpp @@ -58,8 +58,6 @@ static void gtk_checkbox_toggled_callback(GtkWidget *WXUNUSED(widget), // wxCheckBox //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxCheckBox,wxControl) - wxCheckBox::wxCheckBox() { } diff --git a/src/gtk1/choice.cpp b/src/gtk1/choice.cpp index 5c29d0930c..1a17d2d027 100644 --- a/src/gtk1/choice.cpp +++ b/src/gtk1/choice.cpp @@ -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; diff --git a/src/gtk1/colour.cpp b/src/gtk1/colour.cpp index 4d379eb632..eb133b79e1 100644 --- a/src/gtk1/colour.cpp +++ b/src/gtk1/colour.cpp @@ -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() { } diff --git a/src/gtk1/combobox.cpp b/src/gtk1/combobox.cpp index ebbbc0c0a4..515f0c8c65 100644 --- a/src/gtk1/combobox.cpp +++ b/src/gtk1/combobox.cpp @@ -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) diff --git a/src/gtk1/dialog.cpp b/src/gtk1/dialog.cpp index 54bac5264f..1646b771cb 100644 --- a/src/gtk1/dialog.cpp +++ b/src/gtk1/dialog.cpp @@ -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; diff --git a/src/gtk1/frame.cpp b/src/gtk1/frame.cpp index 83474b3a55..304c152a57 100644 --- a/src/gtk1/frame.cpp +++ b/src/gtk1/frame.cpp @@ -56,8 +56,6 @@ extern bool g_isIdle; // event tables // ---------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow) - // ============================================================================ // implementation // ============================================================================ diff --git a/src/gtk1/gauge.cpp b/src/gtk1/gauge.cpp index 4c6fcb5278..e8710caec0 100644 --- a/src/gtk1/gauge.cpp +++ b/src/gtk1/gauge.cpp @@ -20,8 +20,6 @@ // wxGauge //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl) - bool wxGauge::Create( wxWindow *parent, wxWindowID id, int range, diff --git a/src/gtk1/listbox.cpp b/src/gtk1/listbox.cpp index 66feebd3c3..c0e55bae2a 100644 --- a/src/gtk1/listbox.cpp +++ b/src/gtk1/listbox.cpp @@ -452,8 +452,6 @@ gtk_listbox_realized_callback( GtkWidget *WXUNUSED(widget), wxListBox *win ) // wxListBox //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControlWithItems) - // ---------------------------------------------------------------------------- // construction // ---------------------------------------------------------------------------- diff --git a/src/gtk1/radiobut.cpp b/src/gtk1/radiobut.cpp index 73968dc43b..52e317f1f4 100644 --- a/src/gtk1/radiobut.cpp +++ b/src/gtk1/radiobut.cpp @@ -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, diff --git a/src/gtk1/scrolbar.cpp b/src/gtk1/scrolbar.cpp index 82ad187aa6..e6dd46e299 100644 --- a/src/gtk1/scrolbar.cpp +++ b/src/gtk1/scrolbar.cpp @@ -165,8 +165,6 @@ gtk_scrollbar_button_release_callback( GtkRange *WXUNUSED(widget), // wxScrollBar //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxScrollBar,wxControl) - wxScrollBar::~wxScrollBar() { } diff --git a/src/gtk1/slider.cpp b/src/gtk1/slider.cpp index 7a7a4f0e6b..c0187f3cca 100644 --- a/src/gtk1/slider.cpp +++ b/src/gtk1/slider.cpp @@ -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, diff --git a/src/gtk1/spinbutt.cpp b/src/gtk1/spinbutt.cpp index 250fda3d2a..447adb0830 100644 --- a/src/gtk1/spinbutt.cpp +++ b/src/gtk1/spinbutt.cpp @@ -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() diff --git a/src/gtk1/spinctrl.cpp b/src/gtk1/spinctrl.cpp index f0beb6ac45..f1f0db47dc 100644 --- a/src/gtk1/spinctrl.cpp +++ b/src/gtk1/spinctrl.cpp @@ -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() diff --git a/src/gtk1/statbmp.cpp b/src/gtk1/statbmp.cpp index e9ee469e1e..a1818129aa 100644 --- a/src/gtk1/statbmp.cpp +++ b/src/gtk1/statbmp.cpp @@ -21,8 +21,6 @@ // wxStaticBitmap //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap,wxControl) - wxStaticBitmap::wxStaticBitmap(void) { } diff --git a/src/gtk1/statbox.cpp b/src/gtk1/statbox.cpp index a2542e88e2..b8a3d77256 100644 --- a/src/gtk1/statbox.cpp +++ b/src/gtk1/statbox.cpp @@ -22,8 +22,6 @@ // wxStaticBox //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl) - wxStaticBox::wxStaticBox() { } diff --git a/src/gtk1/statline.cpp b/src/gtk1/statline.cpp index 0e05c9e758..9dc3279b5c 100644 --- a/src/gtk1/statline.cpp +++ b/src/gtk1/statline.cpp @@ -21,8 +21,6 @@ // wxStaticLine //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxStaticLine, wxControl) - wxStaticLine::wxStaticLine() { } diff --git a/src/gtk1/stattext.cpp b/src/gtk1/stattext.cpp index e1f4fb53e1..c432146960 100644 --- a/src/gtk1/stattext.cpp +++ b/src/gtk1/stattext.cpp @@ -27,8 +27,6 @@ void wxgtk_window_size_request_callback(GtkWidget *widget, // wxStaticText //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxStaticText,wxControl) - wxStaticText::wxStaticText() { } diff --git a/src/gtk1/textctrl.cpp b/src/gtk1/textctrl.cpp index 41caee9f64..1aa82a3fff 100644 --- a/src/gtk1/textctrl.cpp +++ b/src/gtk1/textctrl.cpp @@ -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) diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp index 2618e11b8c..dcefcff70c 100644 --- a/src/gtk1/window.cpp +++ b/src/gtk1/window.cpp @@ -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() { diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp index ceb2fac7c8..058499e481 100644 --- a/src/html/htmlwin.cpp +++ b/src/html/htmlwin.cpp @@ -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) diff --git a/src/motif/bmpbuttn.cpp b/src/motif/bmpbuttn.cpp index 4449639d9c..1246d1de9d 100644 --- a/src/motif/bmpbuttn.cpp +++ b/src/motif/bmpbuttn.cpp @@ -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; diff --git a/src/motif/button.cpp b/src/motif/button.cpp index 7b85a01c74..9df9eab55c 100644 --- a/src/motif/button.cpp +++ b/src/motif/button.cpp @@ -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 diff --git a/src/motif/checkbox.cpp b/src/motif/checkbox.cpp index 1a79bf75ec..771c50ff85 100644 --- a/src/motif/checkbox.cpp +++ b/src/motif/checkbox.cpp @@ -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, diff --git a/src/motif/choice.cpp b/src/motif/choice.cpp index 10f3c3fccc..32ae77bab4 100644 --- a/src/motif/choice.cpp +++ b/src/motif/choice.cpp @@ -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); diff --git a/src/motif/colour.cpp b/src/motif/colour.cpp index 0f5d8a4f87..05d1a89e9b 100644 --- a/src/motif/colour.cpp +++ b/src/motif/colour.cpp @@ -32,8 +32,6 @@ #include "wx/motif/private.h" -IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject) - wxCOMPILE_TIME_ASSERT( sizeof(WXPixel) == sizeof(Pixel), PixelSizeIsOk ); // Colour diff --git a/src/motif/dialog.cpp b/src/motif/dialog.cpp index 618c22de04..9291ad72fb 100644 --- a/src/motif/dialog.cpp +++ b/src/motif/dialog.cpp @@ -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; diff --git a/src/motif/frame.cpp b/src/motif/frame.cpp index ea5e996758..51755c4a1e 100644 --- a/src/motif/frame.cpp +++ b/src/motif/frame.cpp @@ -91,8 +91,6 @@ BEGIN_EVENT_TABLE(wxFrame, wxFrameBase) EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged) END_EVENT_TABLE() -IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow) - // ============================================================================ // implementation // ============================================================================ diff --git a/src/motif/gauge.cpp b/src/motif/gauge.cpp index 4ccdf87265..c63649ca06 100644 --- a/src/motif/gauge.cpp +++ b/src/motif/gauge.cpp @@ -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: diff --git a/src/motif/listbox.cpp b/src/motif/listbox.cpp index 4d59337023..b0ab1011ab 100644 --- a/src/motif/listbox.cpp +++ b/src/motif/listbox.cpp @@ -33,8 +33,6 @@ #endif #include "wx/motif/private.h" -IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControlWithItems) - static void wxListBoxCallback(Widget w, XtPointer clientData, XmListCallbackStruct * cbs); diff --git a/src/motif/radiobut.cpp b/src/motif/radiobut.cpp index 98741b960a..d6832a3f6d 100644 --- a/src/motif/radiobut.cpp +++ b/src/motif/radiobut.cpp @@ -32,8 +32,6 @@ void wxRadioButtonCallback (Widget w, XtPointer clientData, XmToggleButtonCallbackStruct * cbs); -IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl) - wxRadioButton::wxRadioButton() { } diff --git a/src/motif/scrolbar.cpp b/src/motif/scrolbar.cpp index f12accfcf8..3b53a731df 100644 --- a/src/motif/scrolbar.cpp +++ b/src/motif/scrolbar.cpp @@ -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, diff --git a/src/motif/slider.cpp b/src/motif/slider.cpp index 192b4633e8..70c5c66a24 100644 --- a/src/motif/slider.cpp +++ b/src/motif/slider.cpp @@ -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() diff --git a/src/motif/spinbutt.cpp b/src/motif/spinbutt.cpp index 6286212ced..44c4baf6f0 100644 --- a/src/motif/spinbutt.cpp +++ b/src/motif/spinbutt.cpp @@ -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, diff --git a/src/motif/statbmp.cpp b/src/motif/statbmp.cpp index 89a74c3792..548ae9777a 100644 --- a/src/motif/statbmp.cpp +++ b/src/motif/statbmp.cpp @@ -26,8 +26,6 @@ #include "wx/motif/private.h" -IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl) - /* * wxStaticBitmap */ diff --git a/src/motif/statbox.cpp b/src/motif/statbox.cpp index 1a175f9910..2ea22aee4d 100644 --- a/src/motif/statbox.cpp +++ b/src/motif/statbox.cpp @@ -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() diff --git a/src/motif/stattext.cpp b/src/motif/stattext.cpp index 5ddee74390..949aca7d19 100644 --- a/src/motif/stattext.cpp +++ b/src/motif/stattext.cpp @@ -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, diff --git a/src/motif/textctrl.cpp b/src/motif/textctrl.cpp index 4cd726bc04..2da2f34990 100644 --- a/src/motif/textctrl.cpp +++ b/src/motif/textctrl.cpp @@ -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) diff --git a/src/motif/window.cpp b/src/motif/window.cpp index 257d9ce953..9fa2c9e3dc 100644 --- a/src/motif/window.cpp +++ b/src/motif/window.cpp @@ -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() diff --git a/src/msw/bmpbuttn.cpp b/src/msw/bmpbuttn.cpp index 217b1aec63..8cf3fc95ac 100644 --- a/src/msw/bmpbuttn.cpp +++ b/src/msw/bmpbuttn.cpp @@ -54,60 +54,6 @@ // 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() diff --git a/src/msw/button.cpp b/src/msw/button.cpp index 9d7fa154a7..c5789687fe 100644 --- a/src/msw/button.cpp +++ b/src/msw/button.cpp @@ -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 // ============================================================================ diff --git a/src/msw/checkbox.cpp b/src/msw/checkbox.cpp index 2a9e8643ef..a4e49c8ccb 100644 --- a/src/msw/checkbox.cpp +++ b/src/msw/checkbox.cpp @@ -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 // ---------------------------------------------------------------------------- diff --git a/src/msw/choice.cpp b/src/msw/choice.cpp index 5b7f131e0b..64c3929328 100644 --- a/src/msw/choice.cpp +++ b/src/msw/choice.cpp @@ -38,64 +38,6 @@ #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 // ============================================================================ diff --git a/src/msw/colour.cpp b/src/msw/colour.cpp index 9a9a13f98c..15da19612c 100644 --- a/src/msw/colour.cpp +++ b/src/msw/colour.cpp @@ -26,42 +26,6 @@ #include -#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() diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp index 94f6140d50..c5a74dc211 100644 --- a/src/msw/combobox.cpp +++ b/src/msw/combobox.cpp @@ -55,69 +55,6 @@ // 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) diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp index 592c23a9bc..b883fd5be4 100644 --- a/src/msw/dialog.cpp +++ b/src/msw/dialog.cpp @@ -50,64 +50,6 @@ // 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 // ---------------------------------------------------------------------------- diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp index 077b030d33..c1c96bb1ce 100644 --- a/src/msw/frame.cpp +++ b/src/msw/frame.cpp @@ -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 // ============================================================================ diff --git a/src/msw/gauge.cpp b/src/msw/gauge.cpp index 69286856bc..1ed1025408 100644 --- a/src/msw/gauge.cpp +++ b/src/msw/gauge.cpp @@ -69,64 +69,6 @@ // 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 // ============================================================================ diff --git a/src/msw/listbox.cpp b/src/msw/listbox.cpp index 97bbe92840..69281add2b 100644 --- a/src/msw/listbox.cpp +++ b/src/msw/listbox.cpp @@ -40,75 +40,6 @@ #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 // ============================================================================ diff --git a/src/msw/listctrl.cpp b/src/msw/listctrl.cpp index ed4d99e456..13525bf4b8 100644 --- a/src/msw/listctrl.cpp +++ b/src/msw/listctrl.cpp @@ -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() diff --git a/src/msw/radiobut.cpp b/src/msw/radiobut.cpp index 01e5fd8dbb..bc0fa69092 100644 --- a/src/msw/radiobut.cpp +++ b/src/msw/radiobut.cpp @@ -44,62 +44,6 @@ // 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; diff --git a/src/msw/scrolbar.cpp b/src/msw/scrolbar.cpp index f45e294396..ce238227db 100644 --- a/src/msw/scrolbar.cpp +++ b/src/msw/scrolbar.cpp @@ -27,62 +27,6 @@ #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, diff --git a/src/msw/slider.cpp b/src/msw/slider.cpp index ffa5d3919a..3eb922c534 100644 --- a/src/msw/slider.cpp +++ b/src/msw/slider.cpp @@ -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 // ============================================================================ diff --git a/src/msw/spinbutt.cpp b/src/msw/spinbutt.cpp index 1695f13436..6d6f93e5b5 100644 --- a/src/msw/spinbutt.cpp +++ b/src/msw/spinbutt.cpp @@ -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 // ---------------------------------------------------------------------------- diff --git a/src/msw/spinctrl.cpp b/src/msw/spinctrl.cpp index b981c09afc..19e302e6d4 100644 --- a/src/msw/spinctrl.cpp +++ b/src/msw/spinctrl.cpp @@ -48,71 +48,6 @@ // 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) diff --git a/src/msw/statbmp.cpp b/src/msw/statbmp.cpp index fbaf004ad1..0b2a52706e 100644 --- a/src/msw/statbmp.cpp +++ b/src/msw/statbmp.cpp @@ -45,59 +45,6 @@ // 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 // =========================================================================== diff --git a/src/msw/statbox.cpp b/src/msw/statbox.cpp index 2047e8bd4c..75306978e0 100644 --- a/src/msw/statbox.cpp +++ b/src/msw/statbox.cpp @@ -54,58 +54,6 @@ // 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 // ============================================================================ diff --git a/src/msw/statline.cpp b/src/msw/statline.cpp index 24cd55c91c..a10a33176a 100644 --- a/src/msw/statline.cpp +++ b/src/msw/statline.cpp @@ -36,62 +36,6 @@ // 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 // ---------------------------------------------------------------------------- diff --git a/src/msw/stattext.cpp b/src/msw/stattext.cpp index 572a8f8089..7fdff2f500 100644 --- a/src/msw/stattext.cpp +++ b/src/msw/stattext.cpp @@ -30,59 +30,6 @@ #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, diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp index ca3c74873b..dee0498db6 100644 --- a/src/msw/textctrl.cpp +++ b/src/msw/textctrl.cpp @@ -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) diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp index 6cb53d2876..fab5750dfb 100644 --- a/src/msw/treectrl.cpp +++ b/src/msw/treectrl.cpp @@ -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 // ---------------------------------------------------------------------------- diff --git a/src/msw/wince/choicece.cpp b/src/msw/wince/choicece.cpp index 60cc401802..33d80aa13c 100644 --- a/src/msw/wince/choicece.cpp +++ b/src/msw/wince/choicece.cpp @@ -34,12 +34,6 @@ #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 ) diff --git a/src/msw/wince/textctrlce.cpp b/src/msw/wince/textctrlce.cpp index f8b8c16d25..9d3650ce62 100644 --- a/src/msw/wince/textctrlce.cpp +++ b/src/msw/wince/textctrlce.cpp @@ -43,12 +43,6 @@ // 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) diff --git a/src/msw/window.cpp b/src/msw/window.cpp index cd5f076e00..6e3bd673e4 100644 --- a/src/msw/window.cpp +++ b/src/msw/window.cpp @@ -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(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( 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) diff --git a/src/os2/bmpbuttn.cpp b/src/os2/bmpbuttn.cpp index 6112b02a56..82bb6dde95 100644 --- a/src/os2/bmpbuttn.cpp +++ b/src/os2/bmpbuttn.cpp @@ -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, diff --git a/src/os2/button.cpp b/src/os2/button.cpp index 0dfafaa3b3..ce0c00f818 100644 --- a/src/os2/button.cpp +++ b/src/os2/button.cpp @@ -39,8 +39,6 @@ #define BST_CHECKED 0x0001 #endif -IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl) - // Button bool wxButton::Create( wxWindow* pParent, diff --git a/src/os2/checkbox.cpp b/src/os2/checkbox.cpp index 2925980a9f..5462a84f7a 100644 --- a/src/os2/checkbox.cpp +++ b/src/os2/checkbox.cpp @@ -27,7 +27,6 @@ // macros // ---------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox) extern void wxAssociateWinWithHandle( HWND hWnd diff --git a/src/os2/choice.cpp b/src/os2/choice.cpp index 9f0360a9fc..1804a62b24 100644 --- a/src/os2/choice.cpp +++ b/src/os2/choice.cpp @@ -24,8 +24,6 @@ #include "wx/os2/private.h" -IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControlWithItems) - bool wxChoice::Create( wxWindow* pParent , wxWindowID vId diff --git a/src/os2/colour.cpp b/src/os2/colour.cpp index 08d79a82f1..d453f15b44 100644 --- a/src/os2/colour.cpp +++ b/src/os2/colour.cpp @@ -22,8 +22,6 @@ #define INCL_PM #include -IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject) - // Colour void wxColour::Init() diff --git a/src/os2/combobox.cpp b/src/os2/combobox.cpp index 002ea2015c..81590e0f99 100644 --- a/src/os2/combobox.cpp +++ b/src/os2/combobox.cpp @@ -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(); diff --git a/src/os2/dialog.cpp b/src/os2/dialog.cpp index 776f9db908..cd8721178d 100644 --- a/src/os2/dialog.cpp +++ b/src/os2/dialog.cpp @@ -33,7 +33,6 @@ #define wxDIALOG_DEFAULT_WIDTH 500 #define wxDIALOG_DEFAULT_HEIGHT 500 -IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow) // ---------------------------------------------------------------------------- // wxDialogModalData diff --git a/src/os2/frame.cpp b/src/os2/frame.cpp index bfa1f560b8..dfccb2ccad 100644 --- a/src/os2/frame.cpp +++ b/src/os2/frame.cpp @@ -52,8 +52,6 @@ BEGIN_EVENT_TABLE(wxFrame, wxFrameBase) EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged) END_EVENT_TABLE() -IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow) - // ============================================================================ // implementation // ============================================================================ diff --git a/src/os2/gauge.cpp b/src/os2/gauge.cpp index 9c95081918..80568caaec 100644 --- a/src/os2/gauge.cpp +++ b/src/os2/gauge.cpp @@ -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, diff --git a/src/os2/listbox.cpp b/src/os2/listbox.cpp index ada1db3c6c..c3018a0314 100644 --- a/src/os2/listbox.cpp +++ b/src/os2/listbox.cpp @@ -39,8 +39,6 @@ #include "wx/ownerdrw.h" #endif -IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControlWithItems) - // ============================================================================ // list box item declaration and implementation // ============================================================================ diff --git a/src/os2/listctrl.cpp b/src/os2/listctrl.cpp index 57e13fb4e0..fac8777375 100644 --- a/src/os2/listctrl.cpp +++ b/src/os2/listctrl.cpp @@ -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() diff --git a/src/os2/radiobut.cpp b/src/os2/radiobut.cpp index 677b804d7a..3b85eff91d 100644 --- a/src/os2/radiobut.cpp +++ b/src/os2/radiobut.cpp @@ -27,8 +27,6 @@ #include "wx/os2/private.h" -IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl) - extern void wxAssociateWinWithHandle( HWND hWnd ,wxWindowOS2* pWin ); diff --git a/src/os2/scrolbar.cpp b/src/os2/scrolbar.cpp index a89d53de3e..ed01ed5c96 100644 --- a/src/os2/scrolbar.cpp +++ b/src/os2/scrolbar.cpp @@ -20,8 +20,6 @@ #include "wx/os2/private.h" -IMPLEMENT_DYNAMIC_CLASS(wxScrollBar, wxControl) - // Scrollbar bool wxScrollBar::Create(wxWindow* pParent, wxWindowID vId, diff --git a/src/os2/slider.cpp b/src/os2/slider.cpp index b9864249f5..83752dd30b 100644 --- a/src/os2/slider.cpp +++ b/src/os2/slider.cpp @@ -28,8 +28,6 @@ #include "wx/slider.h" #include "wx/os2/private.h" -IMPLEMENT_DYNAMIC_CLASS(wxSlider, wxControl) - wxSlider::wxSlider() { m_hStaticValue = 0L; diff --git a/src/os2/spinbutt.cpp b/src/os2/spinbutt.cpp index 533b209728..14fbeaa39c 100644 --- a/src/os2/spinbutt.cpp +++ b/src/os2/spinbutt.cpp @@ -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 diff --git a/src/os2/spinctrl.cpp b/src/os2/spinctrl.cpp index c9d8187d94..2771654ab0 100644 --- a/src/os2/spinctrl.cpp +++ b/src/os2/spinctrl.cpp @@ -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) diff --git a/src/os2/statbmp.cpp b/src/os2/statbmp.cpp index c80642962f..5874763573 100644 --- a/src/os2/statbmp.cpp +++ b/src/os2/statbmp.cpp @@ -28,8 +28,6 @@ // macros // --------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl) - BEGIN_EVENT_TABLE(wxStaticBitmap, wxWindow) EVT_PAINT(wxStaticBitmap::OnPaint) END_EVENT_TABLE() diff --git a/src/os2/statbox.cpp b/src/os2/statbox.cpp index 8ae9f4d7ab..c1512ea6a8 100644 --- a/src/os2/statbox.cpp +++ b/src/os2/statbox.cpp @@ -22,8 +22,6 @@ #include "wx/os2/private.h" -IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl) - bool wxStaticBox::Create( wxWindow* pParent, wxWindowID vId, const wxString& rsLabel, diff --git a/src/os2/statline.cpp b/src/os2/statline.cpp index e9663eebf9..62562b26e0 100644 --- a/src/os2/statline.cpp +++ b/src/os2/statline.cpp @@ -33,8 +33,6 @@ // implementation // ============================================================================ -IMPLEMENT_DYNAMIC_CLASS(wxStaticLine, wxControl) - // ---------------------------------------------------------------------------- // wxStaticLine // ---------------------------------------------------------------------------- diff --git a/src/os2/stattext.cpp b/src/os2/stattext.cpp index 6285c011da..292f662353 100644 --- a/src/os2/stattext.cpp +++ b/src/os2/stattext.cpp @@ -24,8 +24,6 @@ #include "wx/os2/private.h" #include -IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl) - bool wxStaticText::Create( wxWindow* pParent, wxWindowID vId, const wxString& rsLabel, diff --git a/src/os2/textctrl.cpp b/src/os2/textctrl.cpp index a3ae1dcb3e..3be381a95f 100644 --- a/src/os2/textctrl.cpp +++ b/src/os2/textctrl.cpp @@ -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) diff --git a/src/os2/treectrl.cpp b/src/os2/treectrl.cpp index ab60bc7c09..9bddf9c719 100644 --- a/src/os2/treectrl.cpp +++ b/src/os2/treectrl.cpp @@ -254,8 +254,6 @@ private: // wxWin macros // ---------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxTreeCtrl, wxControl) - // ---------------------------------------------------------------------------- // constants // ---------------------------------------------------------------------------- diff --git a/src/os2/window.cpp b/src/os2/window.cpp index fdf6d3a87b..ddcc14e1d0 100644 --- a/src/os2/window.cpp +++ b/src/os2/window.cpp @@ -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) diff --git a/src/osx/bmpbuttn_osx.cpp b/src/osx/bmpbuttn_osx.cpp index 2384340ae2..4e872a906e 100644 --- a/src/osx/bmpbuttn_osx.cpp +++ b/src/osx/bmpbuttn_osx.cpp @@ -20,9 +20,6 @@ #include "wx/dcmemory.h" #endif -IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton) - - #include "wx/osx/private.h" //--------------------------------------------------------------------------- diff --git a/src/osx/button_osx.cpp b/src/osx/button_osx.cpp index 6c83fb16ba..045ea79675 100644 --- a/src/osx/button_osx.cpp +++ b/src/osx/button_osx.cpp @@ -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) diff --git a/src/osx/carbon/combobox.cpp b/src/osx/carbon/combobox.cpp index cba75b71bf..2662bb8bd0 100644 --- a/src/osx/carbon/combobox.cpp +++ b/src/osx/carbon/combobox.cpp @@ -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) diff --git a/src/osx/carbon/combobxc.cpp b/src/osx/carbon/combobxc.cpp index b568c23c89..9a132ebae7 100644 --- a/src/osx/carbon/combobxc.cpp +++ b/src/osx/carbon/combobxc.cpp @@ -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 diff --git a/src/osx/carbon/frame.cpp b/src/osx/carbon/frame.cpp index 92ee6a94f5..da12834891 100644 --- a/src/osx/carbon/frame.cpp +++ b/src/osx/carbon/frame.cpp @@ -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 // ---------------------------------------------------------------------------- diff --git a/src/osx/carbon/listctrl_mac.cpp b/src/osx/carbon/listctrl_mac.cpp index 8e3ac789f6..898890d2ff 100644 --- a/src/osx/carbon/listctrl_mac.cpp +++ b/src/osx/carbon/listctrl_mac.cpp @@ -41,79 +41,6 @@ #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" diff --git a/src/osx/carbon/statbmp.cpp b/src/osx/carbon/statbmp.cpp index ab6915452a..1034298f46 100644 --- a/src/osx/carbon/statbmp.cpp +++ b/src/osx/carbon/statbmp.cpp @@ -19,8 +19,6 @@ #include "wx/dcclient.h" #endif -IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl) - /* * wxStaticBitmap */ diff --git a/src/osx/carbon/statline.cpp b/src/osx/carbon/statline.cpp index ca968e6c08..1d68d6b7fc 100644 --- a/src/osx/carbon/statline.cpp +++ b/src/osx/carbon/statline.cpp @@ -20,9 +20,6 @@ #include "wx/statbox.h" #endif -IMPLEMENT_DYNAMIC_CLASS(wxStaticLine, wxControl) - - bool wxStaticLine::Create( wxWindow *parent, wxWindowID id, const wxPoint &pos, diff --git a/src/osx/checkbox_osx.cpp b/src/osx/checkbox_osx.cpp index 93cbf2c7bb..3a72833961 100644 --- a/src/osx/checkbox_osx.cpp +++ b/src/osx/checkbox_osx.cpp @@ -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 diff --git a/src/osx/choice_osx.cpp b/src/osx/choice_osx.cpp index 966974de06..e3d6cdab48 100644 --- a/src/osx/choice_osx.cpp +++ b/src/osx/choice_osx.cpp @@ -22,8 +22,6 @@ #include "wx/osx/private.h" -IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControlWithItems) - wxChoice::~wxChoice() { if ( HasClientObjectData() ) diff --git a/src/osx/cocoa/combobox.mm b/src/osx/cocoa/combobox.mm index 4aec03feb3..3ae05278d7 100644 --- a/src/osx/cocoa/combobox.mm +++ b/src/osx/cocoa/combobox.mm @@ -24,6 +24,17 @@ // work in progress +@interface wxNSTableDataSource : NSObject wxOSX_10_6_AND_LATER() +{ + wxNSComboBoxControl* impl; +} + +- (NSInteger)numberOfItemsInComboBox:(NSComboBox *)aComboBox; +- (id)comboBox:(NSComboBox *)aComboBox objectValueForItemAtIndex:(NSInteger)index; + +@end + + @interface wxNSComboBox : NSComboBox { } diff --git a/src/osx/combobox_osx.cpp b/src/osx/combobox_osx.cpp index 9790bb95dc..8e814f8eba 100644 --- a/src/osx/combobox_osx.cpp +++ b/src/osx/combobox_osx.cpp @@ -21,8 +21,6 @@ // work in progress -IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl) - wxComboBox::~wxComboBox() { } diff --git a/src/osx/core/colour.cpp b/src/osx/core/colour.cpp index 35114175ce..92bddd08be 100644 --- a/src/osx/core/colour.cpp +++ b/src/osx/core/colour.cpp @@ -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) { diff --git a/src/osx/dialog_osx.cpp b/src/osx/dialog_osx.cpp index 05da19bcc8..e4088d6cfc 100644 --- a/src/osx/dialog_osx.cpp +++ b/src/osx/dialog_osx.cpp @@ -40,9 +40,6 @@ void wxDialog::OSXEndModalDialog() s_openDialogs--; } - -IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow) - void wxDialog::Init() { m_modality = wxDIALOG_MODALITY_NONE; diff --git a/src/osx/gauge_osx.cpp b/src/osx/gauge_osx.cpp index 869bce41f6..284d7fc666 100644 --- a/src/osx/gauge_osx.cpp +++ b/src/osx/gauge_osx.cpp @@ -15,8 +15,6 @@ #include "wx/gauge.h" -IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl) - #include "wx/osx/private.h" bool wxGauge::Create( wxWindow *parent, diff --git a/src/osx/listbox_osx.cpp b/src/osx/listbox_osx.cpp index c8a037b899..624eb806ff 100644 --- a/src/osx/listbox_osx.cpp +++ b/src/osx/listbox_osx.cpp @@ -24,8 +24,6 @@ #include "wx/dcclient.h" #endif -IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControlWithItems) - BEGIN_EVENT_TABLE(wxListBox, wxControl) END_EVENT_TABLE() diff --git a/src/osx/radiobut_osx.cpp b/src/osx/radiobut_osx.cpp index cbd5f19990..772a2601a6 100644 --- a/src/osx/radiobut_osx.cpp +++ b/src/osx/radiobut_osx.cpp @@ -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, diff --git a/src/osx/scrolbar_osx.cpp b/src/osx/scrolbar_osx.cpp index cbe8cdfe87..e0cdcfe752 100644 --- a/src/osx/scrolbar_osx.cpp +++ b/src/osx/scrolbar_osx.cpp @@ -23,8 +23,6 @@ #if wxUSE_SCROLLBAR -IMPLEMENT_DYNAMIC_CLASS(wxScrollBar, wxControl) - BEGIN_EVENT_TABLE(wxScrollBar, wxControl) END_EVENT_TABLE() diff --git a/src/osx/slider_osx.cpp b/src/osx/slider_osx.cpp index 705ec7db94..de069f1e4a 100644 --- a/src/osx/slider_osx.cpp +++ b/src/osx/slider_osx.cpp @@ -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() diff --git a/src/osx/spinbutt_osx.cpp b/src/osx/spinbutt_osx.cpp index 8e1d44e0fc..5e3408d519 100644 --- a/src/osx/spinbutt_osx.cpp +++ b/src/osx/spinbutt_osx.cpp @@ -17,10 +17,6 @@ #include "wx/osx/private.h" -IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl) -IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent) - - wxSpinButton::wxSpinButton() : wxSpinButtonBase() { diff --git a/src/osx/spinctrl_osx.cpp b/src/osx/spinctrl_osx.cpp index a6b733ae0a..3c8a7e42a7 100644 --- a/src/osx/spinctrl_osx.cpp +++ b/src/osx/spinctrl_osx.cpp @@ -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() diff --git a/src/osx/statbox_osx.cpp b/src/osx/statbox_osx.cpp index 216b6fd919..f6df81bcac 100644 --- a/src/osx/statbox_osx.cpp +++ b/src/osx/statbox_osx.cpp @@ -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, diff --git a/src/osx/statline_osx.cpp b/src/osx/statline_osx.cpp index d216f2e996..73e29957c7 100644 --- a/src/osx/statline_osx.cpp +++ b/src/osx/statline_osx.cpp @@ -37,8 +37,6 @@ // implementation // ============================================================================ -IMPLEMENT_DYNAMIC_CLASS(wxStaticLine, wxControl) - // ---------------------------------------------------------------------------- // wxStaticLine // ---------------------------------------------------------------------------- diff --git a/src/osx/stattext_osx.cpp b/src/osx/stattext_osx.cpp index dce98c9b6c..94af706ee6 100644 --- a/src/osx/stattext_osx.cpp +++ b/src/osx/stattext_osx.cpp @@ -27,8 +27,6 @@ #include -IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl) - bool wxStaticText::Create( wxWindow *parent, wxWindowID id, diff --git a/src/osx/textctrl_osx.cpp b/src/osx/textctrl_osx.cpp index ff1a28f48d..7efdcb487a 100644 --- a/src/osx/textctrl_osx.cpp +++ b/src/osx/textctrl_osx.cpp @@ -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) diff --git a/src/osx/window_osx.cpp b/src/osx/window_osx.cpp index ec1375142e..6fe191e359 100644 --- a/src/osx/window_osx.cpp +++ b/src/osx/window_osx.cpp @@ -76,8 +76,6 @@ #ifdef __WXUNIVERSAL__ IMPLEMENT_ABSTRACT_CLASS(wxWindowMac, wxWindowBase) -#else - IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowBase) #endif BEGIN_EVENT_TABLE(wxWindowMac, wxWindowBase) diff --git a/src/palmos/bmpbuttn.cpp b/src/palmos/bmpbuttn.cpp index 72b08d0953..7319d06551 100644 --- a/src/palmos/bmpbuttn.cpp +++ b/src/palmos/bmpbuttn.cpp @@ -29,60 +29,6 @@ // 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, diff --git a/src/palmos/button.cpp b/src/palmos/button.cpp index 93fd0d6690..c395130b80 100644 --- a/src/palmos/button.cpp +++ b/src/palmos/button.cpp @@ -48,67 +48,6 @@ // 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) diff --git a/src/palmos/checkbox.cpp b/src/palmos/checkbox.cpp index 8a74d28126..3c9006de2a 100644 --- a/src/palmos/checkbox.cpp +++ b/src/palmos/checkbox.cpp @@ -40,59 +40,6 @@ // 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 // ---------------------------------------------------------------------------- diff --git a/src/palmos/choice.cpp b/src/palmos/choice.cpp index 5ea2d6ea02..e1852a767f 100644 --- a/src/palmos/choice.cpp +++ b/src/palmos/choice.cpp @@ -34,58 +34,6 @@ #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 // ============================================================================ diff --git a/src/palmos/combobox.cpp b/src/palmos/combobox.cpp index e35fbcf028..90c062712f 100644 --- a/src/palmos/combobox.cpp +++ b/src/palmos/combobox.cpp @@ -47,66 +47,6 @@ // 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 // ---------------------------------------------------------------------------- diff --git a/src/palmos/dialog.cpp b/src/palmos/dialog.cpp index 4358cfef5f..622f6b9361 100644 --- a/src/palmos/dialog.cpp +++ b/src/palmos/dialog.cpp @@ -42,64 +42,6 @@ // 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 // ---------------------------------------------------------------------------- diff --git a/src/palmos/frame.cpp b/src/palmos/frame.cpp index da9e70ede7..b89b94b671 100644 --- a/src/palmos/frame.cpp +++ b/src/palmos/frame.cpp @@ -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 // ============================================================================ diff --git a/src/palmos/gauge.cpp b/src/palmos/gauge.cpp index fdc6df77f1..85d1cc4f91 100644 --- a/src/palmos/gauge.cpp +++ b/src/palmos/gauge.cpp @@ -57,61 +57,6 @@ // 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 // ============================================================================ diff --git a/src/palmos/listbox.cpp b/src/palmos/listbox.cpp index fd23382ec9..e8276aea55 100644 --- a/src/palmos/listbox.cpp +++ b/src/palmos/listbox.cpp @@ -37,67 +37,6 @@ #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 // ============================================================================ diff --git a/src/palmos/listctrl.cpp b/src/palmos/listctrl.cpp index b42949ca83..e5755c9819 100644 --- a/src/palmos/listctrl.cpp +++ b/src/palmos/listctrl.cpp @@ -38,79 +38,6 @@ #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() diff --git a/src/palmos/radiobut.cpp b/src/palmos/radiobut.cpp index de723d6607..63ed36a02b 100644 --- a/src/palmos/radiobut.cpp +++ b/src/palmos/radiobut.cpp @@ -43,62 +43,6 @@ // 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; diff --git a/src/palmos/scrolbar.cpp b/src/palmos/scrolbar.cpp index 2efee6c5dd..8bf618f88c 100644 --- a/src/palmos/scrolbar.cpp +++ b/src/palmos/scrolbar.cpp @@ -27,62 +27,6 @@ #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, diff --git a/src/palmos/slider.cpp b/src/palmos/slider.cpp index 9caf2d290d..9db9fa3679 100644 --- a/src/palmos/slider.cpp +++ b/src/palmos/slider.cpp @@ -29,73 +29,6 @@ #include #include -#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() { diff --git a/src/palmos/spinbutt.cpp b/src/palmos/spinbutt.cpp index abd6314509..9b2425d350 100644 --- a/src/palmos/spinbutt.cpp +++ b/src/palmos/spinbutt.cpp @@ -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 // ---------------------------------------------------------------------------- diff --git a/src/palmos/spinctrl.cpp b/src/palmos/spinctrl.cpp index 3c29544ccb..166e0e6a6b 100644 --- a/src/palmos/spinctrl.cpp +++ b/src/palmos/spinctrl.cpp @@ -39,71 +39,6 @@ // 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) diff --git a/src/palmos/statbmp.cpp b/src/palmos/statbmp.cpp index 2546840061..e16b906f6e 100644 --- a/src/palmos/statbmp.cpp +++ b/src/palmos/statbmp.cpp @@ -39,59 +39,6 @@ // 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 // =========================================================================== diff --git a/src/palmos/statbox.cpp b/src/palmos/statbox.cpp index eab2e378b2..0b6d350985 100644 --- a/src/palmos/statbox.cpp +++ b/src/palmos/statbox.cpp @@ -39,58 +39,6 @@ // 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 // ============================================================================ diff --git a/src/palmos/statline.cpp b/src/palmos/statline.cpp index eeed178c84..dce02bfd1e 100644 --- a/src/palmos/statline.cpp +++ b/src/palmos/statline.cpp @@ -46,62 +46,6 @@ // 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 // ---------------------------------------------------------------------------- diff --git a/src/palmos/stattext.cpp b/src/palmos/stattext.cpp index 413c259f14..8147bf2525 100644 --- a/src/palmos/stattext.cpp +++ b/src/palmos/stattext.cpp @@ -28,59 +28,6 @@ #include -#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, diff --git a/src/palmos/textctrl.cpp b/src/palmos/textctrl.cpp index febb66a683..40645d5f41 100644 --- a/src/palmos/textctrl.cpp +++ b/src/palmos/textctrl.cpp @@ -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) diff --git a/src/palmos/treectrl.cpp b/src/palmos/treectrl.cpp index bf2efa8613..b7f12e18c0 100644 --- a/src/palmos/treectrl.cpp +++ b/src/palmos/treectrl.cpp @@ -66,70 +66,6 @@ // 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 // ---------------------------------------------------------------------------- diff --git a/src/palmos/window.cpp b/src/palmos/window.cpp index 144ad5b112..ca7d5955e3 100644 --- a/src/palmos/window.cpp +++ b/src/palmos/window.cpp @@ -95,112 +95,7 @@ // 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( 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) diff --git a/src/univ/bmpbuttn.cpp b/src/univ/bmpbuttn.cpp index eb4faa5584..f21e6aa2f7 100644 --- a/src/univ/bmpbuttn.cpp +++ b/src/univ/bmpbuttn.cpp @@ -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) diff --git a/src/univ/button.cpp b/src/univ/button.cpp index 4d9a843084..788196ca61 100644 --- a/src/univ/button.cpp +++ b/src/univ/button.cpp @@ -79,8 +79,6 @@ static const wxCoord DEFAULT_BTN_MARGIN_Y = 0; // implementation // ============================================================================ -IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl) - // ---------------------------------------------------------------------------- // creation // ---------------------------------------------------------------------------- diff --git a/src/univ/checkbox.cpp b/src/univ/checkbox.cpp index d92d93808e..d07f1ad561 100644 --- a/src/univ/checkbox.cpp +++ b/src/univ/checkbox.cpp @@ -59,8 +59,6 @@ public: // implementation // ============================================================================ -IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl) - // ---------------------------------------------------------------------------- // wxCheckBox // ---------------------------------------------------------------------------- diff --git a/src/univ/choice.cpp b/src/univ/choice.cpp index d1d5312f36..5bb5b0020b 100644 --- a/src/univ/choice.cpp +++ b/src/univ/choice.cpp @@ -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() diff --git a/src/univ/dialog.cpp b/src/univ/dialog.cpp index fbb8423f7b..9adf6a99b8 100644 --- a/src/univ/dialog.cpp +++ b/src/univ/dialog.cpp @@ -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; diff --git a/src/univ/framuniv.cpp b/src/univ/framuniv.cpp index cb7aa42d0b..67a653c8cc 100644 --- a/src/univ/framuniv.cpp +++ b/src/univ/framuniv.cpp @@ -42,8 +42,6 @@ BEGIN_EVENT_TABLE(wxFrame, wxFrameBase) EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged) END_EVENT_TABLE() -IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow) - // ---------------------------------------------------------------------------- // ctors // ---------------------------------------------------------------------------- diff --git a/src/univ/gauge.cpp b/src/univ/gauge.cpp index 28f84a4908..f34de9ab82 100644 --- a/src/univ/gauge.cpp +++ b/src/univ/gauge.cpp @@ -33,8 +33,6 @@ #include "wx/univ/renderer.h" -IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl) - // ============================================================================ // implementation // ============================================================================ diff --git a/src/univ/listbox.cpp b/src/univ/listbox.cpp index 520ae86b20..147ebfb148 100644 --- a/src/univ/listbox.cpp +++ b/src/univ/listbox.cpp @@ -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() diff --git a/src/univ/radiobut.cpp b/src/univ/radiobut.cpp index 41958ea779..cf209a4397 100644 --- a/src/univ/radiobut.cpp +++ b/src/univ/radiobut.cpp @@ -41,8 +41,6 @@ // implementation // ============================================================================ -IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl) - // ---------------------------------------------------------------------------- // wxRadioButton // ---------------------------------------------------------------------------- diff --git a/src/univ/scrolbar.cpp b/src/univ/scrolbar.cpp index 13c3570f79..ff451e18fc 100644 --- a/src/univ/scrolbar.cpp +++ b/src/univ/scrolbar.cpp @@ -74,8 +74,6 @@ private: // implementation // ============================================================================ -IMPLEMENT_DYNAMIC_CLASS(wxScrollBar, wxControl) - BEGIN_EVENT_TABLE(wxScrollBar, wxScrollBarBase) END_EVENT_TABLE() diff --git a/src/univ/slider.cpp b/src/univ/slider.cpp index 8dbb9abf00..431707a095 100644 --- a/src/univ/slider.cpp +++ b/src/univ/slider.cpp @@ -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() diff --git a/src/univ/spinbutt.cpp b/src/univ/spinbutt.cpp index e1d885795b..499f53a1ec 100644 --- a/src/univ/spinbutt.cpp +++ b/src/univ/spinbutt.cpp @@ -38,9 +38,6 @@ // implementation of wxSpinButton // ============================================================================ -IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent) -IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl) - // ---------------------------------------------------------------------------- // creation // ---------------------------------------------------------------------------- diff --git a/src/univ/statbmp.cpp b/src/univ/statbmp.cpp index 6059a8ab2e..5ff0f72ab6 100644 --- a/src/univ/statbmp.cpp +++ b/src/univ/statbmp.cpp @@ -40,8 +40,6 @@ // implementation // ============================================================================ -IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl) - // ---------------------------------------------------------------------------- // wxStaticBitmap // ---------------------------------------------------------------------------- diff --git a/src/univ/statbox.cpp b/src/univ/statbox.cpp index 773f542217..1241fe2638 100644 --- a/src/univ/statbox.cpp +++ b/src/univ/statbox.cpp @@ -37,8 +37,6 @@ // implementation // ============================================================================ -IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl) - // ---------------------------------------------------------------------------- // wxStaticBox // ---------------------------------------------------------------------------- diff --git a/src/univ/statline.cpp b/src/univ/statline.cpp index dfdac47862..980af6185a 100644 --- a/src/univ/statline.cpp +++ b/src/univ/statline.cpp @@ -38,8 +38,6 @@ // implementation // ============================================================================ -IMPLEMENT_DYNAMIC_CLASS(wxStaticLine, wxControl) - // ---------------------------------------------------------------------------- // wxStaticLine // ---------------------------------------------------------------------------- diff --git a/src/univ/textctrl.cpp b/src/univ/textctrl.cpp index 23573fcdd1..041ea21d51 100644 --- a/src/univ/textctrl.cpp +++ b/src/univ/textctrl.cpp @@ -633,8 +633,6 @@ BEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase) EVT_SIZE(wxTextCtrl::OnSize) END_EVENT_TABLE() -IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxTextCtrlBase) - // ---------------------------------------------------------------------------- // creation // ---------------------------------------------------------------------------- diff --git a/src/x11/colour.cpp b/src/x11/colour.cpp index 53ceebfce9..671c3b010f 100644 --- a/src/x11/colour.cpp +++ b/src/x11/colour.cpp @@ -141,8 +141,6 @@ void wxColourRefData::AllocColour( WXColormap cmap ) #define SHIFT (8*(sizeof(short int)-sizeof(char))) -IMPLEMENT_DYNAMIC_CLASS(wxColour,wxGDIObject) - wxColour::~wxColour() { } diff --git a/src/x11/textctrl.cpp b/src/x11/textctrl.cpp index 9cb8938945..e25156a2b2 100644 --- a/src/x11/textctrl.cpp +++ b/src/x11/textctrl.cpp @@ -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) -- 2.45.2