diff --git a/Makefile.in b/Makefile.in index c578633026..d76dad451a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -2969,6 +2969,7 @@ COND_TOOLKIT_MSW_GUI_HDR = \ wx/msw/radiobut.h \ wx/msw/region.h \ wx/msw/rcdefs.h \ + wx/msw/richmsgdlg.h \ wx/msw/scrolbar.h \ wx/msw/setup0.h \ wx/msw/slider.h \ @@ -3491,6 +3492,7 @@ COND_TOOLKIT_WINCE_GUI_HDR = \ wx/msw/radiobut.h \ wx/msw/region.h \ wx/msw/rcdefs.h \ + wx/msw/richmsgdlg.h \ wx/msw/scrolbar.h \ wx/msw/setup0.h \ wx/msw/slider.h \ @@ -3846,6 +3848,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS = \ wx/generic/prntdlgg.h \ wx/generic/printps.h \ wx/generic/progdlgg.h \ + wx/generic/richmsgdlgg.h \ wx/generic/scrolwin.h \ wx/generic/spinctlg.h \ wx/generic/splitter.h \ @@ -3877,6 +3880,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS = \ wx/radiobut.h \ wx/rearrangectrl.h \ wx/renderer.h \ + wx/richmsgdlg.h \ wx/scrolbar.h \ wx/scrolbar.h \ wx/scrolwin.h \ @@ -4549,11 +4553,13 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS = \ monodll_generic_infobar.o \ monodll_listbkg.o \ monodll_logg.o \ + monodll_msgdlgg.o \ monodll_numdlgg.o \ monodll_panelg.o \ monodll_progdlgg.o \ monodll_printps.o \ monodll_renderg.o \ + monodll_richmsgdlgg.o \ monodll_scrlwing.o \ monodll_selstore.o \ monodll_spinctlg.o \ @@ -4584,7 +4590,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS = \ monodll_fontpickerg.o \ monodll_generic_listctrl.o \ monodll_mdig.o \ - monodll_msgdlgg.o \ monodll_prntdlgg.o \ monodll_univ_bmpbuttn.o \ monodll_univ_button.o \ @@ -4747,11 +4752,13 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS = \ monodll_generic_infobar.o \ monodll_listbkg.o \ monodll_logg.o \ + monodll_msgdlgg.o \ monodll_numdlgg.o \ monodll_panelg.o \ monodll_progdlgg.o \ monodll_printps.o \ monodll_renderg.o \ + monodll_richmsgdlgg.o \ monodll_scrlwing.o \ monodll_selstore.o \ monodll_spinctlg.o \ @@ -5160,7 +5167,6 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS = \ monodll_fontpickerg.o \ monodll_generic_imaglist.o \ monodll_generic_listctrl.o \ - monodll_msgdlgg.o \ monodll_paletteg.o \ monodll_regiong.o \ monodll_generic_statusbr.o @@ -5177,7 +5183,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS = \ monodll_fontdlgg.o \ monodll_fontpickerg.o \ monodll_generic_listctrl.o \ - monodll_msgdlgg.o \ monodll_prntdlgg.o \ monodll_generic_statusbr.o \ monodll_gtk1_bmpbuttn.o \ @@ -5219,7 +5224,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS = \ monodll_prntdlgg.o \ monodll_generic_statusbr.o \ monodll_fontdlgg.o \ - monodll_msgdlgg.o \ monodll_artgtk.o \ monodll_gtk_bmpbuttn.o \ monodll_gtk_button.o \ @@ -5375,6 +5379,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS = \ monodll_msw_ownerdrw.o \ monodll_msw_radiobox.o \ monodll_msw_radiobut.o \ + monodll_richmsgdlg.o \ monodll_msw_scrolbar.o \ monodll_msw_slider.o \ monodll_msw_spinbutt.o \ @@ -5610,6 +5615,7 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS = \ monodll_msw_ownerdrw.o \ monodll_msw_radiobox.o \ monodll_msw_radiobut.o \ + monodll_richmsgdlg.o \ monodll_msw_scrolbar.o \ monodll_msw_slider.o \ monodll_msw_spinbutt.o \ @@ -6419,11 +6425,13 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 = \ monolib_generic_infobar.o \ monolib_listbkg.o \ monolib_logg.o \ + monolib_msgdlgg.o \ monolib_numdlgg.o \ monolib_panelg.o \ monolib_progdlgg.o \ monolib_printps.o \ monolib_renderg.o \ + monolib_richmsgdlgg.o \ monolib_scrlwing.o \ monolib_selstore.o \ monolib_spinctlg.o \ @@ -6454,7 +6462,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 = \ monolib_fontpickerg.o \ monolib_generic_listctrl.o \ monolib_mdig.o \ - monolib_msgdlgg.o \ monolib_prntdlgg.o \ monolib_univ_bmpbuttn.o \ monolib_univ_button.o \ @@ -6617,11 +6624,13 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 = \ monolib_generic_infobar.o \ monolib_listbkg.o \ monolib_logg.o \ + monolib_msgdlgg.o \ monolib_numdlgg.o \ monolib_panelg.o \ monolib_progdlgg.o \ monolib_printps.o \ monolib_renderg.o \ + monolib_richmsgdlgg.o \ monolib_scrlwing.o \ monolib_selstore.o \ monolib_spinctlg.o \ @@ -7030,7 +7039,6 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_1 = \ monolib_fontpickerg.o \ monolib_generic_imaglist.o \ monolib_generic_listctrl.o \ - monolib_msgdlgg.o \ monolib_paletteg.o \ monolib_regiong.o \ monolib_generic_statusbr.o @@ -7047,7 +7055,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_1 = \ monolib_fontdlgg.o \ monolib_fontpickerg.o \ monolib_generic_listctrl.o \ - monolib_msgdlgg.o \ monolib_prntdlgg.o \ monolib_generic_statusbr.o \ monolib_gtk1_bmpbuttn.o \ @@ -7089,7 +7096,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_1 = \ monolib_prntdlgg.o \ monolib_generic_statusbr.o \ monolib_fontdlgg.o \ - monolib_msgdlgg.o \ monolib_artgtk.o \ monolib_gtk_bmpbuttn.o \ monolib_gtk_button.o \ @@ -7245,6 +7251,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_1 = \ monolib_msw_ownerdrw.o \ monolib_msw_radiobox.o \ monolib_msw_radiobut.o \ + monolib_richmsgdlg.o \ monolib_msw_scrolbar.o \ monolib_msw_slider.o \ monolib_msw_spinbutt.o \ @@ -7480,6 +7487,7 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_1 = \ monolib_msw_ownerdrw.o \ monolib_msw_radiobox.o \ monolib_msw_radiobut.o \ + monolib_richmsgdlg.o \ monolib_msw_scrolbar.o \ monolib_msw_slider.o \ monolib_msw_spinbutt.o \ @@ -8476,11 +8484,13 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 = \ coredll_generic_infobar.o \ coredll_listbkg.o \ coredll_logg.o \ + coredll_msgdlgg.o \ coredll_numdlgg.o \ coredll_panelg.o \ coredll_progdlgg.o \ coredll_printps.o \ coredll_renderg.o \ + coredll_richmsgdlgg.o \ coredll_scrlwing.o \ coredll_selstore.o \ coredll_spinctlg.o \ @@ -8511,7 +8521,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 = \ coredll_fontpickerg.o \ coredll_generic_listctrl.o \ coredll_mdig.o \ - coredll_msgdlgg.o \ coredll_prntdlgg.o \ coredll_univ_bmpbuttn.o \ coredll_univ_button.o \ @@ -8674,11 +8683,13 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 = \ coredll_generic_infobar.o \ coredll_listbkg.o \ coredll_logg.o \ + coredll_msgdlgg.o \ coredll_numdlgg.o \ coredll_panelg.o \ coredll_progdlgg.o \ coredll_printps.o \ coredll_renderg.o \ + coredll_richmsgdlgg.o \ coredll_scrlwing.o \ coredll_selstore.o \ coredll_spinctlg.o \ @@ -9087,7 +9098,6 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_2 = \ coredll_fontpickerg.o \ coredll_generic_imaglist.o \ coredll_generic_listctrl.o \ - coredll_msgdlgg.o \ coredll_paletteg.o \ coredll_regiong.o \ coredll_generic_statusbr.o @@ -9104,7 +9114,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_2 = \ coredll_fontdlgg.o \ coredll_fontpickerg.o \ coredll_generic_listctrl.o \ - coredll_msgdlgg.o \ coredll_prntdlgg.o \ coredll_generic_statusbr.o \ coredll_gtk1_bmpbuttn.o \ @@ -9146,7 +9155,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_2 = \ coredll_prntdlgg.o \ coredll_generic_statusbr.o \ coredll_fontdlgg.o \ - coredll_msgdlgg.o \ coredll_artgtk.o \ coredll_gtk_bmpbuttn.o \ coredll_gtk_button.o \ @@ -9302,6 +9310,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_2 = \ coredll_msw_ownerdrw.o \ coredll_msw_radiobox.o \ coredll_msw_radiobut.o \ + coredll_richmsgdlg.o \ coredll_msw_scrolbar.o \ coredll_msw_slider.o \ coredll_msw_spinbutt.o \ @@ -9537,6 +9546,7 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_2 = \ coredll_msw_ownerdrw.o \ coredll_msw_radiobox.o \ coredll_msw_radiobut.o \ + coredll_richmsgdlg.o \ coredll_msw_scrolbar.o \ coredll_msw_slider.o \ coredll_msw_spinbutt.o \ @@ -10017,11 +10027,13 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 = \ corelib_generic_infobar.o \ corelib_listbkg.o \ corelib_logg.o \ + corelib_msgdlgg.o \ corelib_numdlgg.o \ corelib_panelg.o \ corelib_progdlgg.o \ corelib_printps.o \ corelib_renderg.o \ + corelib_richmsgdlgg.o \ corelib_scrlwing.o \ corelib_selstore.o \ corelib_spinctlg.o \ @@ -10052,7 +10064,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 = \ corelib_fontpickerg.o \ corelib_generic_listctrl.o \ corelib_mdig.o \ - corelib_msgdlgg.o \ corelib_prntdlgg.o \ corelib_univ_bmpbuttn.o \ corelib_univ_button.o \ @@ -10215,11 +10226,13 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 = \ corelib_generic_infobar.o \ corelib_listbkg.o \ corelib_logg.o \ + corelib_msgdlgg.o \ corelib_numdlgg.o \ corelib_panelg.o \ corelib_progdlgg.o \ corelib_printps.o \ corelib_renderg.o \ + corelib_richmsgdlgg.o \ corelib_scrlwing.o \ corelib_selstore.o \ corelib_spinctlg.o \ @@ -10628,7 +10641,6 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_3 = \ corelib_fontpickerg.o \ corelib_generic_imaglist.o \ corelib_generic_listctrl.o \ - corelib_msgdlgg.o \ corelib_paletteg.o \ corelib_regiong.o \ corelib_generic_statusbr.o @@ -10645,7 +10657,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_3 = \ corelib_fontdlgg.o \ corelib_fontpickerg.o \ corelib_generic_listctrl.o \ - corelib_msgdlgg.o \ corelib_prntdlgg.o \ corelib_generic_statusbr.o \ corelib_gtk1_bmpbuttn.o \ @@ -10687,7 +10698,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_3 = \ corelib_prntdlgg.o \ corelib_generic_statusbr.o \ corelib_fontdlgg.o \ - corelib_msgdlgg.o \ corelib_artgtk.o \ corelib_gtk_bmpbuttn.o \ corelib_gtk_button.o \ @@ -10843,6 +10853,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_3 = \ corelib_msw_ownerdrw.o \ corelib_msw_radiobox.o \ corelib_msw_radiobut.o \ + corelib_richmsgdlg.o \ corelib_msw_scrolbar.o \ corelib_msw_slider.o \ corelib_msw_spinbutt.o \ @@ -11078,6 +11089,7 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_3 = \ corelib_msw_ownerdrw.o \ corelib_msw_radiobox.o \ corelib_msw_radiobut.o \ + corelib_richmsgdlg.o \ corelib_msw_scrolbar.o \ corelib_msw_slider.o \ corelib_msw_spinbutt.o \ @@ -18531,18 +18543,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_USE_GUI_1_WXUNIV_1@monodll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONODLL_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/msgdlgg.cpp - -@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/msgdlgg.cpp - -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/msgdlgg.cpp - -@COND_USE_GUI_1_WXUNIV_1@monodll_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp $(MONODLL_ODEP) -@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/msgdlgg.cpp - @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp @@ -18900,6 +18900,12 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_radiobut.o: $(srcdir)/src/msw/radiobut.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/radiobut.cpp +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_richmsgdlg.o: $(srcdir)/src/msw/richmsgdlg.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/richmsgdlg.cpp + +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_richmsgdlg.o: $(srcdir)/src/msw/richmsgdlg.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/richmsgdlg.cpp + @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_scrolbar.o: $(srcdir)/src/msw/scrolbar.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/scrolbar.cpp @@ -19872,6 +19878,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@monodll_logg.o: $(srcdir)/src/generic/logg.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/logg.cpp +@COND_USE_GUI_1@monodll_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp $(MONODLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/msgdlgg.cpp + @COND_USE_GUI_1@monodll_numdlgg.o: $(srcdir)/src/generic/numdlgg.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/numdlgg.cpp @@ -19887,6 +19896,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@monodll_renderg.o: $(srcdir)/src/generic/renderg.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/renderg.cpp +@COND_USE_GUI_1@monodll_richmsgdlgg.o: $(srcdir)/src/generic/richmsgdlgg.cpp $(MONODLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/richmsgdlgg.cpp + @COND_USE_GUI_1@monodll_scrlwing.o: $(srcdir)/src/generic/scrlwing.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/scrlwing.cpp @@ -23748,18 +23760,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1_WXUNIV_1@monolib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/msgdlgg.cpp - -@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/msgdlgg.cpp - -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/msgdlgg.cpp - -@COND_USE_GUI_1_WXUNIV_1@monolib_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp $(MONOLIB_ODEP) -@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/msgdlgg.cpp - @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp @@ -24117,6 +24117,12 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_radiobut.o: $(srcdir)/src/msw/radiobut.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/radiobut.cpp +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_richmsgdlg.o: $(srcdir)/src/msw/richmsgdlg.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/richmsgdlg.cpp + +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_richmsgdlg.o: $(srcdir)/src/msw/richmsgdlg.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/richmsgdlg.cpp + @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_scrolbar.o: $(srcdir)/src/msw/scrolbar.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/scrolbar.cpp @@ -25089,6 +25095,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@monolib_logg.o: $(srcdir)/src/generic/logg.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/logg.cpp +@COND_USE_GUI_1@monolib_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp $(MONOLIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/msgdlgg.cpp + @COND_USE_GUI_1@monolib_numdlgg.o: $(srcdir)/src/generic/numdlgg.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/numdlgg.cpp @@ -25104,6 +25113,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@monolib_renderg.o: $(srcdir)/src/generic/renderg.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/renderg.cpp +@COND_USE_GUI_1@monolib_richmsgdlgg.o: $(srcdir)/src/generic/richmsgdlgg.cpp $(MONOLIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/richmsgdlgg.cpp + @COND_USE_GUI_1@monolib_scrlwing.o: $(srcdir)/src/generic/scrlwing.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/scrlwing.cpp @@ -29151,18 +29163,6 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_USE_GUI_1_WXUNIV_1@coredll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(COREDLL_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/msgdlgg.cpp - -@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/msgdlgg.cpp - -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/msgdlgg.cpp - -@COND_USE_GUI_1_WXUNIV_1@coredll_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp $(COREDLL_ODEP) -@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/msgdlgg.cpp - @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(COREDLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp @@ -29520,6 +29520,12 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_radiobut.o: $(srcdir)/src/msw/radiobut.cpp $(COREDLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/radiobut.cpp +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_richmsgdlg.o: $(srcdir)/src/msw/richmsgdlg.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/richmsgdlg.cpp + +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_richmsgdlg.o: $(srcdir)/src/msw/richmsgdlg.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/richmsgdlg.cpp + @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_scrolbar.o: $(srcdir)/src/msw/scrolbar.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/scrolbar.cpp @@ -30492,6 +30498,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@coredll_logg.o: $(srcdir)/src/generic/logg.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/logg.cpp +@COND_USE_GUI_1@coredll_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp $(COREDLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/msgdlgg.cpp + @COND_USE_GUI_1@coredll_numdlgg.o: $(srcdir)/src/generic/numdlgg.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/numdlgg.cpp @@ -30507,6 +30516,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@coredll_renderg.o: $(srcdir)/src/generic/renderg.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/renderg.cpp +@COND_USE_GUI_1@coredll_richmsgdlgg.o: $(srcdir)/src/generic/richmsgdlgg.cpp $(COREDLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/richmsgdlgg.cpp + @COND_USE_GUI_1@coredll_scrlwing.o: $(srcdir)/src/generic/scrlwing.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/scrlwing.cpp @@ -33069,18 +33081,6 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_USE_GUI_1_WXUNIV_1@corelib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(CORELIB_ODEP) @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/msgdlgg.cpp - -@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/msgdlgg.cpp - -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/msgdlgg.cpp - -@COND_USE_GUI_1_WXUNIV_1@corelib_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp $(CORELIB_ODEP) -@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/msgdlgg.cpp - @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(CORELIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp @@ -33438,6 +33438,12 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_radiobut.o: $(srcdir)/src/msw/radiobut.cpp $(CORELIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/radiobut.cpp +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_richmsgdlg.o: $(srcdir)/src/msw/richmsgdlg.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/richmsgdlg.cpp + +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_richmsgdlg.o: $(srcdir)/src/msw/richmsgdlg.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/richmsgdlg.cpp + @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_scrolbar.o: $(srcdir)/src/msw/scrolbar.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/scrolbar.cpp @@ -34410,6 +34416,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@corelib_logg.o: $(srcdir)/src/generic/logg.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/logg.cpp +@COND_USE_GUI_1@corelib_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp $(CORELIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/msgdlgg.cpp + @COND_USE_GUI_1@corelib_numdlgg.o: $(srcdir)/src/generic/numdlgg.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/numdlgg.cpp @@ -34425,6 +34434,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@corelib_renderg.o: $(srcdir)/src/generic/renderg.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/renderg.cpp +@COND_USE_GUI_1@corelib_richmsgdlgg.o: $(srcdir)/src/generic/richmsgdlgg.cpp $(CORELIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/richmsgdlgg.cpp + @COND_USE_GUI_1@corelib_scrlwing.o: $(srcdir)/src/generic/scrlwing.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/scrlwing.cpp diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index 93848a08b3..57af655284 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -759,11 +759,13 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/generic/infobar.cpp src/generic/listbkg.cpp src/generic/logg.cpp + src/generic/msgdlgg.cpp src/generic/numdlgg.cpp src/generic/panelg.cpp src/generic/progdlgg.cpp src/generic/printps.cpp src/generic/renderg.cpp + src/generic/richmsgdlgg.cpp src/generic/scrlwing.cpp src/generic/selstore.cpp src/generic/spinctlg.cpp @@ -830,6 +832,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/generic/prntdlgg.h wx/generic/printps.h wx/generic/progdlgg.h + wx/generic/richmsgdlgg.h wx/generic/scrolwin.h wx/generic/spinctlg.h wx/generic/splitter.h @@ -861,6 +864,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/radiobut.h wx/rearrangectrl.h wx/renderer.h + wx/richmsgdlg.h wx/scrolbar.h wx/scrolbar.h wx/scrolwin.h @@ -1105,7 +1109,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/generic/statusbr.cpp src/generic/fontdlgg.cpp - src/generic/msgdlgg.cpp src/gtk/artgtk.cpp src/gtk/bmpbuttn.cpp @@ -1289,7 +1292,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/generic/fontdlgg.cpp src/generic/fontpickerg.cpp src/generic/listctrl.cpp - src/generic/msgdlgg.cpp src/generic/prntdlgg.cpp src/generic/statusbr.cpp @@ -1718,6 +1720,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/msw/ownerdrw.cpp src/msw/radiobox.cpp src/msw/radiobut.cpp + src/msw/richmsgdlg.cpp src/msw/scrolbar.cpp src/msw/slider.cpp src/msw/spinbutt.cpp @@ -1803,6 +1806,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/msw/radiobut.h wx/msw/region.h wx/msw/rcdefs.h + wx/msw/richmsgdlg.h wx/msw/scrolbar.h wx/msw/setup0.h wx/msw/slider.h @@ -2669,7 +2673,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/generic/fontpickerg.cpp src/generic/imaglist.cpp src/generic/listctrl.cpp - src/generic/msgdlgg.cpp src/generic/paletteg.cpp src/generic/regiong.cpp src/generic/statusbr.cpp @@ -2790,7 +2793,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/generic/fontpickerg.cpp src/generic/listctrl.cpp src/generic/mdig.cpp - src/generic/msgdlgg.cpp src/generic/prntdlgg.cpp src/univ/bmpbuttn.cpp src/univ/button.cpp diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc index f79ae2cdf4..b97cf98576 100644 --- a/build/msw/makefile.bcc +++ b/build/msw/makefile.bcc @@ -1755,6 +1755,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_ownerdrw.obj \ $(OBJS)\monodll_msw_radiobox.obj \ $(OBJS)\monodll_msw_radiobut.obj \ + $(OBJS)\monodll_richmsgdlg.obj \ $(OBJS)\monodll_msw_scrolbar.obj \ $(OBJS)\monodll_msw_slider.obj \ $(OBJS)\monodll_msw_spinbutt.obj \ @@ -1894,11 +1895,13 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_infobar.obj \ $(OBJS)\monodll_listbkg.obj \ $(OBJS)\monodll_logg.obj \ + $(OBJS)\monodll_msgdlgg.obj \ $(OBJS)\monodll_numdlgg.obj \ $(OBJS)\monodll_panelg.obj \ $(OBJS)\monodll_progdlgg.obj \ $(OBJS)\monodll_printps.obj \ $(OBJS)\monodll_renderg.obj \ + $(OBJS)\monodll_richmsgdlgg.obj \ $(OBJS)\monodll_scrlwing.obj \ $(OBJS)\monodll_selstore.obj \ $(OBJS)\monodll_spinctlg.obj \ @@ -1977,7 +1980,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_fontpickerg.obj \ $(OBJS)\monodll_generic_listctrl.obj \ $(OBJS)\monodll_mdig.obj \ - $(OBJS)\monodll_msgdlgg.obj \ $(OBJS)\monodll_prntdlgg.obj \ $(OBJS)\monodll_univ_bmpbuttn.obj \ $(OBJS)\monodll_univ_button.obj \ @@ -2140,11 +2142,13 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_infobar.obj \ $(OBJS)\monodll_listbkg.obj \ $(OBJS)\monodll_logg.obj \ + $(OBJS)\monodll_msgdlgg.obj \ $(OBJS)\monodll_numdlgg.obj \ $(OBJS)\monodll_panelg.obj \ $(OBJS)\monodll_progdlgg.obj \ $(OBJS)\monodll_printps.obj \ $(OBJS)\monodll_renderg.obj \ + $(OBJS)\monodll_richmsgdlgg.obj \ $(OBJS)\monodll_scrlwing.obj \ $(OBJS)\monodll_selstore.obj \ $(OBJS)\monodll_spinctlg.obj \ @@ -2470,6 +2474,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_ownerdrw.obj \ $(OBJS)\monolib_msw_radiobox.obj \ $(OBJS)\monolib_msw_radiobut.obj \ + $(OBJS)\monolib_richmsgdlg.obj \ $(OBJS)\monolib_msw_scrolbar.obj \ $(OBJS)\monolib_msw_slider.obj \ $(OBJS)\monolib_msw_spinbutt.obj \ @@ -2609,11 +2614,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_infobar.obj \ $(OBJS)\monolib_listbkg.obj \ $(OBJS)\monolib_logg.obj \ + $(OBJS)\monolib_msgdlgg.obj \ $(OBJS)\monolib_numdlgg.obj \ $(OBJS)\monolib_panelg.obj \ $(OBJS)\monolib_progdlgg.obj \ $(OBJS)\monolib_printps.obj \ $(OBJS)\monolib_renderg.obj \ + $(OBJS)\monolib_richmsgdlgg.obj \ $(OBJS)\monolib_scrlwing.obj \ $(OBJS)\monolib_selstore.obj \ $(OBJS)\monolib_spinctlg.obj \ @@ -2692,7 +2699,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_fontpickerg.obj \ $(OBJS)\monolib_generic_listctrl.obj \ $(OBJS)\monolib_mdig.obj \ - $(OBJS)\monolib_msgdlgg.obj \ $(OBJS)\monolib_prntdlgg.obj \ $(OBJS)\monolib_univ_bmpbuttn.obj \ $(OBJS)\monolib_univ_button.obj \ @@ -2855,11 +2861,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_infobar.obj \ $(OBJS)\monolib_listbkg.obj \ $(OBJS)\monolib_logg.obj \ + $(OBJS)\monolib_msgdlgg.obj \ $(OBJS)\monolib_numdlgg.obj \ $(OBJS)\monolib_panelg.obj \ $(OBJS)\monolib_progdlgg.obj \ $(OBJS)\monolib_printps.obj \ $(OBJS)\monolib_renderg.obj \ + $(OBJS)\monolib_richmsgdlgg.obj \ $(OBJS)\monolib_scrlwing.obj \ $(OBJS)\monolib_selstore.obj \ $(OBJS)\monolib_spinctlg.obj \ @@ -3076,6 +3084,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_ownerdrw.obj \ $(OBJS)\coredll_msw_radiobox.obj \ $(OBJS)\coredll_msw_radiobut.obj \ + $(OBJS)\coredll_richmsgdlg.obj \ $(OBJS)\coredll_msw_scrolbar.obj \ $(OBJS)\coredll_msw_slider.obj \ $(OBJS)\coredll_msw_spinbutt.obj \ @@ -3215,11 +3224,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_infobar.obj \ $(OBJS)\coredll_listbkg.obj \ $(OBJS)\coredll_logg.obj \ + $(OBJS)\coredll_msgdlgg.obj \ $(OBJS)\coredll_numdlgg.obj \ $(OBJS)\coredll_panelg.obj \ $(OBJS)\coredll_progdlgg.obj \ $(OBJS)\coredll_printps.obj \ $(OBJS)\coredll_renderg.obj \ + $(OBJS)\coredll_richmsgdlgg.obj \ $(OBJS)\coredll_scrlwing.obj \ $(OBJS)\coredll_selstore.obj \ $(OBJS)\coredll_spinctlg.obj \ @@ -3298,7 +3309,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_fontpickerg.obj \ $(OBJS)\coredll_generic_listctrl.obj \ $(OBJS)\coredll_mdig.obj \ - $(OBJS)\coredll_msgdlgg.obj \ $(OBJS)\coredll_prntdlgg.obj \ $(OBJS)\coredll_univ_bmpbuttn.obj \ $(OBJS)\coredll_univ_button.obj \ @@ -3461,11 +3471,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_infobar.obj \ $(OBJS)\coredll_listbkg.obj \ $(OBJS)\coredll_logg.obj \ + $(OBJS)\coredll_msgdlgg.obj \ $(OBJS)\coredll_numdlgg.obj \ $(OBJS)\coredll_panelg.obj \ $(OBJS)\coredll_progdlgg.obj \ $(OBJS)\coredll_printps.obj \ $(OBJS)\coredll_renderg.obj \ + $(OBJS)\coredll_richmsgdlgg.obj \ $(OBJS)\coredll_scrlwing.obj \ $(OBJS)\coredll_selstore.obj \ $(OBJS)\coredll_spinctlg.obj \ @@ -3574,6 +3586,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_ownerdrw.obj \ $(OBJS)\corelib_msw_radiobox.obj \ $(OBJS)\corelib_msw_radiobut.obj \ + $(OBJS)\corelib_richmsgdlg.obj \ $(OBJS)\corelib_msw_scrolbar.obj \ $(OBJS)\corelib_msw_slider.obj \ $(OBJS)\corelib_msw_spinbutt.obj \ @@ -3713,11 +3726,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_infobar.obj \ $(OBJS)\corelib_listbkg.obj \ $(OBJS)\corelib_logg.obj \ + $(OBJS)\corelib_msgdlgg.obj \ $(OBJS)\corelib_numdlgg.obj \ $(OBJS)\corelib_panelg.obj \ $(OBJS)\corelib_progdlgg.obj \ $(OBJS)\corelib_printps.obj \ $(OBJS)\corelib_renderg.obj \ + $(OBJS)\corelib_richmsgdlgg.obj \ $(OBJS)\corelib_scrlwing.obj \ $(OBJS)\corelib_selstore.obj \ $(OBJS)\corelib_spinctlg.obj \ @@ -3796,7 +3811,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_fontpickerg.obj \ $(OBJS)\corelib_generic_listctrl.obj \ $(OBJS)\corelib_mdig.obj \ - $(OBJS)\corelib_msgdlgg.obj \ $(OBJS)\corelib_prntdlgg.obj \ $(OBJS)\corelib_univ_bmpbuttn.obj \ $(OBJS)\corelib_univ_button.obj \ @@ -3959,11 +3973,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_infobar.obj \ $(OBJS)\corelib_listbkg.obj \ $(OBJS)\corelib_logg.obj \ + $(OBJS)\corelib_msgdlgg.obj \ $(OBJS)\corelib_numdlgg.obj \ $(OBJS)\corelib_panelg.obj \ $(OBJS)\corelib_progdlgg.obj \ $(OBJS)\corelib_printps.obj \ $(OBJS)\corelib_renderg.obj \ + $(OBJS)\corelib_richmsgdlgg.obj \ $(OBJS)\corelib_scrlwing.obj \ $(OBJS)\corelib_selstore.obj \ $(OBJS)\corelib_spinctlg.obj \ @@ -6178,6 +6194,9 @@ $(OBJS)\monodll_msw_radiobox.obj: ..\..\src\msw\radiobox.cpp $(OBJS)\monodll_msw_radiobut.obj: ..\..\src\msw\radiobut.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\radiobut.cpp +$(OBJS)\monodll_richmsgdlg.obj: ..\..\src\msw\richmsgdlg.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\richmsgdlg.cpp + $(OBJS)\monodll_msw_scrolbar.obj: ..\..\src\msw\scrolbar.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\scrolbar.cpp @@ -6256,9 +6275,6 @@ $(OBJS)\monodll_generic_listctrl.obj: ..\..\src\generic\listctrl.cpp $(OBJS)\monodll_mdig.obj: ..\..\src\generic\mdig.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\mdig.cpp -$(OBJS)\monodll_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\msgdlgg.cpp - $(OBJS)\monodll_univ_bmpbuttn.obj: ..\..\src\univ\bmpbuttn.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\bmpbuttn.cpp @@ -7660,6 +7676,11 @@ $(OBJS)\monodll_logg.obj: ..\..\src\generic\logg.cpp !endif !if "$(USE_GUI)" == "1" +$(OBJS)\monodll_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\msgdlgg.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\monodll_numdlgg.obj: ..\..\src\generic\numdlgg.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\numdlgg.cpp !endif @@ -7685,6 +7706,11 @@ $(OBJS)\monodll_renderg.obj: ..\..\src\generic\renderg.cpp !endif !if "$(USE_GUI)" == "1" +$(OBJS)\monodll_richmsgdlgg.obj: ..\..\src\generic\richmsgdlgg.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\richmsgdlgg.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\monodll_scrlwing.obj: ..\..\src\generic\scrlwing.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\scrlwing.cpp !endif @@ -8400,6 +8426,9 @@ $(OBJS)\monolib_msw_radiobox.obj: ..\..\src\msw\radiobox.cpp $(OBJS)\monolib_msw_radiobut.obj: ..\..\src\msw\radiobut.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\radiobut.cpp +$(OBJS)\monolib_richmsgdlg.obj: ..\..\src\msw\richmsgdlg.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\richmsgdlg.cpp + $(OBJS)\monolib_msw_scrolbar.obj: ..\..\src\msw\scrolbar.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\scrolbar.cpp @@ -8478,9 +8507,6 @@ $(OBJS)\monolib_generic_listctrl.obj: ..\..\src\generic\listctrl.cpp $(OBJS)\monolib_mdig.obj: ..\..\src\generic\mdig.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\mdig.cpp -$(OBJS)\monolib_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\msgdlgg.cpp - $(OBJS)\monolib_univ_bmpbuttn.obj: ..\..\src\univ\bmpbuttn.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\bmpbuttn.cpp @@ -9882,6 +9908,11 @@ $(OBJS)\monolib_logg.obj: ..\..\src\generic\logg.cpp !endif !if "$(USE_GUI)" == "1" +$(OBJS)\monolib_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\msgdlgg.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\monolib_numdlgg.obj: ..\..\src\generic\numdlgg.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\numdlgg.cpp !endif @@ -9907,6 +9938,11 @@ $(OBJS)\monolib_renderg.obj: ..\..\src\generic\renderg.cpp !endif !if "$(USE_GUI)" == "1" +$(OBJS)\monolib_richmsgdlgg.obj: ..\..\src\generic\richmsgdlgg.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\richmsgdlgg.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\monolib_scrlwing.obj: ..\..\src\generic\scrlwing.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\scrlwing.cpp !endif @@ -11030,6 +11066,9 @@ $(OBJS)\coredll_msw_radiobox.obj: ..\..\src\msw\radiobox.cpp $(OBJS)\coredll_msw_radiobut.obj: ..\..\src\msw\radiobut.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\radiobut.cpp +$(OBJS)\coredll_richmsgdlg.obj: ..\..\src\msw\richmsgdlg.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\richmsgdlg.cpp + $(OBJS)\coredll_msw_scrolbar.obj: ..\..\src\msw\scrolbar.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\scrolbar.cpp @@ -11108,9 +11147,6 @@ $(OBJS)\coredll_generic_listctrl.obj: ..\..\src\generic\listctrl.cpp $(OBJS)\coredll_mdig.obj: ..\..\src\generic\mdig.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\mdig.cpp -$(OBJS)\coredll_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\msgdlgg.cpp - $(OBJS)\coredll_univ_bmpbuttn.obj: ..\..\src\univ\bmpbuttn.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\bmpbuttn.cpp @@ -12107,6 +12143,11 @@ $(OBJS)\coredll_logg.obj: ..\..\src\generic\logg.cpp !endif !if "$(USE_GUI)" == "1" +$(OBJS)\coredll_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\msgdlgg.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\coredll_numdlgg.obj: ..\..\src\generic\numdlgg.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\numdlgg.cpp !endif @@ -12132,6 +12173,11 @@ $(OBJS)\coredll_renderg.obj: ..\..\src\generic\renderg.cpp !endif !if "$(USE_GUI)" == "1" +$(OBJS)\coredll_richmsgdlgg.obj: ..\..\src\generic\richmsgdlgg.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\richmsgdlgg.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\coredll_scrlwing.obj: ..\..\src\generic\scrlwing.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\scrlwing.cpp !endif @@ -12327,6 +12373,9 @@ $(OBJS)\corelib_msw_radiobox.obj: ..\..\src\msw\radiobox.cpp $(OBJS)\corelib_msw_radiobut.obj: ..\..\src\msw\radiobut.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\radiobut.cpp +$(OBJS)\corelib_richmsgdlg.obj: ..\..\src\msw\richmsgdlg.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\richmsgdlg.cpp + $(OBJS)\corelib_msw_scrolbar.obj: ..\..\src\msw\scrolbar.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\scrolbar.cpp @@ -12405,9 +12454,6 @@ $(OBJS)\corelib_generic_listctrl.obj: ..\..\src\generic\listctrl.cpp $(OBJS)\corelib_mdig.obj: ..\..\src\generic\mdig.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\mdig.cpp -$(OBJS)\corelib_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\msgdlgg.cpp - $(OBJS)\corelib_univ_bmpbuttn.obj: ..\..\src\univ\bmpbuttn.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\bmpbuttn.cpp @@ -13404,6 +13450,11 @@ $(OBJS)\corelib_logg.obj: ..\..\src\generic\logg.cpp !endif !if "$(USE_GUI)" == "1" +$(OBJS)\corelib_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\msgdlgg.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\corelib_numdlgg.obj: ..\..\src\generic\numdlgg.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\numdlgg.cpp !endif @@ -13429,6 +13480,11 @@ $(OBJS)\corelib_renderg.obj: ..\..\src\generic\renderg.cpp !endif !if "$(USE_GUI)" == "1" +$(OBJS)\corelib_richmsgdlgg.obj: ..\..\src\generic\richmsgdlgg.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\richmsgdlgg.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\corelib_scrlwing.obj: ..\..\src\generic\scrlwing.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\scrlwing.cpp !endif diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc index 460e3a1ba8..17486f80eb 100644 --- a/build/msw/makefile.gcc +++ b/build/msw/makefile.gcc @@ -1766,6 +1766,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_ownerdrw.o \ $(OBJS)\monodll_msw_radiobox.o \ $(OBJS)\monodll_msw_radiobut.o \ + $(OBJS)\monodll_richmsgdlg.o \ $(OBJS)\monodll_msw_scrolbar.o \ $(OBJS)\monodll_msw_slider.o \ $(OBJS)\monodll_msw_spinbutt.o \ @@ -1905,11 +1906,13 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_infobar.o \ $(OBJS)\monodll_listbkg.o \ $(OBJS)\monodll_logg.o \ + $(OBJS)\monodll_msgdlgg.o \ $(OBJS)\monodll_numdlgg.o \ $(OBJS)\monodll_panelg.o \ $(OBJS)\monodll_progdlgg.o \ $(OBJS)\monodll_printps.o \ $(OBJS)\monodll_renderg.o \ + $(OBJS)\monodll_richmsgdlgg.o \ $(OBJS)\monodll_scrlwing.o \ $(OBJS)\monodll_selstore.o \ $(OBJS)\monodll_spinctlg.o \ @@ -1990,7 +1993,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_fontpickerg.o \ $(OBJS)\monodll_generic_listctrl.o \ $(OBJS)\monodll_mdig.o \ - $(OBJS)\monodll_msgdlgg.o \ $(OBJS)\monodll_prntdlgg.o \ $(OBJS)\monodll_univ_bmpbuttn.o \ $(OBJS)\monodll_univ_button.o \ @@ -2153,11 +2155,13 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_infobar.o \ $(OBJS)\monodll_listbkg.o \ $(OBJS)\monodll_logg.o \ + $(OBJS)\monodll_msgdlgg.o \ $(OBJS)\monodll_numdlgg.o \ $(OBJS)\monodll_panelg.o \ $(OBJS)\monodll_progdlgg.o \ $(OBJS)\monodll_printps.o \ $(OBJS)\monodll_renderg.o \ + $(OBJS)\monodll_richmsgdlgg.o \ $(OBJS)\monodll_scrlwing.o \ $(OBJS)\monodll_selstore.o \ $(OBJS)\monodll_spinctlg.o \ @@ -2487,6 +2491,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_ownerdrw.o \ $(OBJS)\monolib_msw_radiobox.o \ $(OBJS)\monolib_msw_radiobut.o \ + $(OBJS)\monolib_richmsgdlg.o \ $(OBJS)\monolib_msw_scrolbar.o \ $(OBJS)\monolib_msw_slider.o \ $(OBJS)\monolib_msw_spinbutt.o \ @@ -2626,11 +2631,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_infobar.o \ $(OBJS)\monolib_listbkg.o \ $(OBJS)\monolib_logg.o \ + $(OBJS)\monolib_msgdlgg.o \ $(OBJS)\monolib_numdlgg.o \ $(OBJS)\monolib_panelg.o \ $(OBJS)\monolib_progdlgg.o \ $(OBJS)\monolib_printps.o \ $(OBJS)\monolib_renderg.o \ + $(OBJS)\monolib_richmsgdlgg.o \ $(OBJS)\monolib_scrlwing.o \ $(OBJS)\monolib_selstore.o \ $(OBJS)\monolib_spinctlg.o \ @@ -2711,7 +2718,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_fontpickerg.o \ $(OBJS)\monolib_generic_listctrl.o \ $(OBJS)\monolib_mdig.o \ - $(OBJS)\monolib_msgdlgg.o \ $(OBJS)\monolib_prntdlgg.o \ $(OBJS)\monolib_univ_bmpbuttn.o \ $(OBJS)\monolib_univ_button.o \ @@ -2874,11 +2880,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_infobar.o \ $(OBJS)\monolib_listbkg.o \ $(OBJS)\monolib_logg.o \ + $(OBJS)\monolib_msgdlgg.o \ $(OBJS)\monolib_numdlgg.o \ $(OBJS)\monolib_panelg.o \ $(OBJS)\monolib_progdlgg.o \ $(OBJS)\monolib_printps.o \ $(OBJS)\monolib_renderg.o \ + $(OBJS)\monolib_richmsgdlgg.o \ $(OBJS)\monolib_scrlwing.o \ $(OBJS)\monolib_selstore.o \ $(OBJS)\monolib_spinctlg.o \ @@ -3109,6 +3117,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_ownerdrw.o \ $(OBJS)\coredll_msw_radiobox.o \ $(OBJS)\coredll_msw_radiobut.o \ + $(OBJS)\coredll_richmsgdlg.o \ $(OBJS)\coredll_msw_scrolbar.o \ $(OBJS)\coredll_msw_slider.o \ $(OBJS)\coredll_msw_spinbutt.o \ @@ -3248,11 +3257,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_infobar.o \ $(OBJS)\coredll_listbkg.o \ $(OBJS)\coredll_logg.o \ + $(OBJS)\coredll_msgdlgg.o \ $(OBJS)\coredll_numdlgg.o \ $(OBJS)\coredll_panelg.o \ $(OBJS)\coredll_progdlgg.o \ $(OBJS)\coredll_printps.o \ $(OBJS)\coredll_renderg.o \ + $(OBJS)\coredll_richmsgdlgg.o \ $(OBJS)\coredll_scrlwing.o \ $(OBJS)\coredll_selstore.o \ $(OBJS)\coredll_spinctlg.o \ @@ -3333,7 +3344,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_fontpickerg.o \ $(OBJS)\coredll_generic_listctrl.o \ $(OBJS)\coredll_mdig.o \ - $(OBJS)\coredll_msgdlgg.o \ $(OBJS)\coredll_prntdlgg.o \ $(OBJS)\coredll_univ_bmpbuttn.o \ $(OBJS)\coredll_univ_button.o \ @@ -3496,11 +3506,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_infobar.o \ $(OBJS)\coredll_listbkg.o \ $(OBJS)\coredll_logg.o \ + $(OBJS)\coredll_msgdlgg.o \ $(OBJS)\coredll_numdlgg.o \ $(OBJS)\coredll_panelg.o \ $(OBJS)\coredll_progdlgg.o \ $(OBJS)\coredll_printps.o \ $(OBJS)\coredll_renderg.o \ + $(OBJS)\coredll_richmsgdlgg.o \ $(OBJS)\coredll_scrlwing.o \ $(OBJS)\coredll_selstore.o \ $(OBJS)\coredll_spinctlg.o \ @@ -3615,6 +3627,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_ownerdrw.o \ $(OBJS)\corelib_msw_radiobox.o \ $(OBJS)\corelib_msw_radiobut.o \ + $(OBJS)\corelib_richmsgdlg.o \ $(OBJS)\corelib_msw_scrolbar.o \ $(OBJS)\corelib_msw_slider.o \ $(OBJS)\corelib_msw_spinbutt.o \ @@ -3754,11 +3767,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_infobar.o \ $(OBJS)\corelib_listbkg.o \ $(OBJS)\corelib_logg.o \ + $(OBJS)\corelib_msgdlgg.o \ $(OBJS)\corelib_numdlgg.o \ $(OBJS)\corelib_panelg.o \ $(OBJS)\corelib_progdlgg.o \ $(OBJS)\corelib_printps.o \ $(OBJS)\corelib_renderg.o \ + $(OBJS)\corelib_richmsgdlgg.o \ $(OBJS)\corelib_scrlwing.o \ $(OBJS)\corelib_selstore.o \ $(OBJS)\corelib_spinctlg.o \ @@ -3839,7 +3854,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_fontpickerg.o \ $(OBJS)\corelib_generic_listctrl.o \ $(OBJS)\corelib_mdig.o \ - $(OBJS)\corelib_msgdlgg.o \ $(OBJS)\corelib_prntdlgg.o \ $(OBJS)\corelib_univ_bmpbuttn.o \ $(OBJS)\corelib_univ_button.o \ @@ -4002,11 +4016,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_infobar.o \ $(OBJS)\corelib_listbkg.o \ $(OBJS)\corelib_logg.o \ + $(OBJS)\corelib_msgdlgg.o \ $(OBJS)\corelib_numdlgg.o \ $(OBJS)\corelib_panelg.o \ $(OBJS)\corelib_progdlgg.o \ $(OBJS)\corelib_printps.o \ $(OBJS)\corelib_renderg.o \ + $(OBJS)\corelib_richmsgdlgg.o \ $(OBJS)\corelib_scrlwing.o \ $(OBJS)\corelib_selstore.o \ $(OBJS)\corelib_spinctlg.o \ @@ -6328,6 +6344,9 @@ $(OBJS)\monodll_msw_radiobox.o: ../../src/msw/radiobox.cpp $(OBJS)\monodll_msw_radiobut.o: ../../src/msw/radiobut.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\monodll_richmsgdlg.o: ../../src/msw/richmsgdlg.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monodll_msw_scrolbar.o: ../../src/msw/scrolbar.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -6406,9 +6425,6 @@ $(OBJS)\monodll_generic_listctrl.o: ../../src/generic/listctrl.cpp $(OBJS)\monodll_mdig.o: ../../src/generic/mdig.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\monodll_msgdlgg.o: ../../src/generic/msgdlgg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - $(OBJS)\monodll_univ_bmpbuttn.o: ../../src/univ/bmpbuttn.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -7810,6 +7826,11 @@ $(OBJS)\monodll_logg.o: ../../src/generic/logg.cpp endif ifeq ($(USE_GUI),1) +$(OBJS)\monodll_msgdlgg.o: ../../src/generic/msgdlgg.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) $(OBJS)\monodll_numdlgg.o: ../../src/generic/numdlgg.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< endif @@ -7835,6 +7856,11 @@ $(OBJS)\monodll_renderg.o: ../../src/generic/renderg.cpp endif ifeq ($(USE_GUI),1) +$(OBJS)\monodll_richmsgdlgg.o: ../../src/generic/richmsgdlgg.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) $(OBJS)\monodll_scrlwing.o: ../../src/generic/scrlwing.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< endif @@ -8550,6 +8576,9 @@ $(OBJS)\monolib_msw_radiobox.o: ../../src/msw/radiobox.cpp $(OBJS)\monolib_msw_radiobut.o: ../../src/msw/radiobut.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\monolib_richmsgdlg.o: ../../src/msw/richmsgdlg.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monolib_msw_scrolbar.o: ../../src/msw/scrolbar.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -8628,9 +8657,6 @@ $(OBJS)\monolib_generic_listctrl.o: ../../src/generic/listctrl.cpp $(OBJS)\monolib_mdig.o: ../../src/generic/mdig.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\monolib_msgdlgg.o: ../../src/generic/msgdlgg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - $(OBJS)\monolib_univ_bmpbuttn.o: ../../src/univ/bmpbuttn.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -10032,6 +10058,11 @@ $(OBJS)\monolib_logg.o: ../../src/generic/logg.cpp endif ifeq ($(USE_GUI),1) +$(OBJS)\monolib_msgdlgg.o: ../../src/generic/msgdlgg.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) $(OBJS)\monolib_numdlgg.o: ../../src/generic/numdlgg.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< endif @@ -10057,6 +10088,11 @@ $(OBJS)\monolib_renderg.o: ../../src/generic/renderg.cpp endif ifeq ($(USE_GUI),1) +$(OBJS)\monolib_richmsgdlgg.o: ../../src/generic/richmsgdlgg.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) $(OBJS)\monolib_scrlwing.o: ../../src/generic/scrlwing.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< endif @@ -11180,6 +11216,9 @@ $(OBJS)\coredll_msw_radiobox.o: ../../src/msw/radiobox.cpp $(OBJS)\coredll_msw_radiobut.o: ../../src/msw/radiobut.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\coredll_richmsgdlg.o: ../../src/msw/richmsgdlg.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\coredll_msw_scrolbar.o: ../../src/msw/scrolbar.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< @@ -11258,9 +11297,6 @@ $(OBJS)\coredll_generic_listctrl.o: ../../src/generic/listctrl.cpp $(OBJS)\coredll_mdig.o: ../../src/generic/mdig.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\coredll_msgdlgg.o: ../../src/generic/msgdlgg.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - $(OBJS)\coredll_univ_bmpbuttn.o: ../../src/univ/bmpbuttn.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< @@ -12257,6 +12293,11 @@ $(OBJS)\coredll_logg.o: ../../src/generic/logg.cpp endif ifeq ($(USE_GUI),1) +$(OBJS)\coredll_msgdlgg.o: ../../src/generic/msgdlgg.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) $(OBJS)\coredll_numdlgg.o: ../../src/generic/numdlgg.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< endif @@ -12282,6 +12323,11 @@ $(OBJS)\coredll_renderg.o: ../../src/generic/renderg.cpp endif ifeq ($(USE_GUI),1) +$(OBJS)\coredll_richmsgdlgg.o: ../../src/generic/richmsgdlgg.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) $(OBJS)\coredll_scrlwing.o: ../../src/generic/scrlwing.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< endif @@ -12477,6 +12523,9 @@ $(OBJS)\corelib_msw_radiobox.o: ../../src/msw/radiobox.cpp $(OBJS)\corelib_msw_radiobut.o: ../../src/msw/radiobut.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\corelib_richmsgdlg.o: ../../src/msw/richmsgdlg.cpp + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\corelib_msw_scrolbar.o: ../../src/msw/scrolbar.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< @@ -12555,9 +12604,6 @@ $(OBJS)\corelib_generic_listctrl.o: ../../src/generic/listctrl.cpp $(OBJS)\corelib_mdig.o: ../../src/generic/mdig.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\corelib_msgdlgg.o: ../../src/generic/msgdlgg.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - $(OBJS)\corelib_univ_bmpbuttn.o: ../../src/univ/bmpbuttn.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< @@ -13554,6 +13600,11 @@ $(OBJS)\corelib_logg.o: ../../src/generic/logg.cpp endif ifeq ($(USE_GUI),1) +$(OBJS)\corelib_msgdlgg.o: ../../src/generic/msgdlgg.cpp + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) $(OBJS)\corelib_numdlgg.o: ../../src/generic/numdlgg.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< endif @@ -13579,6 +13630,11 @@ $(OBJS)\corelib_renderg.o: ../../src/generic/renderg.cpp endif ifeq ($(USE_GUI),1) +$(OBJS)\corelib_richmsgdlgg.o: ../../src/generic/richmsgdlgg.cpp + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) $(OBJS)\corelib_scrlwing.o: ../../src/generic/scrlwing.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< endif diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc index b61d9660c6..bf7554dc41 100644 --- a/build/msw/makefile.vc +++ b/build/msw/makefile.vc @@ -1963,6 +1963,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_ownerdrw.obj \ $(OBJS)\monodll_msw_radiobox.obj \ $(OBJS)\monodll_msw_radiobut.obj \ + $(OBJS)\monodll_richmsgdlg.obj \ $(OBJS)\monodll_msw_scrolbar.obj \ $(OBJS)\monodll_msw_slider.obj \ $(OBJS)\monodll_msw_spinbutt.obj \ @@ -2102,11 +2103,13 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_infobar.obj \ $(OBJS)\monodll_listbkg.obj \ $(OBJS)\monodll_logg.obj \ + $(OBJS)\monodll_msgdlgg.obj \ $(OBJS)\monodll_numdlgg.obj \ $(OBJS)\monodll_panelg.obj \ $(OBJS)\monodll_progdlgg.obj \ $(OBJS)\monodll_printps.obj \ $(OBJS)\monodll_renderg.obj \ + $(OBJS)\monodll_richmsgdlgg.obj \ $(OBJS)\monodll_scrlwing.obj \ $(OBJS)\monodll_selstore.obj \ $(OBJS)\monodll_spinctlg.obj \ @@ -2185,7 +2188,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_fontpickerg.obj \ $(OBJS)\monodll_generic_listctrl.obj \ $(OBJS)\monodll_mdig.obj \ - $(OBJS)\monodll_msgdlgg.obj \ $(OBJS)\monodll_prntdlgg.obj \ $(OBJS)\monodll_univ_bmpbuttn.obj \ $(OBJS)\monodll_univ_button.obj \ @@ -2348,11 +2350,13 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_infobar.obj \ $(OBJS)\monodll_listbkg.obj \ $(OBJS)\monodll_logg.obj \ + $(OBJS)\monodll_msgdlgg.obj \ $(OBJS)\monodll_numdlgg.obj \ $(OBJS)\monodll_panelg.obj \ $(OBJS)\monodll_progdlgg.obj \ $(OBJS)\monodll_printps.obj \ $(OBJS)\monodll_renderg.obj \ + $(OBJS)\monodll_richmsgdlgg.obj \ $(OBJS)\monodll_scrlwing.obj \ $(OBJS)\monodll_selstore.obj \ $(OBJS)\monodll_spinctlg.obj \ @@ -2684,6 +2688,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_ownerdrw.obj \ $(OBJS)\monolib_msw_radiobox.obj \ $(OBJS)\monolib_msw_radiobut.obj \ + $(OBJS)\monolib_richmsgdlg.obj \ $(OBJS)\monolib_msw_scrolbar.obj \ $(OBJS)\monolib_msw_slider.obj \ $(OBJS)\monolib_msw_spinbutt.obj \ @@ -2823,11 +2828,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_infobar.obj \ $(OBJS)\monolib_listbkg.obj \ $(OBJS)\monolib_logg.obj \ + $(OBJS)\monolib_msgdlgg.obj \ $(OBJS)\monolib_numdlgg.obj \ $(OBJS)\monolib_panelg.obj \ $(OBJS)\monolib_progdlgg.obj \ $(OBJS)\monolib_printps.obj \ $(OBJS)\monolib_renderg.obj \ + $(OBJS)\monolib_richmsgdlgg.obj \ $(OBJS)\monolib_scrlwing.obj \ $(OBJS)\monolib_selstore.obj \ $(OBJS)\monolib_spinctlg.obj \ @@ -2906,7 +2913,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_fontpickerg.obj \ $(OBJS)\monolib_generic_listctrl.obj \ $(OBJS)\monolib_mdig.obj \ - $(OBJS)\monolib_msgdlgg.obj \ $(OBJS)\monolib_prntdlgg.obj \ $(OBJS)\monolib_univ_bmpbuttn.obj \ $(OBJS)\monolib_univ_button.obj \ @@ -3069,11 +3075,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_infobar.obj \ $(OBJS)\monolib_listbkg.obj \ $(OBJS)\monolib_logg.obj \ + $(OBJS)\monolib_msgdlgg.obj \ $(OBJS)\monolib_numdlgg.obj \ $(OBJS)\monolib_panelg.obj \ $(OBJS)\monolib_progdlgg.obj \ $(OBJS)\monolib_printps.obj \ $(OBJS)\monolib_renderg.obj \ + $(OBJS)\monolib_richmsgdlgg.obj \ $(OBJS)\monolib_scrlwing.obj \ $(OBJS)\monolib_selstore.obj \ $(OBJS)\monolib_spinctlg.obj \ @@ -3356,6 +3364,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_ownerdrw.obj \ $(OBJS)\coredll_msw_radiobox.obj \ $(OBJS)\coredll_msw_radiobut.obj \ + $(OBJS)\coredll_richmsgdlg.obj \ $(OBJS)\coredll_msw_scrolbar.obj \ $(OBJS)\coredll_msw_slider.obj \ $(OBJS)\coredll_msw_spinbutt.obj \ @@ -3495,11 +3504,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_infobar.obj \ $(OBJS)\coredll_listbkg.obj \ $(OBJS)\coredll_logg.obj \ + $(OBJS)\coredll_msgdlgg.obj \ $(OBJS)\coredll_numdlgg.obj \ $(OBJS)\coredll_panelg.obj \ $(OBJS)\coredll_progdlgg.obj \ $(OBJS)\coredll_printps.obj \ $(OBJS)\coredll_renderg.obj \ + $(OBJS)\coredll_richmsgdlgg.obj \ $(OBJS)\coredll_scrlwing.obj \ $(OBJS)\coredll_selstore.obj \ $(OBJS)\coredll_spinctlg.obj \ @@ -3578,7 +3589,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_fontpickerg.obj \ $(OBJS)\coredll_generic_listctrl.obj \ $(OBJS)\coredll_mdig.obj \ - $(OBJS)\coredll_msgdlgg.obj \ $(OBJS)\coredll_prntdlgg.obj \ $(OBJS)\coredll_univ_bmpbuttn.obj \ $(OBJS)\coredll_univ_button.obj \ @@ -3741,11 +3751,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_infobar.obj \ $(OBJS)\coredll_listbkg.obj \ $(OBJS)\coredll_logg.obj \ + $(OBJS)\coredll_msgdlgg.obj \ $(OBJS)\coredll_numdlgg.obj \ $(OBJS)\coredll_panelg.obj \ $(OBJS)\coredll_progdlgg.obj \ $(OBJS)\coredll_printps.obj \ $(OBJS)\coredll_renderg.obj \ + $(OBJS)\coredll_richmsgdlgg.obj \ $(OBJS)\coredll_scrlwing.obj \ $(OBJS)\coredll_selstore.obj \ $(OBJS)\coredll_spinctlg.obj \ @@ -3860,6 +3872,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_ownerdrw.obj \ $(OBJS)\corelib_msw_radiobox.obj \ $(OBJS)\corelib_msw_radiobut.obj \ + $(OBJS)\corelib_richmsgdlg.obj \ $(OBJS)\corelib_msw_scrolbar.obj \ $(OBJS)\corelib_msw_slider.obj \ $(OBJS)\corelib_msw_spinbutt.obj \ @@ -3999,11 +4012,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_infobar.obj \ $(OBJS)\corelib_listbkg.obj \ $(OBJS)\corelib_logg.obj \ + $(OBJS)\corelib_msgdlgg.obj \ $(OBJS)\corelib_numdlgg.obj \ $(OBJS)\corelib_panelg.obj \ $(OBJS)\corelib_progdlgg.obj \ $(OBJS)\corelib_printps.obj \ $(OBJS)\corelib_renderg.obj \ + $(OBJS)\corelib_richmsgdlgg.obj \ $(OBJS)\corelib_scrlwing.obj \ $(OBJS)\corelib_selstore.obj \ $(OBJS)\corelib_spinctlg.obj \ @@ -4082,7 +4097,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_fontpickerg.obj \ $(OBJS)\corelib_generic_listctrl.obj \ $(OBJS)\corelib_mdig.obj \ - $(OBJS)\corelib_msgdlgg.obj \ $(OBJS)\corelib_prntdlgg.obj \ $(OBJS)\corelib_univ_bmpbuttn.obj \ $(OBJS)\corelib_univ_button.obj \ @@ -4245,11 +4259,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_infobar.obj \ $(OBJS)\corelib_listbkg.obj \ $(OBJS)\corelib_logg.obj \ + $(OBJS)\corelib_msgdlgg.obj \ $(OBJS)\corelib_numdlgg.obj \ $(OBJS)\corelib_panelg.obj \ $(OBJS)\corelib_progdlgg.obj \ $(OBJS)\corelib_printps.obj \ $(OBJS)\corelib_renderg.obj \ + $(OBJS)\corelib_richmsgdlgg.obj \ $(OBJS)\corelib_scrlwing.obj \ $(OBJS)\corelib_selstore.obj \ $(OBJS)\corelib_spinctlg.obj \ @@ -6758,6 +6774,9 @@ $(OBJS)\monodll_msw_radiobox.obj: ..\..\src\msw\radiobox.cpp $(OBJS)\monodll_msw_radiobut.obj: ..\..\src\msw\radiobut.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\radiobut.cpp +$(OBJS)\monodll_richmsgdlg.obj: ..\..\src\msw\richmsgdlg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\richmsgdlg.cpp + $(OBJS)\monodll_msw_scrolbar.obj: ..\..\src\msw\scrolbar.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\scrolbar.cpp @@ -6836,9 +6855,6 @@ $(OBJS)\monodll_generic_listctrl.obj: ..\..\src\generic\listctrl.cpp $(OBJS)\monodll_mdig.obj: ..\..\src\generic\mdig.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\mdig.cpp -$(OBJS)\monodll_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\msgdlgg.cpp - $(OBJS)\monodll_univ_bmpbuttn.obj: ..\..\src\univ\bmpbuttn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\bmpbuttn.cpp @@ -8240,6 +8256,11 @@ $(OBJS)\monodll_logg.obj: ..\..\src\generic\logg.cpp !endif !if "$(USE_GUI)" == "1" +$(OBJS)\monodll_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\msgdlgg.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\monodll_numdlgg.obj: ..\..\src\generic\numdlgg.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\numdlgg.cpp !endif @@ -8265,6 +8286,11 @@ $(OBJS)\monodll_renderg.obj: ..\..\src\generic\renderg.cpp !endif !if "$(USE_GUI)" == "1" +$(OBJS)\monodll_richmsgdlgg.obj: ..\..\src\generic\richmsgdlgg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\richmsgdlgg.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\monodll_scrlwing.obj: ..\..\src\generic\scrlwing.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\scrlwing.cpp !endif @@ -8980,6 +9006,9 @@ $(OBJS)\monolib_msw_radiobox.obj: ..\..\src\msw\radiobox.cpp $(OBJS)\monolib_msw_radiobut.obj: ..\..\src\msw\radiobut.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\radiobut.cpp +$(OBJS)\monolib_richmsgdlg.obj: ..\..\src\msw\richmsgdlg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\richmsgdlg.cpp + $(OBJS)\monolib_msw_scrolbar.obj: ..\..\src\msw\scrolbar.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\scrolbar.cpp @@ -9058,9 +9087,6 @@ $(OBJS)\monolib_generic_listctrl.obj: ..\..\src\generic\listctrl.cpp $(OBJS)\monolib_mdig.obj: ..\..\src\generic\mdig.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\mdig.cpp -$(OBJS)\monolib_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\msgdlgg.cpp - $(OBJS)\monolib_univ_bmpbuttn.obj: ..\..\src\univ\bmpbuttn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\bmpbuttn.cpp @@ -10462,6 +10488,11 @@ $(OBJS)\monolib_logg.obj: ..\..\src\generic\logg.cpp !endif !if "$(USE_GUI)" == "1" +$(OBJS)\monolib_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\msgdlgg.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\monolib_numdlgg.obj: ..\..\src\generic\numdlgg.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\numdlgg.cpp !endif @@ -10487,6 +10518,11 @@ $(OBJS)\monolib_renderg.obj: ..\..\src\generic\renderg.cpp !endif !if "$(USE_GUI)" == "1" +$(OBJS)\monolib_richmsgdlgg.obj: ..\..\src\generic\richmsgdlgg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\richmsgdlgg.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\monolib_scrlwing.obj: ..\..\src\generic\scrlwing.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\scrlwing.cpp !endif @@ -11610,6 +11646,9 @@ $(OBJS)\coredll_msw_radiobox.obj: ..\..\src\msw\radiobox.cpp $(OBJS)\coredll_msw_radiobut.obj: ..\..\src\msw\radiobut.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\radiobut.cpp +$(OBJS)\coredll_richmsgdlg.obj: ..\..\src\msw\richmsgdlg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\richmsgdlg.cpp + $(OBJS)\coredll_msw_scrolbar.obj: ..\..\src\msw\scrolbar.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\scrolbar.cpp @@ -11688,9 +11727,6 @@ $(OBJS)\coredll_generic_listctrl.obj: ..\..\src\generic\listctrl.cpp $(OBJS)\coredll_mdig.obj: ..\..\src\generic\mdig.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\mdig.cpp -$(OBJS)\coredll_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\msgdlgg.cpp - $(OBJS)\coredll_univ_bmpbuttn.obj: ..\..\src\univ\bmpbuttn.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\bmpbuttn.cpp @@ -12687,6 +12723,11 @@ $(OBJS)\coredll_logg.obj: ..\..\src\generic\logg.cpp !endif !if "$(USE_GUI)" == "1" +$(OBJS)\coredll_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\msgdlgg.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\coredll_numdlgg.obj: ..\..\src\generic\numdlgg.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\numdlgg.cpp !endif @@ -12712,6 +12753,11 @@ $(OBJS)\coredll_renderg.obj: ..\..\src\generic\renderg.cpp !endif !if "$(USE_GUI)" == "1" +$(OBJS)\coredll_richmsgdlgg.obj: ..\..\src\generic\richmsgdlgg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\richmsgdlgg.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\coredll_scrlwing.obj: ..\..\src\generic\scrlwing.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\scrlwing.cpp !endif @@ -12907,6 +12953,9 @@ $(OBJS)\corelib_msw_radiobox.obj: ..\..\src\msw\radiobox.cpp $(OBJS)\corelib_msw_radiobut.obj: ..\..\src\msw\radiobut.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\radiobut.cpp +$(OBJS)\corelib_richmsgdlg.obj: ..\..\src\msw\richmsgdlg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\richmsgdlg.cpp + $(OBJS)\corelib_msw_scrolbar.obj: ..\..\src\msw\scrolbar.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\scrolbar.cpp @@ -12985,9 +13034,6 @@ $(OBJS)\corelib_generic_listctrl.obj: ..\..\src\generic\listctrl.cpp $(OBJS)\corelib_mdig.obj: ..\..\src\generic\mdig.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\mdig.cpp -$(OBJS)\corelib_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\msgdlgg.cpp - $(OBJS)\corelib_univ_bmpbuttn.obj: ..\..\src\univ\bmpbuttn.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\bmpbuttn.cpp @@ -13984,6 +14030,11 @@ $(OBJS)\corelib_logg.obj: ..\..\src\generic\logg.cpp !endif !if "$(USE_GUI)" == "1" +$(OBJS)\corelib_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\msgdlgg.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\corelib_numdlgg.obj: ..\..\src\generic\numdlgg.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\numdlgg.cpp !endif @@ -14009,6 +14060,11 @@ $(OBJS)\corelib_renderg.obj: ..\..\src\generic\renderg.cpp !endif !if "$(USE_GUI)" == "1" +$(OBJS)\corelib_richmsgdlgg.obj: ..\..\src\generic\richmsgdlgg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\richmsgdlgg.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\corelib_scrlwing.obj: ..\..\src\generic\scrlwing.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\scrlwing.cpp !endif diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat index b7d3a3ef5d..5e9414833e 100644 --- a/build/msw/makefile.wat +++ b/build/msw/makefile.wat @@ -326,6 +326,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_ownerdrw.obj & $(OBJS)\monodll_msw_radiobox.obj & $(OBJS)\monodll_msw_radiobut.obj & + $(OBJS)\monodll_richmsgdlg.obj & $(OBJS)\monodll_msw_scrolbar.obj & $(OBJS)\monodll_msw_slider.obj & $(OBJS)\monodll_msw_spinbutt.obj & @@ -465,11 +466,13 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_infobar.obj & $(OBJS)\monodll_listbkg.obj & $(OBJS)\monodll_logg.obj & + $(OBJS)\monodll_msgdlgg.obj & $(OBJS)\monodll_numdlgg.obj & $(OBJS)\monodll_panelg.obj & $(OBJS)\monodll_progdlgg.obj & $(OBJS)\monodll_printps.obj & $(OBJS)\monodll_renderg.obj & + $(OBJS)\monodll_richmsgdlgg.obj & $(OBJS)\monodll_scrlwing.obj & $(OBJS)\monodll_selstore.obj & $(OBJS)\monodll_spinctlg.obj & @@ -550,7 +553,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_fontpickerg.obj & $(OBJS)\monodll_generic_listctrl.obj & $(OBJS)\monodll_mdig.obj & - $(OBJS)\monodll_msgdlgg.obj & $(OBJS)\monodll_prntdlgg.obj & $(OBJS)\monodll_univ_bmpbuttn.obj & $(OBJS)\monodll_univ_button.obj & @@ -713,11 +715,13 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_infobar.obj & $(OBJS)\monodll_listbkg.obj & $(OBJS)\monodll_logg.obj & + $(OBJS)\monodll_msgdlgg.obj & $(OBJS)\monodll_numdlgg.obj & $(OBJS)\monodll_panelg.obj & $(OBJS)\monodll_progdlgg.obj & $(OBJS)\monodll_printps.obj & $(OBJS)\monodll_renderg.obj & + $(OBJS)\monodll_richmsgdlgg.obj & $(OBJS)\monodll_scrlwing.obj & $(OBJS)\monodll_selstore.obj & $(OBJS)\monodll_spinctlg.obj & @@ -1052,6 +1056,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_ownerdrw.obj & $(OBJS)\monolib_msw_radiobox.obj & $(OBJS)\monolib_msw_radiobut.obj & + $(OBJS)\monolib_richmsgdlg.obj & $(OBJS)\monolib_msw_scrolbar.obj & $(OBJS)\monolib_msw_slider.obj & $(OBJS)\monolib_msw_spinbutt.obj & @@ -1191,11 +1196,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_infobar.obj & $(OBJS)\monolib_listbkg.obj & $(OBJS)\monolib_logg.obj & + $(OBJS)\monolib_msgdlgg.obj & $(OBJS)\monolib_numdlgg.obj & $(OBJS)\monolib_panelg.obj & $(OBJS)\monolib_progdlgg.obj & $(OBJS)\monolib_printps.obj & $(OBJS)\monolib_renderg.obj & + $(OBJS)\monolib_richmsgdlgg.obj & $(OBJS)\monolib_scrlwing.obj & $(OBJS)\monolib_selstore.obj & $(OBJS)\monolib_spinctlg.obj & @@ -1276,7 +1283,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_fontpickerg.obj & $(OBJS)\monolib_generic_listctrl.obj & $(OBJS)\monolib_mdig.obj & - $(OBJS)\monolib_msgdlgg.obj & $(OBJS)\monolib_prntdlgg.obj & $(OBJS)\monolib_univ_bmpbuttn.obj & $(OBJS)\monolib_univ_button.obj & @@ -1439,11 +1445,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_infobar.obj & $(OBJS)\monolib_listbkg.obj & $(OBJS)\monolib_logg.obj & + $(OBJS)\monolib_msgdlgg.obj & $(OBJS)\monolib_numdlgg.obj & $(OBJS)\monolib_panelg.obj & $(OBJS)\monolib_progdlgg.obj & $(OBJS)\monolib_printps.obj & $(OBJS)\monolib_renderg.obj & + $(OBJS)\monolib_richmsgdlgg.obj & $(OBJS)\monolib_scrlwing.obj & $(OBJS)\monolib_selstore.obj & $(OBJS)\monolib_spinctlg.obj & @@ -1685,6 +1693,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_ownerdrw.obj & $(OBJS)\coredll_msw_radiobox.obj & $(OBJS)\coredll_msw_radiobut.obj & + $(OBJS)\coredll_richmsgdlg.obj & $(OBJS)\coredll_msw_scrolbar.obj & $(OBJS)\coredll_msw_slider.obj & $(OBJS)\coredll_msw_spinbutt.obj & @@ -1824,11 +1833,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_infobar.obj & $(OBJS)\coredll_listbkg.obj & $(OBJS)\coredll_logg.obj & + $(OBJS)\coredll_msgdlgg.obj & $(OBJS)\coredll_numdlgg.obj & $(OBJS)\coredll_panelg.obj & $(OBJS)\coredll_progdlgg.obj & $(OBJS)\coredll_printps.obj & $(OBJS)\coredll_renderg.obj & + $(OBJS)\coredll_richmsgdlgg.obj & $(OBJS)\coredll_scrlwing.obj & $(OBJS)\coredll_selstore.obj & $(OBJS)\coredll_spinctlg.obj & @@ -1909,7 +1920,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_fontpickerg.obj & $(OBJS)\coredll_generic_listctrl.obj & $(OBJS)\coredll_mdig.obj & - $(OBJS)\coredll_msgdlgg.obj & $(OBJS)\coredll_prntdlgg.obj & $(OBJS)\coredll_univ_bmpbuttn.obj & $(OBJS)\coredll_univ_button.obj & @@ -2072,11 +2082,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_infobar.obj & $(OBJS)\coredll_listbkg.obj & $(OBJS)\coredll_logg.obj & + $(OBJS)\coredll_msgdlgg.obj & $(OBJS)\coredll_numdlgg.obj & $(OBJS)\coredll_panelg.obj & $(OBJS)\coredll_progdlgg.obj & $(OBJS)\coredll_printps.obj & $(OBJS)\coredll_renderg.obj & + $(OBJS)\coredll_richmsgdlgg.obj & $(OBJS)\coredll_scrlwing.obj & $(OBJS)\coredll_selstore.obj & $(OBJS)\coredll_spinctlg.obj & @@ -2193,6 +2205,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_ownerdrw.obj & $(OBJS)\corelib_msw_radiobox.obj & $(OBJS)\corelib_msw_radiobut.obj & + $(OBJS)\corelib_richmsgdlg.obj & $(OBJS)\corelib_msw_scrolbar.obj & $(OBJS)\corelib_msw_slider.obj & $(OBJS)\corelib_msw_spinbutt.obj & @@ -2332,11 +2345,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_infobar.obj & $(OBJS)\corelib_listbkg.obj & $(OBJS)\corelib_logg.obj & + $(OBJS)\corelib_msgdlgg.obj & $(OBJS)\corelib_numdlgg.obj & $(OBJS)\corelib_panelg.obj & $(OBJS)\corelib_progdlgg.obj & $(OBJS)\corelib_printps.obj & $(OBJS)\corelib_renderg.obj & + $(OBJS)\corelib_richmsgdlgg.obj & $(OBJS)\corelib_scrlwing.obj & $(OBJS)\corelib_selstore.obj & $(OBJS)\corelib_spinctlg.obj & @@ -2417,7 +2432,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_fontpickerg.obj & $(OBJS)\corelib_generic_listctrl.obj & $(OBJS)\corelib_mdig.obj & - $(OBJS)\corelib_msgdlgg.obj & $(OBJS)\corelib_prntdlgg.obj & $(OBJS)\corelib_univ_bmpbuttn.obj & $(OBJS)\corelib_univ_button.obj & @@ -2580,11 +2594,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_infobar.obj & $(OBJS)\corelib_listbkg.obj & $(OBJS)\corelib_logg.obj & + $(OBJS)\corelib_msgdlgg.obj & $(OBJS)\corelib_numdlgg.obj & $(OBJS)\corelib_panelg.obj & $(OBJS)\corelib_progdlgg.obj & $(OBJS)\corelib_printps.obj & $(OBJS)\corelib_renderg.obj & + $(OBJS)\corelib_richmsgdlgg.obj & $(OBJS)\corelib_scrlwing.obj & $(OBJS)\corelib_selstore.obj & $(OBJS)\corelib_spinctlg.obj & @@ -6587,6 +6603,9 @@ $(OBJS)\monodll_msw_radiobox.obj : .AUTODEPEND ..\..\src\msw\radiobox.cpp $(OBJS)\monodll_msw_radiobut.obj : .AUTODEPEND ..\..\src\msw\radiobut.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_richmsgdlg.obj : .AUTODEPEND ..\..\src\msw\richmsgdlg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_msw_scrolbar.obj : .AUTODEPEND ..\..\src\msw\scrolbar.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -6665,9 +6684,6 @@ $(OBJS)\monodll_generic_listctrl.obj : .AUTODEPEND ..\..\src\generic\listctrl.c $(OBJS)\monodll_mdig.obj : .AUTODEPEND ..\..\src\generic\mdig.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_msgdlgg.obj : .AUTODEPEND ..\..\src\generic\msgdlgg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - $(OBJS)\monodll_univ_bmpbuttn.obj : .AUTODEPEND ..\..\src\univ\bmpbuttn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -8069,6 +8085,11 @@ $(OBJS)\monodll_logg.obj : .AUTODEPEND ..\..\src\generic\logg.cpp !endif !ifeq USE_GUI 1 +$(OBJS)\monodll_msgdlgg.obj : .AUTODEPEND ..\..\src\generic\msgdlgg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 $(OBJS)\monodll_numdlgg.obj : .AUTODEPEND ..\..\src\generic\numdlgg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif @@ -8094,6 +8115,11 @@ $(OBJS)\monodll_renderg.obj : .AUTODEPEND ..\..\src\generic\renderg.cpp !endif !ifeq USE_GUI 1 +$(OBJS)\monodll_richmsgdlgg.obj : .AUTODEPEND ..\..\src\generic\richmsgdlgg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 $(OBJS)\monodll_scrlwing.obj : .AUTODEPEND ..\..\src\generic\scrlwing.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif @@ -8809,6 +8835,9 @@ $(OBJS)\monolib_msw_radiobox.obj : .AUTODEPEND ..\..\src\msw\radiobox.cpp $(OBJS)\monolib_msw_radiobut.obj : .AUTODEPEND ..\..\src\msw\radiobut.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_richmsgdlg.obj : .AUTODEPEND ..\..\src\msw\richmsgdlg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_msw_scrolbar.obj : .AUTODEPEND ..\..\src\msw\scrolbar.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -8887,9 +8916,6 @@ $(OBJS)\monolib_generic_listctrl.obj : .AUTODEPEND ..\..\src\generic\listctrl.c $(OBJS)\monolib_mdig.obj : .AUTODEPEND ..\..\src\generic\mdig.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -$(OBJS)\monolib_msgdlgg.obj : .AUTODEPEND ..\..\src\generic\msgdlgg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - $(OBJS)\monolib_univ_bmpbuttn.obj : .AUTODEPEND ..\..\src\univ\bmpbuttn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -10291,6 +10317,11 @@ $(OBJS)\monolib_logg.obj : .AUTODEPEND ..\..\src\generic\logg.cpp !endif !ifeq USE_GUI 1 +$(OBJS)\monolib_msgdlgg.obj : .AUTODEPEND ..\..\src\generic\msgdlgg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 $(OBJS)\monolib_numdlgg.obj : .AUTODEPEND ..\..\src\generic\numdlgg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif @@ -10316,6 +10347,11 @@ $(OBJS)\monolib_renderg.obj : .AUTODEPEND ..\..\src\generic\renderg.cpp !endif !ifeq USE_GUI 1 +$(OBJS)\monolib_richmsgdlgg.obj : .AUTODEPEND ..\..\src\generic\richmsgdlgg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 $(OBJS)\monolib_scrlwing.obj : .AUTODEPEND ..\..\src\generic\scrlwing.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif @@ -11439,6 +11475,9 @@ $(OBJS)\coredll_msw_radiobox.obj : .AUTODEPEND ..\..\src\msw\radiobox.cpp $(OBJS)\coredll_msw_radiobut.obj : .AUTODEPEND ..\..\src\msw\radiobut.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +$(OBJS)\coredll_richmsgdlg.obj : .AUTODEPEND ..\..\src\msw\richmsgdlg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< + $(OBJS)\coredll_msw_scrolbar.obj : .AUTODEPEND ..\..\src\msw\scrolbar.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -11517,9 +11556,6 @@ $(OBJS)\coredll_generic_listctrl.obj : .AUTODEPEND ..\..\src\generic\listctrl.c $(OBJS)\coredll_mdig.obj : .AUTODEPEND ..\..\src\generic\mdig.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -$(OBJS)\coredll_msgdlgg.obj : .AUTODEPEND ..\..\src\generic\msgdlgg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - $(OBJS)\coredll_univ_bmpbuttn.obj : .AUTODEPEND ..\..\src\univ\bmpbuttn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -12516,6 +12552,11 @@ $(OBJS)\coredll_logg.obj : .AUTODEPEND ..\..\src\generic\logg.cpp !endif !ifeq USE_GUI 1 +$(OBJS)\coredll_msgdlgg.obj : .AUTODEPEND ..\..\src\generic\msgdlgg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 $(OBJS)\coredll_numdlgg.obj : .AUTODEPEND ..\..\src\generic\numdlgg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif @@ -12541,6 +12582,11 @@ $(OBJS)\coredll_renderg.obj : .AUTODEPEND ..\..\src\generic\renderg.cpp !endif !ifeq USE_GUI 1 +$(OBJS)\coredll_richmsgdlgg.obj : .AUTODEPEND ..\..\src\generic\richmsgdlgg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 $(OBJS)\coredll_scrlwing.obj : .AUTODEPEND ..\..\src\generic\scrlwing.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif @@ -12736,6 +12782,9 @@ $(OBJS)\corelib_msw_radiobox.obj : .AUTODEPEND ..\..\src\msw\radiobox.cpp $(OBJS)\corelib_msw_radiobut.obj : .AUTODEPEND ..\..\src\msw\radiobut.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +$(OBJS)\corelib_richmsgdlg.obj : .AUTODEPEND ..\..\src\msw\richmsgdlg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< + $(OBJS)\corelib_msw_scrolbar.obj : .AUTODEPEND ..\..\src\msw\scrolbar.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -12814,9 +12863,6 @@ $(OBJS)\corelib_generic_listctrl.obj : .AUTODEPEND ..\..\src\generic\listctrl.c $(OBJS)\corelib_mdig.obj : .AUTODEPEND ..\..\src\generic\mdig.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -$(OBJS)\corelib_msgdlgg.obj : .AUTODEPEND ..\..\src\generic\msgdlgg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - $(OBJS)\corelib_univ_bmpbuttn.obj : .AUTODEPEND ..\..\src\univ\bmpbuttn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -13813,6 +13859,11 @@ $(OBJS)\corelib_logg.obj : .AUTODEPEND ..\..\src\generic\logg.cpp !endif !ifeq USE_GUI 1 +$(OBJS)\corelib_msgdlgg.obj : .AUTODEPEND ..\..\src\generic\msgdlgg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 $(OBJS)\corelib_numdlgg.obj : .AUTODEPEND ..\..\src\generic\numdlgg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif @@ -13838,6 +13889,11 @@ $(OBJS)\corelib_renderg.obj : .AUTODEPEND ..\..\src\generic\renderg.cpp !endif !ifeq USE_GUI 1 +$(OBJS)\corelib_richmsgdlgg.obj : .AUTODEPEND ..\..\src\generic\richmsgdlgg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 $(OBJS)\corelib_scrlwing.obj : .AUTODEPEND ..\..\src\generic\scrlwing.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp index 53620c05fb..8bff982d6c 100644 --- a/build/msw/wx_core.dsp +++ b/build/msw/wx_core.dsp @@ -2103,6 +2103,41 @@ SOURCE=..\..\src\msw\renderer.cpp # End Source File # Begin Source File +SOURCE=..\..\src\msw\richmsgdlg.cpp + +!IF "$(CFG)" == "core - Win32 DLL Universal Release" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "core - Win32 DLL Release" + + +!ELSEIF "$(CFG)" == "core - Win32 DLL Debug" + + +!ELSEIF "$(CFG)" == "core - Win32 Universal Release" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "core - Win32 Universal Debug" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "core - Win32 Release" + + +!ELSEIF "$(CFG)" == "core - Win32 Debug" + + +!ENDIF + +# End Source File +# Begin Source File + SOURCE=..\..\src\msw\scrolbar.cpp !IF "$(CFG)" == "core - Win32 DLL Universal Release" @@ -3052,37 +3087,6 @@ SOURCE=..\..\src\generic\mdig.cpp # Begin Source File SOURCE=..\..\src\generic\msgdlgg.cpp - -!IF "$(CFG)" == "core - Win32 DLL Universal Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Universal Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Universal Debug" - - -!ELSEIF "$(CFG)" == "core - Win32 Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Debug" - -# PROP Exclude_From_Build 1 - -!ENDIF - # End Source File # Begin Source File @@ -3110,6 +3114,10 @@ SOURCE=..\..\src\generic\renderg.cpp # End Source File # Begin Source File +SOURCE=..\..\src\generic\richmsgdlgg.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\generic\scrlwing.cpp # End Source File # Begin Source File @@ -5170,6 +5178,10 @@ SOURCE=..\..\include\wx\msw\region.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\msw\richmsgdlg.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\msw\scrolbar.h # End Source File # Begin Source File @@ -5458,6 +5470,10 @@ SOURCE=..\..\include\wx\generic\propdlg.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\generic\richmsgdlgg.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\generic\sashwin.h # End Source File # Begin Source File @@ -6454,6 +6470,10 @@ SOURCE=..\..\include\wx\renderer.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\richmsgdlg.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\richtext\richtextbuffer.h # End Source File # Begin Source File diff --git a/build/msw/wx_vc7_core.vcproj b/build/msw/wx_vc7_core.vcproj index 2b829f6e30..033941da73 100644 --- a/build/msw/wx_vc7_core.vcproj +++ b/build/msw/wx_vc7_core.vcproj @@ -1985,6 +1985,21 @@ RelativePath="..\..\src\msw\renderer.cpp"> + + + + + + @@ -2740,18 +2755,6 @@ - - - - @@ -2772,6 +2775,9 @@ RelativePath="..\..\src\generic\renderg.cpp"> + + + + + + + + + + + + + + - - - - + + @@ -5992,6 +6000,10 @@ > + + @@ -6281,6 +6293,10 @@ > + + @@ -7280,6 +7296,10 @@ > + + diff --git a/build/msw/wx_vc9_core.vcproj b/build/msw/wx_vc9_core.vcproj index 1f033cfcf9..7511147f48 100644 --- a/build/msw/wx_vc9_core.vcproj +++ b/build/msw/wx_vc9_core.vcproj @@ -2676,6 +2676,26 @@ > + + + + + + - - - - + + @@ -5988,6 +5996,10 @@ > + + @@ -6277,6 +6289,10 @@ > + + @@ -7276,6 +7292,10 @@ > + + diff --git a/configure b/configure index 835353aab4..e6e851bdd2 100755 --- a/configure +++ b/configure @@ -1843,6 +1843,7 @@ Optional Features: --enable-popupwin use wxPopUpWindow class --enable-radiobox use wxRadioBox class --enable-radiobtn use wxRadioButton class + --enable-richmsgdlg use wxRichMessageDialog class --enable-rearrangectrl use wxRearrangeList/Ctrl/Dialog --enable-sash use wxSashWindow class --enable-scrollbar use wxScrollBar class and scrollable windows @@ -9760,6 +9761,7 @@ if test "$wxUSE_CONTROLS" = "no"; then DEFAULT_wxUSE_POPUPWIN=no DEFAULT_wxUSE_RADIOBOX=no DEFAULT_wxUSE_RADIOBTN=no + DEFAULT_wxUSE_RICHMSGDLG=no DEFAULT_wxUSE_REARRANGECTRL=no DEFAULT_wxUSE_SASH=no DEFAULT_wxUSE_SCROLLBAR=no @@ -11543,6 +11545,50 @@ fi echo "${ECHO_T}$result" >&6; } + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-richmsgdlg" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-richmsgdlg... $ECHO_C" >&6; } + # Check whether --enable-richmsgdlg was given. +if test "${enable_richmsgdlg+set}" = set; then + enableval=$enable_richmsgdlg; + if test "$enableval" = yes; then + wx_cv_use_richmsgdlg='wxUSE_RICHMSGDLG=yes' + else + wx_cv_use_richmsgdlg='wxUSE_RICHMSGDLG=no' + fi + +else + + wx_cv_use_richmsgdlg='wxUSE_RICHMSGDLG=${'DEFAULT_wxUSE_RICHMSGDLG":-$defaultval}" + +fi + + + eval "$wx_cv_use_richmsgdlg" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_RICHMSGDLG = no; then + result=yes + else + result=no + fi + else + result=$wxUSE_RICHMSGDLG + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + enablestring= defaultval=$wxUSE_ALL_FEATURES if test -z "$defaultval"; then @@ -47195,6 +47241,13 @@ _ACEOF fi +if test "$wxUSE_RICHMSGDLG" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_RICHMSGDLG 1 +_ACEOF + +fi + if test "$wxUSE_SASH" = "yes"; then cat >>confdefs.h <<\_ACEOF #define wxUSE_SASH 1 diff --git a/configure.in b/configure.in index dbe9b500cd..ff376e9cd1 100644 --- a/configure.in +++ b/configure.in @@ -898,6 +898,7 @@ if test "$wxUSE_CONTROLS" = "no"; then DEFAULT_wxUSE_POPUPWIN=no DEFAULT_wxUSE_RADIOBOX=no DEFAULT_wxUSE_RADIOBTN=no + DEFAULT_wxUSE_RICHMSGDLG=no DEFAULT_wxUSE_REARRANGECTRL=no DEFAULT_wxUSE_SASH=no DEFAULT_wxUSE_SCROLLBAR=no @@ -961,6 +962,7 @@ WX_ARG_FEATURE(odcombobox, [ --enable-odcombobox use wxOwnerDrawnComboBox WX_ARG_FEATURE(popupwin, [ --enable-popupwin use wxPopUpWindow class], wxUSE_POPUPWIN) WX_ARG_FEATURE(radiobox, [ --enable-radiobox use wxRadioBox class], wxUSE_RADIOBOX) WX_ARG_FEATURE(radiobtn, [ --enable-radiobtn use wxRadioButton class], wxUSE_RADIOBTN) +WX_ARG_FEATURE(richmsgdlg, [ --enable-richmsgdlg use wxRichMessageDialog class], wxUSE_RICHMSGDLG) WX_ARG_FEATURE(rearrangectrl,[ --enable-rearrangectrl use wxRearrangeList/Ctrl/Dialog], wxUSE_REARRANGECTRL) WX_ARG_FEATURE(sash, [ --enable-sash use wxSashWindow class], wxUSE_SASH) WX_ARG_FEATURE(scrollbar, [ --enable-scrollbar use wxScrollBar class and scrollable windows], wxUSE_SCROLLBAR) @@ -6970,6 +6972,10 @@ if test "$wxUSE_REARRANGECTRL" = "yes"; then AC_DEFINE(wxUSE_REARRANGECTRL) fi +if test "$wxUSE_RICHMSGDLG" = "yes"; then + AC_DEFINE(wxUSE_RICHMSGDLG) +fi + if test "$wxUSE_SASH" = "yes"; then AC_DEFINE(wxUSE_SASH) SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sashtest" diff --git a/docs/changes.txt b/docs/changes.txt index 2c59d6a262..8d94d5c37c 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -412,6 +412,7 @@ MSW: All (GUI): +- Added wxRichMessageDialog (Rickard Westerlund, GSoC 2010 project). - Added wxCommandLinkButton (Rickard Westerlund, GSoC 2010 project). - wxAUI: support auto-orientable toolbars (wsu). - Added wxDataViewCtrl::Set/GetCurrentItem(). diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h index 7603663aa8..e71915d016 100644 --- a/include/wx/chkconf.h +++ b/include/wx/chkconf.h @@ -929,6 +929,14 @@ # endif #endif /* !defined(wxUSE_RIBBON) */ +#ifndef wxUSE_RICHMSGDLG +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_RICHMSGDLG must be defined, please read comment near the top of this file." +# else +# define wxUSE_RICHMSGDLG 0 +# endif +#endif /* !defined(wxUSE_RIBBON) */ + #ifndef wxUSE_SASH # ifdef wxABORT_ON_CONFIG_ERROR # error "wxUSE_SASH must be defined, please read comment near the top of this file." @@ -1539,6 +1547,17 @@ # endif #endif /* wxUSE_REARRANGECTRL */ +#if wxUSE_RICHMSGDLG +# if !wxUSE_MSGDLG +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_RICHMSGDLG requires wxUSE_MSGDLG" +# else +# undef wxUSE_MSGDLG +# define wxUSE_MSGDLG 1 +# endif +# endif +#endif /* wxUSE_RICHMSGDLG */ + /* don't attempt to use native status bar on the platforms not having it */ #ifndef wxUSE_NATIVE_STATUSBAR # define wxUSE_NATIVE_STATUSBAR 0 diff --git a/include/wx/generic/richmsgdlgg.h b/include/wx/generic/richmsgdlgg.h new file mode 100644 index 0000000000..fdff492ec3 --- /dev/null +++ b/include/wx/generic/richmsgdlgg.h @@ -0,0 +1,54 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: wx/generic/richmsgdlgg.h +// Purpose: wxGenericRichMessageDialog +// Author: Rickard Westerlund +// Created: 2010-07-04 +// RCS-ID: $Id$ +// Copyright: (c) 2010 wxWidgets team +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_GENERIC_RICHMSGDLGG_H_ +#define _WX_GENERIC_RICHMSGDLGG_H_ + +class WXDLLIMPEXP_FWD_CORE wxCheckBox; +class WXDLLIMPEXP_FWD_CORE wxCollapsiblePane; +class WXDLLIMPEXP_FWD_CORE wxCollapsiblePaneEvent; + +class WXDLLIMPEXP_CORE wxGenericRichMessageDialog + : public wxRichMessageDialogBase +{ +public: + wxGenericRichMessageDialog(wxWindow *parent, + const wxString& message, + const wxString& caption, + long style) + : wxRichMessageDialogBase( parent, message, caption, style ), + m_checkBox(NULL), + m_detailsPane(NULL) + { } + + virtual bool IsCheckBoxChecked() const + { + // This function can be called before the dialog is shown and hence + // before the check box is created. + return m_checkBox? m_checkBoxValue : m_checkBox->IsChecked(); + } + +protected: + wxCheckBox *m_checkBox; + wxCollapsiblePane *m_detailsPane; + + // overrides methods in the base class + virtual void AddMessageDialogCheckBox(wxSizer *sizer); + virtual void AddMessageDialogDetails(wxSizer *sizer); + +private: + void OnPaneChanged(wxCollapsiblePaneEvent& event); + + DECLARE_EVENT_TABLE() + + wxDECLARE_NO_COPY_CLASS(wxGenericRichMessageDialog); +}; + +#endif // _WX_GENERIC_RICHMSGDLGG_H_ diff --git a/include/wx/motif/setup0.h b/include/wx/motif/setup0.h index 76b436545f..955c6d244f 100644 --- a/include/wx/motif/setup0.h +++ b/include/wx/motif/setup0.h @@ -751,6 +751,7 @@ #define wxUSE_LISTCTRL 1 // wxListCtrl #define wxUSE_RADIOBOX 1 // wxRadioBox #define wxUSE_RADIOBTN 1 // wxRadioButton +#define wxUSE_RICHMSGDLG 1 // wxRichMessageDialog #define wxUSE_SCROLLBAR 1 // wxScrollBar #define wxUSE_SEARCHCTRL 1 // wxSearchCtrl #define wxUSE_SLIDER 1 // wxSlider diff --git a/include/wx/msw/richmsgdlg.h b/include/wx/msw/richmsgdlg.h new file mode 100644 index 0000000000..cbbe4eaa65 --- /dev/null +++ b/include/wx/msw/richmsgdlg.h @@ -0,0 +1,31 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: wx/msw/richmsgdlg.h +// Purpose: wxRichMessageDialog +// Author: Rickard Westerlund +// Created: 2010-07-04 +// RCS-ID: $Id$ +// Copyright: (c) 2010 wxWidgets team +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_MSW_RICHMSGDLG_H_ +#define _WX_MSW_RICHMSGDLG_H_ + +class WXDLLIMPEXP_CORE wxRichMessageDialog : public wxGenericRichMessageDialog +{ +public: + wxRichMessageDialog(wxWindow *parent, + const wxString& message, + const wxString& caption, + long style) + : wxGenericRichMessageDialog(parent, message, caption, style) + { } + + // overridden base class method showing the native task dialog if possible + virtual int ShowModal(); + +private: + wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxRichMessageDialog); +}; + +#endif // _WX_MSW_RICHMSGDLG_H_ diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h index eff307a202..58314a3af3 100644 --- a/include/wx/msw/setup0.h +++ b/include/wx/msw/setup0.h @@ -751,6 +751,7 @@ #define wxUSE_LISTCTRL 1 // wxListCtrl #define wxUSE_RADIOBOX 1 // wxRadioBox #define wxUSE_RADIOBTN 1 // wxRadioButton +#define wxUSE_RICHMSGDLG 1 // wxRichMessageDialog #define wxUSE_SCROLLBAR 1 // wxScrollBar #define wxUSE_SEARCHCTRL 1 // wxSearchCtrl #define wxUSE_SLIDER 1 // wxSlider diff --git a/include/wx/msw/wince/setup.h b/include/wx/msw/wince/setup.h index 52cca1d4f4..0cb30ad968 100644 --- a/include/wx/msw/wince/setup.h +++ b/include/wx/msw/wince/setup.h @@ -751,6 +751,7 @@ #define wxUSE_LISTCTRL 1 // wxListCtrl #define wxUSE_RADIOBOX 1 // wxRadioBox #define wxUSE_RADIOBTN 1 // wxRadioButton +#define wxUSE_RICHMSGDLG 1 // wxRichMessageDialog #define wxUSE_SCROLLBAR 1 // wxScrollBar #define wxUSE_SEARCHCTRL 1 // wxSearchCtrl #define wxUSE_SLIDER 1 // wxSlider diff --git a/include/wx/os2/setup0.h b/include/wx/os2/setup0.h index e13174a23c..9b6bbe57a9 100644 --- a/include/wx/os2/setup0.h +++ b/include/wx/os2/setup0.h @@ -751,6 +751,7 @@ #define wxUSE_LISTCTRL 1 // wxListCtrl #define wxUSE_RADIOBOX 1 // wxRadioBox #define wxUSE_RADIOBTN 1 // wxRadioButton +#define wxUSE_RICHMSGDLG 1 // wxRichMessageDialog #define wxUSE_SCROLLBAR 1 // wxScrollBar #define wxUSE_SEARCHCTRL 1 // wxSearchCtrl #define wxUSE_SLIDER 1 // wxSlider diff --git a/include/wx/osx/setup0.h b/include/wx/osx/setup0.h index 6561837cdb..1093b26954 100644 --- a/include/wx/osx/setup0.h +++ b/include/wx/osx/setup0.h @@ -752,6 +752,7 @@ #define wxUSE_LISTCTRL 1 // wxListCtrl #define wxUSE_RADIOBOX 1 // wxRadioBox #define wxUSE_RADIOBTN 1 // wxRadioButton +#define wxUSE_RICHMSGDLG 1 // wxRichMessageDialog #define wxUSE_SCROLLBAR 1 // wxScrollBar #define wxUSE_SEARCHCTRL 1 // wxSearchCtrl #define wxUSE_SLIDER 1 // wxSlider diff --git a/include/wx/palmos/setup0.h b/include/wx/palmos/setup0.h index 6fe0162e83..3ddfa59f78 100644 --- a/include/wx/palmos/setup0.h +++ b/include/wx/palmos/setup0.h @@ -751,6 +751,7 @@ #define wxUSE_LISTCTRL 1 // wxListCtrl #define wxUSE_RADIOBOX 1 // wxRadioBox #define wxUSE_RADIOBTN 1 // wxRadioButton +#define wxUSE_RICHMSGDLG 1 // wxRichMessageDialog #define wxUSE_SCROLLBAR 1 // wxScrollBar #define wxUSE_SEARCHCTRL 1 // wxSearchCtrl #define wxUSE_SLIDER 1 // wxSlider diff --git a/include/wx/richmsgdlg.h b/include/wx/richmsgdlg.h new file mode 100644 index 0000000000..06f6c4bea1 --- /dev/null +++ b/include/wx/richmsgdlg.h @@ -0,0 +1,89 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: wx/richmsgdlg.h +// Purpose: wxRichMessageDialogBase +// Author: Rickard Westerlund +// Created: 2010-07-03 +// RCS-ID: $Id$ +// Copyright: (c) 2010 wxWidgets team +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_RICHMSGDLG_H_BASE_ +#define _WX_RICHMSGDLG_H_BASE_ + +#include "wx/defs.h" + +#if wxUSE_RICHMSGDLG + +#include "wx/msgdlg.h" + +// Extends a message dialog with an optional checkbox and user-expandable +// detailed text. +class WXDLLIMPEXP_CORE wxRichMessageDialogBase : public wxGenericMessageDialog +{ +public: + wxRichMessageDialogBase( wxWindow *parent, + const wxString& message, + const wxString& caption, + long style ) + : wxGenericMessageDialog( parent, message, caption, style ), + m_detailsExpanderCollapsedLabel( _("&See details") ), + m_detailsExpanderExpandedLabel( _("&Hide details") ), + m_checkBoxValue( false ) + { } + + void ShowCheckBox(const wxString& checkBoxText, bool checked = false) + { + m_checkBoxText = checkBoxText; + m_checkBoxValue = checked; + } + + wxString GetCheckBoxText() const { return m_checkBoxText; } + + void ShowDetailedText(const wxString& detailedText) + { m_detailedText = detailedText; } + + wxString GetDetailedText() const { return m_detailedText; } + + virtual bool IsCheckBoxChecked() const { return m_checkBoxValue; }; + +protected: + const wxString m_detailsExpanderCollapsedLabel; + const wxString m_detailsExpanderExpandedLabel; + + wxString m_checkBoxText; + bool m_checkBoxValue; + wxString m_detailedText; + +private: + void ShowDetails(bool shown); + + wxDECLARE_NO_COPY_CLASS(wxRichMessageDialogBase); +}; + +// Always include the generic version as it's currently used as the base class +// by the MSW native implementation too. +#include "wx/generic/richmsgdlgg.h" + +#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) + #include "wx/msw/richmsgdlg.h" +#else + class WXDLLIMPEXP_CORE wxRichMessageDialog + : public wxGenericRichMessageDialog + { + public: + wxRichMessageDialog( wxWindow *parent, + const wxString& message, + const wxString& caption, + long style ) + : wxGenericRichMessageDialog( parent, message, caption, style ) + { } + + private: + wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxRichMessageDialog); + }; +#endif + +#endif // wxUSE_RICHMSGDLG + +#endif // _WX_RICHMSGDLG_H_BASE_ diff --git a/include/wx/setup_inc.h b/include/wx/setup_inc.h index 18fa4a2341..9f6cb8cac0 100644 --- a/include/wx/setup_inc.h +++ b/include/wx/setup_inc.h @@ -747,6 +747,7 @@ #define wxUSE_LISTCTRL 1 // wxListCtrl #define wxUSE_RADIOBOX 1 // wxRadioBox #define wxUSE_RADIOBTN 1 // wxRadioButton +#define wxUSE_RICHMSGDLG 1 // wxRichMessageDialog #define wxUSE_SCROLLBAR 1 // wxScrollBar #define wxUSE_SEARCHCTRL 1 // wxSearchCtrl #define wxUSE_SLIDER 1 // wxSlider diff --git a/include/wx/univ/setup0.h b/include/wx/univ/setup0.h index 81558bd7c3..afea2b1a6d 100644 --- a/include/wx/univ/setup0.h +++ b/include/wx/univ/setup0.h @@ -750,6 +750,7 @@ #define wxUSE_LISTCTRL 1 // wxListCtrl #define wxUSE_RADIOBOX 1 // wxRadioBox #define wxUSE_RADIOBTN 1 // wxRadioButton +#define wxUSE_RICHMSGDLG 1 // wxRichMessageDialog #define wxUSE_SCROLLBAR 1 // wxScrollBar #define wxUSE_SEARCHCTRL 1 // wxSearchCtrl #define wxUSE_SLIDER 1 // wxSlider diff --git a/interface/wx/richmsgdlg.h b/interface/wx/richmsgdlg.h new file mode 100644 index 0000000000..a69022132a --- /dev/null +++ b/interface/wx/richmsgdlg.h @@ -0,0 +1,131 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: wx/richmsgdlg.h +// Purpose: interface of wxRichMessageDialog +// Author: wxWidgets team +// RCS-ID: $Id$ +// Licence: wxWindows license +///////////////////////////////////////////////////////////////////////////// + +/** + @class wxRichMessageDialog + + Extension of wxMessageDialog with additional functionality. + + This class adds the possibility of using a checkbox (that is especially + useful for implementing the "Don't ask me again" kind of dialogs) and an + extra explanatory text which is initially collapsed and not shown to the + user but can be expanded to show more information. + + Notice that currently the native dialog is used only under MSW when using + Vista or later Windows version. Elsewhere, or for older versions of + Windows, a generic implementation which is less familiar to the users is + used. Because of this it's recommended to use this class only if you do + need its extra functionality and use wxMessageDialog which does have native + implementation under all platforms otherwise. However if you do need to put + e.g. a checkbox in a dialog, you should definitely consider using this + class instead of using your own custom dialog because it will have much + better appearance at least under recent Windows versions. + + To use this class, you need to create the dialog object and call + ShowCheckBox() and/or ShowDetailedText() to configure its contents. + Other than that, it is used in exactly the same way as wxMessageDialog and + supports all the styles supported by it. In particular, ShowModal() return + value is the same as for wxMessageDialog. The only difference is that you + need to use IsCheckBoxChecked() to examine the checkbox value if you had + called ShowCheckBox(). + + Here is a simple example: + @code + void MyFrame::ShowDialog() + { + if ( ... shouldn't show this dialog again ... ) + return; + + wxRichMessageDialog dlg(this, "Welcome to my wonderful program!"); + dlg.ShowCheckBox("Don't show welcome dialog again"); + dlg.ShowModal(); // return value ignored as we have "Ok" only anyhow + + if ( dlg.IsCheckBoxChecked() ) + ... make sure we won't show it again the next time ... + } + @endcode + + @since 2.9.2 + + @library{wxcore} + @category{cmndlg} + + @see @ref overview_cmndlg_msg +*/ +class wxRichMessageDialog : public wxRichMessageDialogBase +{ +public: + /** + Constructor specifying the rich message dialog properties. + Works just like the constructor for wxMessageDialog. + */ + wxRichMessageDialog(wxWindow* parent, + const wxString& message, + const wxString& caption = wxMessageBoxCaptionStr, + long style = wxOK | wxCENTRE, + const wxPoint& pos = wxDefaultPosition); + + /** + Shows a checkbox with a given label or hides it. + + @param checkBoxText + If the parameter is non-empty a checkbox will be shown with that + label, otherwise it will be hidden. + @param checked + The initial state of the checkbox. + */ + void ShowCheckBox(const wxString& checkBoxText, bool checked = false); + + + /** + Retrieves the label for the checkbox. + + @return + The label for the checkbox, will be the empty string if no + checkbox is used. + */ + wxString GetCheckBoxText() const; + + /** + Shows or hides a detailed text and an expander that is used to + show or hide the detailed text. + + @param detailedText + The detailed text that can be expanded when the dialog is shown, + if empty no detailed text will be used. + */ + void ShowDetailedText(const wxString& detailedText); + + /** + Retrieves the detailed text. + + @return + The detailed text or empty if detailed text is not used. + */ + wxString GetDetailedText() const; + + /** + Retrieves the state of the checkbox. + + If this method is called before showing the dialog, the initial value + of the checkbox, as set by ShowCheckBox() is used. If it is called + after calling wxDialog::ShowModal(), the value set by the user is + returned. + + @return @true if the checkbox is checked or @false if not. + */ + bool IsCheckBoxChecked() const; + + /** + Shows the dialog, returning one of wxID_OK, wxID_CANCEL, wxID_YES, wxID_NO. + + IsCheckBoxChecked() can be called afterwards to retrieve the value of the + check box if one was used. + */ + virtual int ShowModal(); +}; diff --git a/samples/dialogs/dialogs.cpp b/samples/dialogs/dialogs.cpp index 1d15d80848..2a0a1b95e2 100644 --- a/samples/dialogs/dialogs.cpp +++ b/samples/dialogs/dialogs.cpp @@ -33,6 +33,10 @@ #include "wx/sysopt.h" #include "wx/notifmsg.h" +#if wxUSE_RICHMSGDLG + #include "wx/richmsgdlg.h" +#endif // wxUSE_RICHMSGDLG + #if wxUSE_COLOURDLG #include "wx/colordlg.h" #endif // wxUSE_COLOURDLG @@ -127,6 +131,9 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(DIALOGS_MESSAGE_DIALOG, MyFrame::MessageBoxDialog) EVT_MENU(DIALOGS_MESSAGE_BOX_WXINFO, MyFrame::MessageBoxInfo) #endif // wxUSE_MSGDLG +#if wxUSE_RICHMSGDLG + EVT_MENU(DIALOGS_RICH_MESSAGE_DIALOG, MyFrame::RichMessageDialog) +#endif // wxUSE_RICHMSGDLG #if wxUSE_COLOURDLG EVT_MENU(DIALOGS_CHOOSE_COLOUR, MyFrame::ChooseColour) EVT_MENU(DIALOGS_GET_COLOUR, MyFrame::GetColour) @@ -289,6 +296,9 @@ bool MyApp::OnInit() menuDlg->Append(DIALOGS_MESSAGE_BOX, wxT("&Message box\tCtrl-M")); menuDlg->Append(DIALOGS_MESSAGE_BOX_WINDOW_MODAL, wxT("Window-Modal Message box ")); menuDlg->Append(DIALOGS_MESSAGE_DIALOG, wxT("Message dialog\tShift-Ctrl-M")); +#if wxUSE_RICHMSGDLG + menuDlg->Append(DIALOGS_RICH_MESSAGE_DIALOG, wxT("Rich message dialog")); +#endif // wxUSE_RICHMSGDLG #if wxUSE_COLOURDLG || wxUSE_FONTDLG || wxUSE_CHOICEDLG @@ -844,6 +854,7 @@ void MyFrame::MessageBoxWindowModalClosed(wxWindowModalDialogEvent& event) void MyFrame::MessageBoxDialog(wxCommandEvent& WXUNUSED(event)) { TestMessageBoxDialog dlg(this); + dlg.Create(); dlg.ShowModal(); } @@ -853,6 +864,15 @@ void MyFrame::MessageBoxInfo(wxCommandEvent& WXUNUSED(event)) } #endif // wxUSE_MSGDLG +#if wxUSE_RICHMSGDLG +void MyFrame::RichMessageDialog(wxCommandEvent& WXUNUSED(event)) +{ + TestRichMessageDialog dlg(this); + dlg.Create(); + dlg.ShowModal(); +} +#endif // wxUSE_RICHMSGDLG + #if wxUSE_NUMBERDLG void MyFrame::NumericEntry(wxCommandEvent& WXUNUSED(event)) { @@ -2513,6 +2533,9 @@ wxPanel* SettingsDialog::CreateAestheticSettingsPage(wxWindow* parent) return panel; } +#endif // USE_SETTINGS_DIALOG + +#if wxUSE_MSGDLG // ---------------------------------------------------------------------------- // TestMessageBoxDialog // ---------------------------------------------------------------------------- @@ -2535,6 +2558,10 @@ TestMessageBoxDialog::TestMessageBoxDialog(wxWindow *parent) : wxDialog(parent, wxID_ANY, "Message Box Test Dialog", wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER) +{ +} + +bool TestMessageBoxDialog::Create() { wxSizer * const sizerTop = new wxBoxSizer(wxVERTICAL); @@ -2555,11 +2582,13 @@ TestMessageBoxDialog::TestMessageBoxDialog(wxWindow *parent) sizerTop->Add(sizerMsgs, wxSizerFlags(1).Expand().Border()); + // if a derived class provides more message configurations, add these. + AddAdditionalTextOptions(sizerTop); // this one is for configuring the buttons wxSizer * const sizerBtnsBox = new wxStaticBoxSizer(wxVERTICAL, this, "&Buttons"); - + wxFlexGridSizer * const sizerBtns = new wxFlexGridSizer(2, 5, 5); sizerBtns->AddGrowableCol(1); @@ -2622,6 +2651,9 @@ TestMessageBoxDialog::TestMessageBoxDialog(wxWindow *parent) m_chkCentre = new wxCheckBox(this, wxID_ANY, "Centre on &parent"); sizerFlags->Add(m_chkCentre, wxSizerFlags(1).Border()); + // add any additional flag from subclasses + AddAdditionalFlags(sizerFlags); + sizerTop->Add(sizerFlags, wxSizerFlags().Expand().Border()); // finally buttons to show the resulting message box and close this dialog @@ -2631,6 +2663,8 @@ TestMessageBoxDialog::TestMessageBoxDialog(wxWindow *parent) SetSizerAndFit(sizerTop); m_buttons[Btn_Ok]->SetValue(true); + + return true; } void TestMessageBoxDialog::OnUpdateLabelUI(wxUpdateUIEvent& event) @@ -2652,7 +2686,7 @@ void TestMessageBoxDialog::OnUpdateNoDefaultUI(wxUpdateUIEvent& event) event.Enable( m_buttons[Btn_No]->IsChecked() ); } -void TestMessageBoxDialog::OnApply(wxCommandEvent& WXUNUSED(event)) +long TestMessageBoxDialog::GetStyle() { long style = 0; @@ -2697,9 +2731,13 @@ void TestMessageBoxDialog::OnApply(wxCommandEvent& WXUNUSED(event)) if ( m_chkNoDefault->IsEnabled() && m_chkNoDefault->IsChecked() ) style |= wxNO_DEFAULT; + return style; +} + +void TestMessageBoxDialog::PrepareMessageDialog(wxMessageDialogBase &dlg) +{ + long style = dlg.GetMessageDialogStyle(); - wxMessageDialog dlg(this, m_textMsg->GetValue(), "Test Message Box", - style); if ( !m_textExtMsg->IsEmpty() ) dlg.SetExtendedMessage(m_textExtMsg->GetValue()); @@ -2729,6 +2767,12 @@ void TestMessageBoxDialog::OnApply(wxCommandEvent& WXUNUSED(event)) dlg.SetOKLabel(m_labels[Btn_Ok]->GetValue()); } } +} + +void TestMessageBoxDialog::OnApply(wxCommandEvent& WXUNUSED(event)) +{ + wxMessageDialog dlg(this, GetMessage(), "Test Message Box", GetStyle()); + PrepareMessageDialog(dlg); dlg.ShowModal(); } @@ -2737,8 +2781,69 @@ void TestMessageBoxDialog::OnClose(wxCommandEvent& WXUNUSED(event)) { EndModal(wxID_CANCEL); } +#endif // wxUSE_MSGDLG -#endif // USE_SETTINGS_DIALOG +#if wxUSE_RICHMSGDLG +// ---------------------------------------------------------------------------- +// TestRichMessageDialog +// ---------------------------------------------------------------------------- + +BEGIN_EVENT_TABLE(TestRichMessageDialog, TestMessageBoxDialog) + EVT_BUTTON(wxID_APPLY, TestRichMessageDialog::OnApply) +END_EVENT_TABLE() + +TestRichMessageDialog::TestRichMessageDialog(wxWindow *parent) + : TestMessageBoxDialog(parent) +{ + SetTitle("Rich Message Dialog Test Dialog"); +} + +void TestRichMessageDialog::AddAdditionalTextOptions(wxSizer *sizer) +{ + wxSizer * const sizerMsgs = new wxStaticBoxSizer(wxVERTICAL, this, + "&Additional Elements"); + + // add a option to show a check box. + wxFlexGridSizer * const sizerCheckBox = new wxFlexGridSizer(2, 5, 5); + sizerCheckBox->AddGrowableCol(1); + sizerCheckBox->Add(new wxStaticText(this, wxID_ANY, "&Check box:")); + m_textCheckBox = new wxTextCtrl(this, wxID_ANY); + sizerCheckBox->Add(m_textCheckBox, wxSizerFlags(1).Expand().Border(wxBOTTOM)); + sizerMsgs->Add(sizerCheckBox, wxSizerFlags(1).Expand()); + + // add option to show a detailed text. + sizerMsgs->Add(new wxStaticText(this, wxID_ANY, "&Detailed message:")); + m_textDetailed = new wxTextCtrl(this, wxID_ANY, "", + wxDefaultPosition, wxDefaultSize, + wxTE_MULTILINE); + sizerMsgs->Add(m_textDetailed, wxSizerFlags(1).Expand()); + + sizer->Add(sizerMsgs, wxSizerFlags(1).Expand().Border()); +} + +void TestRichMessageDialog::AddAdditionalFlags(wxSizer *sizer) +{ + // add checkbox to set the initial state for the checkbox shown + // in the dialog. + m_initialValueCheckBox = + new wxCheckBox(this, wxID_ANY, "Checkbox initially checked"); + sizer->Add(m_initialValueCheckBox, wxSizerFlags(1).Border()); +} + +void TestRichMessageDialog::OnApply(wxCommandEvent& WXUNUSED(event)) +{ + wxRichMessageDialog dlg(this, GetMessage(), "Test Rich Message Dialog", + GetStyle()); + PrepareMessageDialog(dlg); + + dlg.ShowCheckBox(m_textCheckBox->GetValue(), + m_initialValueCheckBox->GetValue()); + dlg.ShowDetailedText(m_textDetailed->GetValue()); + + dlg.ShowModal(); +} + +#endif // wxUSE_RICHMSGDLG #if wxUSE_LOG diff --git a/samples/dialogs/dialogs.h b/samples/dialogs/dialogs.h index 655b76f2ff..d63cd1717b 100644 --- a/samples/dialogs/dialogs.h +++ b/samples/dialogs/dialogs.h @@ -191,12 +191,23 @@ class TestMessageBoxDialog : public wxDialog public: TestMessageBoxDialog(wxWindow *parent); -private: + bool Create(); + +protected: + wxString GetMessage() { return m_textMsg->GetValue(); } + long GetStyle(); + + void PrepareMessageDialog(wxMessageDialogBase &dlg); + + virtual void AddAdditionalTextOptions(wxSizer *WXUNUSED(sizer)) { } + virtual void AddAdditionalFlags(wxSizer *WXUNUSED(sizer)) { } + void OnApply(wxCommandEvent& event); void OnClose(wxCommandEvent& event); void OnUpdateLabelUI(wxUpdateUIEvent& event); void OnUpdateNoDefaultUI(wxUpdateUIEvent& event); +private: enum { Btn_Yes, @@ -240,6 +251,28 @@ private: wxDECLARE_NO_COPY_CLASS(TestMessageBoxDialog); }; +#if wxUSE_RICHMSGDLG +class TestRichMessageDialog : public TestMessageBoxDialog +{ +public: + TestRichMessageDialog(wxWindow *parent); + +protected: + // overrides method in base class + virtual void AddAdditionalTextOptions(wxSizer *sizer); + virtual void AddAdditionalFlags(wxSizer *sizer); + + void OnApply(wxCommandEvent& event); + +private: + wxTextCtrl *m_textCheckBox; + wxCheckBox *m_initialValueCheckBox; + wxTextCtrl *m_textDetailed; + + DECLARE_EVENT_TABLE() +}; +#endif // wxUSE_RICHMSGDLG + class TestDefaultActionDialog: public wxDialog { public: @@ -302,6 +335,9 @@ public: void MessageBoxWindowModal(wxCommandEvent& event); void MessageBoxWindowModalClosed(wxWindowModalDialogEvent& event); #endif // wxUSE_MSGDLG +#if wxUSE_RICHMSGDLG + void RichMessageDialog(wxCommandEvent& event); +#endif // wxUSE_RICHMSGDLG #if wxUSE_COLOURDLG void ChooseColour(wxCommandEvent& event); @@ -480,6 +516,7 @@ enum DIALOGS_MESSAGE_BOX_WINDOW_MODAL, DIALOGS_MESSAGE_DIALOG, DIALOGS_MESSAGE_BOX_WXINFO, + DIALOGS_RICH_MESSAGE_DIALOG, DIALOGS_SINGLE_CHOICE, DIALOGS_MULTI_CHOICE, DIALOGS_REARRANGE, diff --git a/setup.h.in b/setup.h.in index 10e9747520..b975213e2a 100644 --- a/setup.h.in +++ b/setup.h.in @@ -375,6 +375,7 @@ #define wxUSE_LISTCTRL 0 #define wxUSE_RADIOBOX 0 #define wxUSE_RADIOBTN 0 +#define wxUSE_RICHMSGDLG 0 #define wxUSE_SCROLLBAR 0 #define wxUSE_SEARCHCTRL 0 #define wxUSE_SLIDER 0 diff --git a/src/generic/richmsgdlgg.cpp b/src/generic/richmsgdlgg.cpp new file mode 100644 index 0000000000..9f2efd9e51 --- /dev/null +++ b/src/generic/richmsgdlgg.cpp @@ -0,0 +1,87 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: src/generic/richmsgdlgg.cpp +// Purpose: wxGenericRichMessageDialog +// Author: Rickard Westerlund +// Created: 2010-07-04 +// RCS-ID: $Id$ +// Copyright: (c) 2010 wxWidgets team +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#ifdef __BORLANDC__ +#pragma hdrstop +#endif + +#if wxUSE_RICHMSGDLG + +#ifndef WX_PRECOMP + #include "wx/stattext.h" + #include "wx/sizer.h" +#endif + +#include "wx/collpane.h" +#include "wx/richmsgdlg.h" + +wxIMPLEMENT_CLASS(wxRichMessageDialog, wxDialog) + +// ---------------------------------------------------------------------------- +// Events and handlers +// ---------------------------------------------------------------------------- + +BEGIN_EVENT_TABLE(wxGenericRichMessageDialog, wxRichMessageDialogBase) + EVT_COLLAPSIBLEPANE_CHANGED(wxID_ANY, + wxGenericRichMessageDialog::OnPaneChanged) +END_EVENT_TABLE() + +void wxGenericRichMessageDialog::OnPaneChanged(wxCollapsiblePaneEvent& event) +{ + if ( event.GetCollapsed() ) + m_detailsPane->SetLabel( m_detailsExpanderCollapsedLabel ); + else + m_detailsPane->SetLabel( m_detailsExpanderExpandedLabel ); +} + +// ---------------------------------------------------------------------------- +// wxGenericRichMessageDialog +// ---------------------------------------------------------------------------- + +void wxGenericRichMessageDialog::AddMessageDialogCheckBox(wxSizer *sizer) +{ + if ( !m_checkBoxText.empty() ) + { + wxSizer *sizerCheckBox = new wxBoxSizer( wxHORIZONTAL ); + + m_checkBox = new wxCheckBox( this, + wxID_ANY, + m_checkBoxText ); + m_checkBox->SetValue( m_checkBoxValue ); + sizerCheckBox->Add( m_checkBox, 0, wxBOTTOM | wxALIGN_LEFT ); + + sizer->Add( sizerCheckBox, 0, wxTOP|wxLEFT|wxRIGHT | wxALIGN_LEFT, 10 ); + } +} + +void wxGenericRichMessageDialog::AddMessageDialogDetails(wxSizer *sizer) +{ + if ( !m_detailedText.empty() ) + { + wxSizer *sizerDetails = new wxBoxSizer( wxHORIZONTAL ); + + m_detailsPane = + new wxCollapsiblePane( this, -1, m_detailsExpanderCollapsedLabel ); + + // add the detailed text + wxWindow *windowPane = m_detailsPane->GetPane(); + wxSizer *sizerPane = new wxBoxSizer( wxHORIZONTAL ); + sizerPane->Add( new wxStaticText( windowPane, -1, m_detailedText ) ); + windowPane->SetSizer( sizerPane ); + + sizerDetails->Add( m_detailsPane, wxSizerFlags().Right().Expand() ); + sizer->Add( sizerDetails, 0, wxTOP|wxLEFT|wxRIGHT | wxALIGN_LEFT, 10 ); + } +} + +#endif // wxUSE_RICHMSGDLG diff --git a/src/msw/richmsgdlg.cpp b/src/msw/richmsgdlg.cpp new file mode 100644 index 0000000000..c329f503d1 --- /dev/null +++ b/src/msw/richmsgdlg.cpp @@ -0,0 +1,79 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: src/msw/richmsgdlg.cpp +// Purpose: wxRichMessageDialog +// Author: Rickard Westerlund +// Created: 2010-07-04 +// RCS-ID: $Id$ +// Copyright: (c) 2010 wxWidgets team +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#ifdef __BORLANDC__ +#pragma hdrstop +#endif + +#if wxUSE_RICHMSGDLG + +#include "wx/richmsgdlg.h" + +// This will define wxHAS_MSW_TASKDIALOG if we have support for it in the +// headers we use. +#include "wx/msw/private/msgdlg.h" + +// ---------------------------------------------------------------------------- +// wxRichMessageDialog +// ---------------------------------------------------------------------------- + +int wxRichMessageDialog::ShowModal() +{ +#ifdef wxHAS_MSW_TASKDIALOG + using namespace wxMSWMessageDialog; + + if ( HasNativeTaskDialog() ) + { + // create a task dialog + WinStruct tdc; + wxMSWTaskDialogConfig wxTdc(*this); + + wxTdc.MSWCommonTaskDialogInit( tdc ); + + // add a checkbox + if ( !m_checkBoxText.empty() ) + { + tdc.pszVerificationText = m_checkBoxText.wx_str(); + if ( m_checkBoxValue ) + tdc.dwFlags |= TDF_VERIFICATION_FLAG_CHECKED; + } + + // add collapsible footer + if ( !m_detailedText.empty() ) + tdc.pszExpandedInformation = m_detailedText.wx_str(); + + TaskDialogIndirect_t taskDialogIndirect = GetTaskDialogIndirectFunc(); + if ( !taskDialogIndirect ) + return wxID_CANCEL; + + // create the task dialog, process the answer and return it. + BOOL checkBoxChecked; + int msAns; + HRESULT hr = taskDialogIndirect( &tdc, &msAns, NULL, &checkBoxChecked ); + if ( FAILED(hr) ) + { + wxLogApiError( "TaskDialogIndirect", hr ); + return wxID_CANCEL; + } + m_checkBoxValue = checkBoxChecked != FALSE; + + return MSWTranslateReturnCode( msAns ); + } +#endif // wxHAS_MSW_TASKDIALOG + + // use the generic version when task dialog is't available at either + // compile or run-time. + return wxGenericRichMessageDialog::ShowModal(); +} + +#endif // wxUSE_RICHMSGDLG