diff --git a/Makefile.in b/Makefile.in index 277e7fc205..61deb7c5ef 100644 --- a/Makefile.in +++ b/Makefile.in @@ -5085,6 +5085,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS = \ monodll_generic_statusbr.o \ monodll_prntdlgg.o \ monodll_msw_accel.o \ + monodll_artmsw.o \ monodll_msw_bmpbuttn.o \ monodll_msw_button.o \ monodll_msw_checkbox.o \ @@ -5135,6 +5136,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS = \ @COND_TOOLKIT_MSW@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_MSW___GUI_SRC_OBJECTS) COND_TOOLKIT_OSX_CARBON___GUI_SRC_OBJECTS = \ $(__OSX_CARBON_COCOA_SRC_OBJECTS) \ + monodll_artmac.o \ monodll_carbon_bmpbuttn.o \ monodll_carbon_button.o \ monodll_carbon_checkbox.o \ @@ -5318,6 +5320,7 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS = \ monodll_generic_statusbr.o \ monodll_prntdlgg.o \ monodll_msw_accel.o \ + monodll_artmsw.o \ monodll_msw_bmpbuttn.o \ monodll_msw_button.o \ monodll_msw_checkbox.o \ @@ -6895,6 +6898,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_1 = \ monolib_generic_statusbr.o \ monolib_prntdlgg.o \ monolib_msw_accel.o \ + monolib_artmsw.o \ monolib_msw_bmpbuttn.o \ monolib_msw_button.o \ monolib_msw_checkbox.o \ @@ -6945,6 +6949,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_1 = \ @COND_TOOLKIT_MSW@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_1) COND_TOOLKIT_OSX_CARBON___GUI_SRC_OBJECTS_1 = \ $(__OSX_CARBON_COCOA_SRC_OBJECTS_0) \ + monolib_artmac.o \ monolib_carbon_bmpbuttn.o \ monolib_carbon_button.o \ monolib_carbon_checkbox.o \ @@ -7128,6 +7133,7 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_1 = \ monolib_generic_statusbr.o \ monolib_prntdlgg.o \ monolib_msw_accel.o \ + monolib_artmsw.o \ monolib_msw_bmpbuttn.o \ monolib_msw_button.o \ monolib_msw_checkbox.o \ @@ -8856,6 +8862,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_2 = \ coredll_generic_statusbr.o \ coredll_prntdlgg.o \ coredll_msw_accel.o \ + coredll_artmsw.o \ coredll_msw_bmpbuttn.o \ coredll_msw_button.o \ coredll_msw_checkbox.o \ @@ -8906,6 +8913,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_2 = \ @COND_TOOLKIT_MSW@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_2) COND_TOOLKIT_OSX_CARBON___GUI_SRC_OBJECTS_2 = \ $(__OSX_CARBON_COCOA_SRC_OBJECTS_8) \ + coredll_artmac.o \ coredll_carbon_bmpbuttn.o \ coredll_carbon_button.o \ coredll_carbon_checkbox.o \ @@ -9089,6 +9097,7 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_2 = \ coredll_generic_statusbr.o \ coredll_prntdlgg.o \ coredll_msw_accel.o \ + coredll_artmsw.o \ coredll_msw_bmpbuttn.o \ coredll_msw_button.o \ coredll_msw_checkbox.o \ @@ -10357,6 +10366,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_3 = \ corelib_generic_statusbr.o \ corelib_prntdlgg.o \ corelib_msw_accel.o \ + corelib_artmsw.o \ corelib_msw_bmpbuttn.o \ corelib_msw_button.o \ corelib_msw_checkbox.o \ @@ -10407,6 +10417,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_3 = \ @COND_TOOLKIT_MSW@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_3) COND_TOOLKIT_OSX_CARBON___GUI_SRC_OBJECTS_3 = \ $(__OSX_CARBON_COCOA_SRC_OBJECTS_9) \ + corelib_artmac.o \ corelib_carbon_bmpbuttn.o \ corelib_carbon_button.o \ corelib_carbon_checkbox.o \ @@ -10590,6 +10601,7 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_3 = \ corelib_generic_statusbr.o \ corelib_prntdlgg.o \ corelib_msw_accel.o \ + corelib_artmsw.o \ corelib_msw_bmpbuttn.o \ corelib_msw_button.o \ corelib_msw_checkbox.o \ @@ -11974,7 +11986,6 @@ COND_PLATFORM_MACOSX_1___OSX_CARBON_COCOA_SRC_OBJECTS = \ @COND_PLATFORM_MACOSX_1@__OSX_CARBON_COCOA_SRC_OBJECTS = $(COND_PLATFORM_MACOSX_1___OSX_CARBON_COCOA_SRC_OBJECTS) COND_PLATFORM_MACOSX_1___OSX_LOWLEVEL_SRC_OBJECTS = \ monodll_osx_accel.o \ - monodll_artmac.o \ monodll_bmpbuttn_osx.o \ monodll_osx_brush.o \ monodll_button_osx.o \ @@ -12136,7 +12147,6 @@ COND_PLATFORM_MACOSX_1___OSX_CARBON_COCOA_SRC_OBJECTS_0 = \ @COND_PLATFORM_MACOSX_1@__OSX_CARBON_COCOA_SRC_OBJECTS_0 = $(COND_PLATFORM_MACOSX_1___OSX_CARBON_COCOA_SRC_OBJECTS_0) COND_PLATFORM_MACOSX_1___OSX_LOWLEVEL_SRC_OBJECTS_17 = \ monolib_osx_accel.o \ - monolib_artmac.o \ monolib_bmpbuttn_osx.o \ monolib_osx_brush.o \ monolib_button_osx.o \ @@ -12298,7 +12308,6 @@ COND_PLATFORM_MACOSX_1___OSX_CARBON_COCOA_SRC_OBJECTS_8 = \ @COND_PLATFORM_MACOSX_1@__OSX_CARBON_COCOA_SRC_OBJECTS_8 = $(COND_PLATFORM_MACOSX_1___OSX_CARBON_COCOA_SRC_OBJECTS_8) COND_PLATFORM_MACOSX_1___OSX_LOWLEVEL_SRC_OBJECTS_1_1 = \ coredll_osx_accel.o \ - coredll_artmac.o \ coredll_bmpbuttn_osx.o \ coredll_osx_brush.o \ coredll_button_osx.o \ @@ -12379,7 +12388,6 @@ COND_PLATFORM_MACOSX_1___OSX_CARBON_COCOA_SRC_OBJECTS_9 = \ @COND_PLATFORM_MACOSX_1@__OSX_CARBON_COCOA_SRC_OBJECTS_9 = $(COND_PLATFORM_MACOSX_1___OSX_CARBON_COCOA_SRC_OBJECTS_9) COND_PLATFORM_MACOSX_1___OSX_LOWLEVEL_SRC_OBJECTS_1_4 = \ corelib_osx_accel.o \ - corelib_artmac.o \ corelib_bmpbuttn_osx.o \ corelib_osx_brush.o \ corelib_button_osx.o \ @@ -14974,6 +14982,9 @@ monodll_tbarwce.o: $(srcdir)/src/msw/wince/tbarwce.cpp $(MONODLL_ODEP) monodll_textctrlce.o: $(srcdir)/src/msw/wince/textctrlce.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/wince/textctrlce.cpp +monodll_artmac.o: $(srcdir)/src/osx/artmac.cpp $(MONODLL_ODEP) + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/artmac.cpp + monodll_carbon_bmpbuttn.o: $(srcdir)/src/osx/carbon/bmpbuttn.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/bmpbuttn.cpp @@ -16825,12 +16836,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_osx_accel.o: $(srcdir)/src/osx/accel.cpp $(MONODLL_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/accel.cpp -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_artmac.o: $(srcdir)/src/osx/artmac.cpp $(MONODLL_ODEP) -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/artmac.cpp - -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_artmac.o: $(srcdir)/src/osx/artmac.cpp $(MONODLL_ODEP) -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/artmac.cpp - @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_bmpbuttn_osx.o: $(srcdir)/src/osx/bmpbuttn_osx.cpp $(MONODLL_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/bmpbuttn_osx.cpp @@ -17656,6 +17661,12 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_accel.o: $(srcdir)/src/msw/accel.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/accel.cpp +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_artmsw.o: $(srcdir)/src/msw/artmsw.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/artmsw.cpp + +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_artmsw.o: $(srcdir)/src/msw/artmsw.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/artmsw.cpp + @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_bmpbuttn.o: $(srcdir)/src/msw/bmpbuttn.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/bmpbuttn.cpp @@ -19651,6 +19662,9 @@ monolib_tbarwce.o: $(srcdir)/src/msw/wince/tbarwce.cpp $(MONOLIB_ODEP) monolib_textctrlce.o: $(srcdir)/src/msw/wince/textctrlce.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/wince/textctrlce.cpp +monolib_artmac.o: $(srcdir)/src/osx/artmac.cpp $(MONOLIB_ODEP) + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/artmac.cpp + monolib_carbon_bmpbuttn.o: $(srcdir)/src/osx/carbon/bmpbuttn.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/bmpbuttn.cpp @@ -21502,12 +21516,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_osx_accel.o: $(srcdir)/src/osx/accel.cpp $(MONOLIB_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/accel.cpp -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_artmac.o: $(srcdir)/src/osx/artmac.cpp $(MONOLIB_ODEP) -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/artmac.cpp - -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_artmac.o: $(srcdir)/src/osx/artmac.cpp $(MONOLIB_ODEP) -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/artmac.cpp - @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_bmpbuttn_osx.o: $(srcdir)/src/osx/bmpbuttn_osx.cpp $(MONOLIB_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/bmpbuttn_osx.cpp @@ -22333,6 +22341,12 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_accel.o: $(srcdir)/src/msw/accel.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/accel.cpp +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_artmsw.o: $(srcdir)/src/msw/artmsw.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/artmsw.cpp + +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_artmsw.o: $(srcdir)/src/msw/artmsw.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/artmsw.cpp + @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_bmpbuttn.o: $(srcdir)/src/msw/bmpbuttn.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/bmpbuttn.cpp @@ -24991,6 +25005,9 @@ coredll_tbarwce.o: $(srcdir)/src/msw/wince/tbarwce.cpp $(COREDLL_ODEP) coredll_textctrlce.o: $(srcdir)/src/msw/wince/textctrlce.cpp $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/wince/textctrlce.cpp +coredll_artmac.o: $(srcdir)/src/osx/artmac.cpp $(COREDLL_ODEP) + $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/artmac.cpp + coredll_carbon_bmpbuttn.o: $(srcdir)/src/osx/carbon/bmpbuttn.cpp $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/bmpbuttn.cpp @@ -26368,12 +26385,6 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_osx_accel.o: $(srcdir)/src/osx/accel.cpp $(COREDLL_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/accel.cpp -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_artmac.o: $(srcdir)/src/osx/artmac.cpp $(COREDLL_ODEP) -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/artmac.cpp - -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_artmac.o: $(srcdir)/src/osx/artmac.cpp $(COREDLL_ODEP) -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/artmac.cpp - @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_bmpbuttn_osx.o: $(srcdir)/src/osx/bmpbuttn_osx.cpp $(COREDLL_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/bmpbuttn_osx.cpp @@ -27199,6 +27210,12 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_accel.o: $(srcdir)/src/msw/accel.cpp $(COREDLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/accel.cpp +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_artmsw.o: $(srcdir)/src/msw/artmsw.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/artmsw.cpp + +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_artmsw.o: $(srcdir)/src/msw/artmsw.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/artmsw.cpp + @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_bmpbuttn.o: $(srcdir)/src/msw/bmpbuttn.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/bmpbuttn.cpp @@ -28495,6 +28512,9 @@ corelib_tbarwce.o: $(srcdir)/src/msw/wince/tbarwce.cpp $(CORELIB_ODEP) corelib_textctrlce.o: $(srcdir)/src/msw/wince/textctrlce.cpp $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/wince/textctrlce.cpp +corelib_artmac.o: $(srcdir)/src/osx/artmac.cpp $(CORELIB_ODEP) + $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/artmac.cpp + corelib_carbon_bmpbuttn.o: $(srcdir)/src/osx/carbon/bmpbuttn.cpp $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/bmpbuttn.cpp @@ -29872,12 +29892,6 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_osx_accel.o: $(srcdir)/src/osx/accel.cpp $(CORELIB_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/accel.cpp -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_artmac.o: $(srcdir)/src/osx/artmac.cpp $(CORELIB_ODEP) -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/artmac.cpp - -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_artmac.o: $(srcdir)/src/osx/artmac.cpp $(CORELIB_ODEP) -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/artmac.cpp - @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_bmpbuttn_osx.o: $(srcdir)/src/osx/bmpbuttn_osx.cpp $(CORELIB_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/bmpbuttn_osx.cpp @@ -30703,6 +30717,12 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_accel.o: $(srcdir)/src/msw/accel.cpp $(CORELIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/accel.cpp +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_artmsw.o: $(srcdir)/src/msw/artmsw.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/artmsw.cpp + +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_artmsw.o: $(srcdir)/src/msw/artmsw.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/artmsw.cpp + @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_bmpbuttn.o: $(srcdir)/src/msw/bmpbuttn.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/bmpbuttn.cpp diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index 7e03bd291f..db6ee2173b 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -1634,6 +1634,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/generic/statusbr.cpp src/generic/prntdlgg.cpp src/msw/accel.cpp + src/msw/artmsw.cpp src/msw/bmpbuttn.cpp src/msw/button.cpp src/msw/checkbox.cpp @@ -2159,7 +2160,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/osx/accel.cpp - src/osx/artmac.cpp src/osx/bmpbuttn_osx.cpp src/osx/brush.cpp src/osx/button_osx.cpp @@ -2263,6 +2263,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! $(OSX_CARBON_COCOA_SRC) + src/osx/artmac.cpp src/osx/carbon/bmpbuttn.cpp src/osx/carbon/button.cpp src/osx/carbon/checkbox.cpp diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc index 2b0e3852f3..6862daa190 100644 --- a/build/msw/makefile.bcc +++ b/build/msw/makefile.bcc @@ -1584,6 +1584,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_statusbr.obj \ $(OBJS)\monodll_prntdlgg.obj \ $(OBJS)\monodll_accel.obj \ + $(OBJS)\monodll_artmsw.obj \ $(OBJS)\monodll_bmpbuttn.obj \ $(OBJS)\monodll_button.obj \ $(OBJS)\monodll_checkbox.obj \ @@ -2251,6 +2252,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_statusbr.obj \ $(OBJS)\monolib_prntdlgg.obj \ $(OBJS)\monolib_accel.obj \ + $(OBJS)\monolib_artmsw.obj \ $(OBJS)\monolib_bmpbuttn.obj \ $(OBJS)\monolib_button.obj \ $(OBJS)\monolib_checkbox.obj \ @@ -2823,6 +2825,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_statusbr.obj \ $(OBJS)\coredll_prntdlgg.obj \ $(OBJS)\coredll_accel.obj \ + $(OBJS)\coredll_artmsw.obj \ $(OBJS)\coredll_bmpbuttn.obj \ $(OBJS)\coredll_button.obj \ $(OBJS)\coredll_checkbox.obj \ @@ -3294,6 +3297,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_statusbr.obj \ $(OBJS)\corelib_prntdlgg.obj \ $(OBJS)\corelib_accel.obj \ + $(OBJS)\corelib_artmsw.obj \ $(OBJS)\corelib_bmpbuttn.obj \ $(OBJS)\corelib_button.obj \ $(OBJS)\corelib_checkbox.obj \ @@ -5686,6 +5690,9 @@ $(OBJS)\monodll_gsockmsw.obj: ..\..\src\msw\gsockmsw.cpp $(OBJS)\monodll_urlmsw.obj: ..\..\src\msw\urlmsw.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\urlmsw.cpp +$(OBJS)\monodll_artmsw.obj: ..\..\src\msw\artmsw.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\artmsw.cpp + $(OBJS)\monodll_colordlg.obj: ..\..\src\msw\colordlg.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\colordlg.cpp @@ -7874,6 +7881,9 @@ $(OBJS)\monolib_gsockmsw.obj: ..\..\src\msw\gsockmsw.cpp $(OBJS)\monolib_urlmsw.obj: ..\..\src\msw\urlmsw.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\urlmsw.cpp +$(OBJS)\monolib_artmsw.obj: ..\..\src\msw\artmsw.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\artmsw.cpp + $(OBJS)\monolib_colordlg.obj: ..\..\src\msw\colordlg.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\colordlg.cpp @@ -10449,6 +10459,9 @@ $(OBJS)\coredll_mslu.obj: ..\..\src\msw\mslu.cpp $(OBJS)\coredll_volume.obj: ..\..\src\msw\volume.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\volume.cpp +$(OBJS)\coredll_artmsw.obj: ..\..\src\msw\artmsw.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\artmsw.cpp + $(OBJS)\coredll_colordlg.obj: ..\..\src\msw\colordlg.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\colordlg.cpp @@ -11790,6 +11803,9 @@ $(OBJS)\corelib_mslu.obj: ..\..\src\msw\mslu.cpp $(OBJS)\corelib_volume.obj: ..\..\src\msw\volume.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\volume.cpp +$(OBJS)\corelib_artmsw.obj: ..\..\src\msw\artmsw.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\artmsw.cpp + $(OBJS)\corelib_colordlg.obj: ..\..\src\msw\colordlg.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\colordlg.cpp diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc index d3e7193136..620cdb4587 100644 --- a/build/msw/makefile.gcc +++ b/build/msw/makefile.gcc @@ -1602,6 +1602,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_statusbr.o \ $(OBJS)\monodll_prntdlgg.o \ $(OBJS)\monodll_accel.o \ + $(OBJS)\monodll_artmsw.o \ $(OBJS)\monodll_bmpbuttn.o \ $(OBJS)\monodll_button.o \ $(OBJS)\monodll_checkbox.o \ @@ -2275,6 +2276,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_statusbr.o \ $(OBJS)\monolib_prntdlgg.o \ $(OBJS)\monolib_accel.o \ + $(OBJS)\monolib_artmsw.o \ $(OBJS)\monolib_bmpbuttn.o \ $(OBJS)\monolib_button.o \ $(OBJS)\monolib_checkbox.o \ @@ -2863,6 +2865,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_statusbr.o \ $(OBJS)\coredll_prntdlgg.o \ $(OBJS)\coredll_accel.o \ + $(OBJS)\coredll_artmsw.o \ $(OBJS)\coredll_bmpbuttn.o \ $(OBJS)\coredll_button.o \ $(OBJS)\coredll_checkbox.o \ @@ -3342,6 +3345,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_statusbr.o \ $(OBJS)\corelib_prntdlgg.o \ $(OBJS)\corelib_accel.o \ + $(OBJS)\corelib_artmsw.o \ $(OBJS)\corelib_bmpbuttn.o \ $(OBJS)\corelib_button.o \ $(OBJS)\corelib_checkbox.o \ @@ -5838,6 +5842,9 @@ $(OBJS)\monodll_gsockmsw.o: ../../src/msw/gsockmsw.cpp $(OBJS)\monodll_urlmsw.o: ../../src/msw/urlmsw.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\monodll_artmsw.o: ../../src/msw/artmsw.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monodll_colordlg.o: ../../src/msw/colordlg.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -8140,6 +8147,9 @@ $(OBJS)\monolib_gsockmsw.o: ../../src/msw/gsockmsw.cpp $(OBJS)\monolib_urlmsw.o: ../../src/msw/urlmsw.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\monolib_artmsw.o: ../../src/msw/artmsw.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monolib_colordlg.o: ../../src/msw/colordlg.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -10829,6 +10839,9 @@ $(OBJS)\coredll_mslu.o: ../../src/msw/mslu.cpp $(OBJS)\coredll_volume.o: ../../src/msw/volume.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\coredll_artmsw.o: ../../src/msw/artmsw.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\coredll_colordlg.o: ../../src/msw/colordlg.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< @@ -12282,6 +12295,9 @@ $(OBJS)\corelib_mslu.o: ../../src/msw/mslu.cpp $(OBJS)\corelib_volume.o: ../../src/msw/volume.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\corelib_artmsw.o: ../../src/msw/artmsw.cpp + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\corelib_colordlg.o: ../../src/msw/colordlg.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc index 52cd86d457..05a1b34c30 100644 --- a/build/msw/makefile.vc +++ b/build/msw/makefile.vc @@ -1764,6 +1764,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_statusbr.obj \ $(OBJS)\monodll_prntdlgg.obj \ $(OBJS)\monodll_accel.obj \ + $(OBJS)\monodll_artmsw.obj \ $(OBJS)\monodll_bmpbuttn.obj \ $(OBJS)\monodll_button.obj \ $(OBJS)\monodll_checkbox.obj \ @@ -2437,6 +2438,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_statusbr.obj \ $(OBJS)\monolib_prntdlgg.obj \ $(OBJS)\monolib_accel.obj \ + $(OBJS)\monolib_artmsw.obj \ $(OBJS)\monolib_bmpbuttn.obj \ $(OBJS)\monolib_button.obj \ $(OBJS)\monolib_checkbox.obj \ @@ -3039,6 +3041,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_statusbr.obj \ $(OBJS)\coredll_prntdlgg.obj \ $(OBJS)\coredll_accel.obj \ + $(OBJS)\coredll_artmsw.obj \ $(OBJS)\coredll_bmpbuttn.obj \ $(OBJS)\coredll_button.obj \ $(OBJS)\coredll_checkbox.obj \ @@ -3516,6 +3519,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_statusbr.obj \ $(OBJS)\corelib_prntdlgg.obj \ $(OBJS)\corelib_accel.obj \ + $(OBJS)\corelib_artmsw.obj \ $(OBJS)\corelib_bmpbuttn.obj \ $(OBJS)\corelib_button.obj \ $(OBJS)\corelib_checkbox.obj \ @@ -6032,6 +6036,9 @@ $(OBJS)\monodll_gsockmsw.obj: ..\..\src\msw\gsockmsw.cpp $(OBJS)\monodll_urlmsw.obj: ..\..\src\msw\urlmsw.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\urlmsw.cpp +$(OBJS)\monodll_artmsw.obj: ..\..\src\msw\artmsw.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\artmsw.cpp + $(OBJS)\monodll_colordlg.obj: ..\..\src\msw\colordlg.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\colordlg.cpp @@ -8220,6 +8227,9 @@ $(OBJS)\monolib_gsockmsw.obj: ..\..\src\msw\gsockmsw.cpp $(OBJS)\monolib_urlmsw.obj: ..\..\src\msw\urlmsw.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\urlmsw.cpp +$(OBJS)\monolib_artmsw.obj: ..\..\src\msw\artmsw.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\artmsw.cpp + $(OBJS)\monolib_colordlg.obj: ..\..\src\msw\colordlg.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\colordlg.cpp @@ -10795,6 +10805,9 @@ $(OBJS)\coredll_mslu.obj: ..\..\src\msw\mslu.cpp $(OBJS)\coredll_volume.obj: ..\..\src\msw\volume.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\volume.cpp +$(OBJS)\coredll_artmsw.obj: ..\..\src\msw\artmsw.cpp + $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\artmsw.cpp + $(OBJS)\coredll_colordlg.obj: ..\..\src\msw\colordlg.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\colordlg.cpp @@ -12136,6 +12149,9 @@ $(OBJS)\corelib_mslu.obj: ..\..\src\msw\mslu.cpp $(OBJS)\corelib_volume.obj: ..\..\src\msw\volume.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\volume.cpp +$(OBJS)\corelib_artmsw.obj: ..\..\src\msw\artmsw.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\artmsw.cpp + $(OBJS)\corelib_colordlg.obj: ..\..\src\msw\colordlg.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\colordlg.cpp diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat index 097c823155..d1c5fa8a2b 100644 --- a/build/msw/makefile.wat +++ b/build/msw/makefile.wat @@ -275,6 +275,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_statusbr.obj & $(OBJS)\monodll_prntdlgg.obj & $(OBJS)\monodll_accel.obj & + $(OBJS)\monodll_artmsw.obj & $(OBJS)\monodll_bmpbuttn.obj & $(OBJS)\monodll_button.obj & $(OBJS)\monodll_checkbox.obj & @@ -953,6 +954,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_statusbr.obj & $(OBJS)\monolib_prntdlgg.obj & $(OBJS)\monolib_accel.obj & + $(OBJS)\monolib_artmsw.obj & $(OBJS)\monolib_bmpbuttn.obj & $(OBJS)\monolib_button.obj & $(OBJS)\monolib_checkbox.obj & @@ -1552,6 +1554,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_statusbr.obj & $(OBJS)\coredll_prntdlgg.obj & $(OBJS)\coredll_accel.obj & + $(OBJS)\coredll_artmsw.obj & $(OBJS)\coredll_bmpbuttn.obj & $(OBJS)\coredll_button.obj & $(OBJS)\coredll_checkbox.obj & @@ -2033,6 +2036,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_statusbr.obj & $(OBJS)\corelib_prntdlgg.obj & $(OBJS)\corelib_accel.obj & + $(OBJS)\corelib_artmsw.obj & $(OBJS)\corelib_bmpbuttn.obj & $(OBJS)\corelib_button.obj & $(OBJS)\corelib_checkbox.obj & @@ -6083,6 +6087,9 @@ $(OBJS)\monodll_gsockmsw.obj : .AUTODEPEND ..\..\src\msw\gsockmsw.cpp $(OBJS)\monodll_urlmsw.obj : .AUTODEPEND ..\..\src\msw\urlmsw.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_artmsw.obj : .AUTODEPEND ..\..\src\msw\artmsw.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_colordlg.obj : .AUTODEPEND ..\..\src\msw\colordlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -8385,6 +8392,9 @@ $(OBJS)\monolib_gsockmsw.obj : .AUTODEPEND ..\..\src\msw\gsockmsw.cpp $(OBJS)\monolib_urlmsw.obj : .AUTODEPEND ..\..\src\msw\urlmsw.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_artmsw.obj : .AUTODEPEND ..\..\src\msw\artmsw.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_colordlg.obj : .AUTODEPEND ..\..\src\msw\colordlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -11074,6 +11084,9 @@ $(OBJS)\coredll_mslu.obj : .AUTODEPEND ..\..\src\msw\mslu.cpp $(OBJS)\coredll_volume.obj : .AUTODEPEND ..\..\src\msw\volume.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +$(OBJS)\coredll_artmsw.obj : .AUTODEPEND ..\..\src\msw\artmsw.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< + $(OBJS)\coredll_colordlg.obj : .AUTODEPEND ..\..\src\msw\colordlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -12527,6 +12540,9 @@ $(OBJS)\corelib_mslu.obj : .AUTODEPEND ..\..\src\msw\mslu.cpp $(OBJS)\corelib_volume.obj : .AUTODEPEND ..\..\src\msw\volume.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +$(OBJS)\corelib_artmsw.obj : .AUTODEPEND ..\..\src\msw\artmsw.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< + $(OBJS)\corelib_colordlg.obj : .AUTODEPEND ..\..\src\msw\colordlg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp index 87c784ca4c..aa79954e78 100644 --- a/build/msw/wx_core.dsp +++ b/build/msw/wx_core.dsp @@ -736,6 +736,41 @@ SOURCE=..\..\src\msw\app.cpp # End Source File # Begin Source File +SOURCE=..\..\src\msw\artmsw.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\ole\automtn.cpp # End Source File # Begin Source File diff --git a/build/msw/wx_vc7_core.vcproj b/build/msw/wx_vc7_core.vcproj index 80e50156ad..175dce413d 100644 --- a/build/msw/wx_vc7_core.vcproj +++ b/build/msw/wx_vc7_core.vcproj @@ -910,6 +910,21 @@ + + + + + + diff --git a/build/msw/wx_vc8_core.vcproj b/build/msw/wx_vc8_core.vcproj index 07517be147..2512980f92 100644 --- a/build/msw/wx_vc8_core.vcproj +++ b/build/msw/wx_vc8_core.vcproj @@ -1251,6 +1251,26 @@ RelativePath="..\..\src\msw\app.cpp" > + + + + + + diff --git a/build/msw/wx_vc9_core.vcproj b/build/msw/wx_vc9_core.vcproj index df07cb6fbf..ac6fb0b636 100644 --- a/build/msw/wx_vc9_core.vcproj +++ b/build/msw/wx_vc9_core.vcproj @@ -1247,6 +1247,26 @@ RelativePath="..\..\src\msw\app.cpp" > + + + + + + diff --git a/docs/changes.txt b/docs/changes.txt index 97a6e93840..856738dabe 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -302,6 +302,9 @@ All: - Added wxString::Capitalize() and MakeCapitalized(). - Added wxArray::swap(). - Added wxSHUTDOWN_LOGOFF and wxSHUTDOWN_FORCE wxShutdown() flags (troelsk). +- Added wxArtProvider::GetNativeSizeHint(); GetSizeHint() as well as + GetNativeSizeHint() now return more sensible values in wxMSW and wxMac and + no longer return bogus values. All (Unix): diff --git a/include/wx/artprov.h b/include/wx/artprov.h index 9b9ffa7ca6..a9a4eaa964 100644 --- a/include/wx/artprov.h +++ b/include/wx/artprov.h @@ -165,6 +165,10 @@ public: static wxIconBundle GetIconBundle(const wxArtID& id, const wxArtClient& client = wxART_OTHER); + // Gets native size for given 'client' or wxDefaultSize if it doesn't + // have native equivalent + static wxSize GetNativeSizeHint(const wxArtClient& client); + // Get the size hint of an icon from a specific wxArtClient, queries // the topmost provider if platform_dependent = false static wxSize GetSizeHint(const wxArtClient& client, bool platform_dependent = false); @@ -222,4 +226,12 @@ private: }; +#if !defined(__WXUNIVERSAL__) && \ + (defined(__WXGTK__) || defined(__WXMSW__) || \ + (defined(__WXMAC__) && wxOSX_USE_CARBON)) + // *some* (partial) native implementation of wxArtProvider exists; this is + // not the same as wxArtProvider::HasNativeProvider()! + #define wxHAS_NATIVE_ART_PROVIDER_IMPL +#endif + #endif // _WX_ARTPROV_H_ diff --git a/interface/wx/artprov.h b/interface/wx/artprov.h index cf2fd276ae..33196e22eb 100644 --- a/interface/wx/artprov.h +++ b/interface/wx/artprov.h @@ -193,11 +193,29 @@ public: const wxSize& size = wxDefaultSize); /** - Returns a suitable size hint for the given @e wxArtClient. If - @a platform_default is @true, return a size based on the current platform, - otherwise return the size from the topmost wxArtProvider. @e wxDefaultSize may - be returned if the client doesn't have a specified size, like wxART_OTHER for - example. + Returns native icon size for use specified by @a client hint. + + If the platform has no commonly used default for this use or if + @a client is not recognized, returns wxDefaultSize. + + @note In some cases, a platform may have @em several appropriate + native sizes (for example, wxART_FRAME_ICON for frame icons). + In that case, this method returns only one of them, picked + reasonably. + + @since 2.9.0 + */ + static wxSize GetNativeSizeHint(const wxArtClient& client); + + /** + Returns a suitable size hint for the given @e wxArtClient. + + If @a platform_default is @true, return a size based on the current + platform using GetNativeSizeHint(), otherwise return the size from the + topmost wxArtProvider. @e wxDefaultSize may be returned if the client + doesn't have a specified size, like wxART_OTHER for example. + + @see GetNativeSizeHint() */ static wxSize GetSizeHint(const wxArtClient& client, bool platform_default = false); diff --git a/src/common/artprov.cpp b/src/common/artprov.cpp index 267b1c2c3b..750deb7acb 100644 --- a/src/common/artprov.cpp +++ b/src/common/artprov.cpp @@ -333,11 +333,6 @@ wxIcon wxArtProvider::GetMessageBoxIcon(int flags) return icon; } -#if defined(__WXGTK20__) && !defined(__WXUNIVERSAL__) - #include - extern GtkIconSize wxArtClientToIconSize(const wxArtClient& client); -#endif // defined(__WXGTK20__) && !defined(__WXUNIVERSAL__) - /*static*/ wxSize wxArtProvider::GetSizeHint(const wxArtClient& client, bool platform_dependent) { @@ -348,36 +343,25 @@ wxIcon wxArtProvider::GetMessageBoxIcon(int flags) return node->GetData()->DoGetSizeHint(client); } - // else return platform dependent size - -#if defined(__WXGTK20__) && !defined(__WXUNIVERSAL__) - // Gtk has specific sizes for each client, see artgtk.cpp - GtkIconSize gtk_size = wxArtClientToIconSize(client); - // no size hints for this client - if (gtk_size == GTK_ICON_SIZE_INVALID) - return wxDefaultSize; - gint width, height; - gtk_icon_size_lookup( gtk_size, &width, &height); - return wxSize(width, height); -#else // !GTK+ 2 - // NB: These size hints may have to be adjusted per platform - if (client == wxART_TOOLBAR) - return wxSize(16, 15); - else if (client == wxART_MENU) - return wxSize(16, 15); - else if (client == wxART_FRAME_ICON) - return wxSize(16, 15); - else if (client == wxART_CMN_DIALOG || client == wxART_MESSAGE_BOX) - return wxSize(32, 32); - else if (client == wxART_HELP_BROWSER) - return wxSize(16, 15); - else if (client == wxART_BUTTON) - return wxSize(16, 15); - else // wxART_OTHER or perhaps a user's client, no specified size - return wxDefaultSize; -#endif // GTK+ 2/else + return GetNativeSizeHint(client); } +#ifndef wxHAS_NATIVE_ART_PROVIDER_IMPL +/*static*/ +wxSize wxArtProvider::GetNativeSizeHint(const wxArtClient& client) +{ + // rather than returning some arbitrary value that doesn't make much + // sense (as 2.8 used to do), tell the caller that we don't have a clue: + return wxDefaultSize; +} + +/*static*/ +void wxArtProvider::InitNativeProvider() +{ +} +#endif // !wxHAS_NATIVE_ART_PROVIDER_IMPL + + /* static */ bool wxArtProvider::HasNativeProvider() { diff --git a/src/common/artstd.cpp b/src/common/artstd.cpp index 4623b41184..c4e34e7912 100644 --- a/src/common/artstd.cpp +++ b/src/common/artstd.cpp @@ -37,37 +37,6 @@ protected: const wxSize& size); }; -// ---------------------------------------------------------------------------- -// helper macros -// ---------------------------------------------------------------------------- - -// Standard macro for getting a resource from XPM file: -#define ART(artId, xpmRc) \ - if ( id == artId ) return wxBitmap(xpmRc##_xpm); - -// There are two ways of getting the standard icon: either via XPMs or via -// wxIcon ctor. This depends on the platform: -#if defined(__WXUNIVERSAL__) || ( defined(__WXMAC__) && wxOSX_USE_IPHONE ) - #define CREATE_STD_ICON(iconId, xpmRc) return wxNullBitmap; -#elif defined(__WXGTK__) || defined(__WXMOTIF__) - #define CREATE_STD_ICON(iconId, xpmRc) return wxBitmap(xpmRc##_xpm); -#else - #define CREATE_STD_ICON(iconId, xpmRc) \ - { \ - wxIcon icon(_T(iconId)); \ - wxBitmap bmp; \ - bmp.CopyFromIcon(icon); \ - return bmp; \ - } -#endif - -// Macro used in CreateBitmap to get wxICON_FOO icons: -#define ART_MSGBOX(artId, iconId, xpmRc) \ - if ( id == artId ) \ - { \ - CREATE_STD_ICON(#iconId, xpmRc) \ - } - // ---------------------------------------------------------------------------- // wxArtProvider::InitStdProvider // ---------------------------------------------------------------------------- @@ -77,28 +46,31 @@ protected: wxArtProvider::Push(new wxDefaultArtProvider); } -#if !(defined(__WXGTK20__) || (defined(__WXMAC__) && wxOSX_USE_CARBON)) || defined(__WXUNIVERSAL__) -/*static*/ void wxArtProvider::InitNativeProvider() -{ -} -#endif +// ---------------------------------------------------------------------------- +// helper macros +// ---------------------------------------------------------------------------- +// Standard macro for getting a resource from XPM file: +#define ART(artId, xpmRc) \ + if ( id == artId ) return wxBitmap(xpmRc##_xpm); // ---------------------------------------------------------------------------- // XPMs with the art // ---------------------------------------------------------------------------- -#if defined(__WXGTK__) - #include "../../art/gtk/info.xpm" - #include "../../art/gtk/error.xpm" - #include "../../art/gtk/warning.xpm" - #include "../../art/gtk/question.xpm" -#elif defined(__WXMOTIF__) - #include "../../art/motif/info.xpm" - #include "../../art/motif/error.xpm" - #include "../../art/motif/warning.xpm" - #include "../../art/motif/question.xpm" -#endif +#ifndef __WXUNIVERSAL__ + #if defined(__WXGTK__) + #include "../../art/gtk/info.xpm" + #include "../../art/gtk/error.xpm" + #include "../../art/gtk/warning.xpm" + #include "../../art/gtk/question.xpm" + #elif defined(__WXMOTIF__) + #include "../../art/motif/info.xpm" + #include "../../art/motif/error.xpm" + #include "../../art/motif/warning.xpm" + #include "../../art/motif/question.xpm" + #endif +#endif // !__WXUNIVERSAL__ #if wxUSE_HTML #include "../../art/htmsidep.xpm" @@ -151,11 +123,13 @@ protected: wxBitmap wxDefaultArtProvider_CreateBitmap(const wxArtID& id) { +#if !defined(__WXUNIVERSAL__) && (defined(__WXGTK__) || defined(__WXMOTIF__)) // wxMessageBox icons: - ART_MSGBOX(wxART_ERROR, wxICON_ERROR, error) - ART_MSGBOX(wxART_INFORMATION, wxICON_INFORMATION, info) - ART_MSGBOX(wxART_WARNING, wxICON_WARNING, warning) - ART_MSGBOX(wxART_QUESTION, wxICON_QUESTION, question) + ART(wxART_ERROR, error) + ART(wxART_INFORMATION, info) + ART(wxART_WARNING, warning) + ART(wxART_QUESTION, question) +#endif // standard icons: #if wxUSE_HTML diff --git a/src/gtk/artgtk.cpp b/src/gtk/artgtk.cpp index 6685e79f59..7bc18ba46c 100644 --- a/src/gtk/artgtk.cpp +++ b/src/gtk/artgtk.cpp @@ -20,8 +20,6 @@ #pragma hdrstop #endif -#if !defined(__WXUNIVERSAL__) - #include "wx/artprov.h" #include "wx/gtk/private.h" @@ -54,7 +52,10 @@ protected: // CreateBitmap routine // ---------------------------------------------------------------------------- -static const char *wxArtIDToStock(const wxArtID& id) +namespace +{ + +const char *wxArtIDToStock(const wxArtID& id) { #define ART(wxid, gtkid) \ if (id == wxid) return gtkid; @@ -120,7 +121,7 @@ static const char *wxArtIDToStock(const wxArtID& id) #undef ART } -GtkIconSize wxArtClientToIconSize(const wxArtClient& client) +GtkIconSize ArtClientToIconSize(const wxArtClient& client) { if (client == wxART_TOOLBAR) return GTK_ICON_SIZE_LARGE_TOOLBAR; @@ -134,7 +135,7 @@ GtkIconSize wxArtClientToIconSize(const wxArtClient& client) return GTK_ICON_SIZE_INVALID; // this is arbitrary } -static GtkIconSize FindClosestIconSize(const wxSize& size) +GtkIconSize FindClosestIconSize(const wxSize& size) { #define NUM_SIZES 6 static struct @@ -181,7 +182,7 @@ static GtkIconSize FindClosestIconSize(const wxSize& size) return best; } -static GdkPixbuf *CreateStockIcon(const char *stockid, GtkIconSize size) +GdkPixbuf *CreateStockIcon(const char *stockid, GtkIconSize size) { // FIXME: This code is not 100% correct, because stock pixmap are // context-dependent and may be affected by theme engine, the @@ -202,7 +203,7 @@ static GdkPixbuf *CreateStockIcon(const char *stockid, GtkIconSize size) GTK_STATE_NORMAL, size, NULL, NULL); } -static GdkPixbuf *CreateThemeIcon(const char *iconname, +GdkPixbuf *CreateThemeIcon(const char *iconname, GtkIconSize iconsize, const wxSize& sz) { wxSize size(sz); @@ -218,13 +219,15 @@ static GdkPixbuf *CreateThemeIcon(const char *iconname, (GtkIconLookupFlags)0, NULL); } +} // anonymous namespace + wxBitmap wxGTK2ArtProvider::CreateBitmap(const wxArtID& id, const wxArtClient& client, const wxSize& size) { wxCharBuffer stockid = wxArtIDToStock(id); GtkIconSize stocksize = (size == wxDefaultSize) ? - wxArtClientToIconSize(client) : + ArtClientToIconSize(client) : FindClosestIconSize(size); // we must have some size, this is arbitrary @@ -259,4 +262,19 @@ wxBitmap wxGTK2ArtProvider::CreateBitmap(const wxArtID& id, return bmp; } -#endif // !defined(__WXUNIVERSAL__) +// ---------------------------------------------------------------------------- +// wxArtProvider::GetNativeSizeHint() +// ---------------------------------------------------------------------------- + +/*static*/ +wxSize wxArtProvider::GetNativeSizeHint(const wxArtClient& client) +{ + // Gtk has specific sizes for each client, see artgtk.cpp + GtkIconSize gtk_size = ArtClientToIconSize(client); + // no size hints for this client + if (gtk_size == GTK_ICON_SIZE_INVALID) + return wxDefaultSize; + gint width, height; + gtk_icon_size_lookup( gtk_size, &width, &height); + return wxSize(width, height); +} diff --git a/src/osx/artmac.cpp b/src/osx/artmac.cpp index a68ca81346..37a2f3e202 100644 --- a/src/osx/artmac.cpp +++ b/src/osx/artmac.cpp @@ -19,14 +19,13 @@ #pragma hdrstop #endif +#include "wx/artprov.h" + #ifndef WX_PRECOMP #include "wx/image.h" #endif -#if !defined(__WXUNIVERSAL__) && wxOSX_USE_CARBON - -#include "wx/artprov.h" -#include "wx/image.h" +#if wxOSX_USE_CARBON // ---------------------------------------------------------------------------- // wxMacArtProvider @@ -109,6 +108,22 @@ wxBitmap wxMacArtProvider::CreateBitmap(const wxArtID& id, return wxNullBitmap; } -#endif // !defined(__WXUNIVERSAL__) +// ---------------------------------------------------------------------------- +// wxArtProvider::GetNativeSizeHint() +// ---------------------------------------------------------------------------- +/*static*/ +wxSize wxArtProvider::GetNativeSizeHint(const wxArtClient& client) +{ + if ( client == wxART_TOOLBAR ) + { + // See http://developer.apple.com/documentation/UserExperience/Conceptual/AppleHIGuidelines/XHIGIcons/chapter_15_section_9.html: + // "32 x 32 pixels is the recommended size" + return wxSize(32, 32); + } + + return wxDefaultSize; +} + +#endif // wxOSX_USE_CARBON