From: Vadim Zeitlin Date: Mon, 4 Dec 2006 01:14:25 +0000 (+0000) Subject: moved assertdlg_gtk.[ch] to GTK_LOWLEVEL_SRC/HDR to fix wxUniv/GTK build X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/588f410058fc3d867c6e7ae3a19540fc1343c53f?ds=inline moved assertdlg_gtk.[ch] to GTK_LOWLEVEL_SRC/HDR to fix wxUniv/GTK build git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43784 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/Makefile.in b/Makefile.in index 442a8a4a98..da7db70a4c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1802,6 +1802,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_LOWLEVEL_HDR = \ wx/generic/icon.h \ wx/generic/paletteg.h \ wx/gtk/app.h \ + wx/gtk/assertdlg_gtk.h \ wx/gtk/bitmap.h \ wx/gtk/brush.h \ wx/gtk/clipbrd.h \ @@ -2045,7 +2046,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_GUI_HDR = \ wx/generic/statusbr.h \ wx/generic/tabg.h \ wx/gtk/accel.h \ - wx/gtk/assertdlg_gtk.h \ wx/gtk/bmpbuttn.h \ wx/gtk/button.h \ wx/gtk/checkbox.h \ @@ -3795,6 +3795,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS = \ monodll_icon.o \ monodll_paletteg.o \ monodll_app.o \ + monodll_assertdlg_gtk.o \ monodll_bitmap.o \ monodll_brush.o \ monodll_clipbrd.o \ @@ -4156,7 +4157,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS = \ monodll_tabg.o \ monodll_fontdlgg.o \ monodll_artgtk.o \ - monodll_assertdlg_gtk.o \ monodll_bmpbuttn.o \ monodll_button.o \ monodll_checkbox.o \ @@ -4626,6 +4626,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_1 = \ monodll_icon.o \ monodll_paletteg.o \ monodll_app.o \ + monodll_assertdlg_gtk.o \ monodll_bitmap.o \ monodll_brush.o \ monodll_clipbrd.o \ @@ -5568,6 +5569,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_2 = \ monolib_icon.o \ monolib_paletteg.o \ monolib_app.o \ + monolib_assertdlg_gtk.o \ monolib_bitmap.o \ monolib_brush.o \ monolib_clipbrd.o \ @@ -5930,7 +5932,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_1 = \ monolib_tabg.o \ monolib_fontdlgg.o \ monolib_artgtk.o \ - monolib_assertdlg_gtk.o \ monolib_bmpbuttn.o \ monolib_button.o \ monolib_checkbox.o \ @@ -6400,6 +6401,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_3 = \ monolib_icon.o \ monolib_paletteg.o \ monolib_app.o \ + monolib_assertdlg_gtk.o \ monolib_bitmap.o \ monolib_brush.o \ monolib_clipbrd.o \ @@ -7571,6 +7573,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_4 = \ coredll_icon.o \ coredll_paletteg.o \ coredll_app.o \ + coredll_assertdlg_gtk.o \ coredll_bitmap.o \ coredll_brush.o \ coredll_clipbrd.o \ @@ -7933,7 +7936,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_2 = \ coredll_tabg.o \ coredll_fontdlgg.o \ coredll_artgtk.o \ - coredll_assertdlg_gtk.o \ coredll_bmpbuttn.o \ coredll_button.o \ coredll_checkbox.o \ @@ -8403,6 +8405,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_5 = \ coredll_icon.o \ coredll_paletteg.o \ coredll_app.o \ + coredll_assertdlg_gtk.o \ coredll_bitmap.o \ coredll_brush.o \ coredll_clipbrd.o \ @@ -9018,6 +9021,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_6 = \ corelib_icon.o \ corelib_paletteg.o \ corelib_app.o \ + corelib_assertdlg_gtk.o \ corelib_bitmap.o \ corelib_brush.o \ corelib_clipbrd.o \ @@ -9380,7 +9384,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_3 = \ corelib_tabg.o \ corelib_fontdlgg.o \ corelib_artgtk.o \ - corelib_assertdlg_gtk.o \ corelib_bmpbuttn.o \ corelib_button.o \ corelib_checkbox.o \ @@ -9850,6 +9853,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_7 = \ corelib_icon.o \ corelib_paletteg.o \ corelib_app.o \ + corelib_assertdlg_gtk.o \ corelib_bitmap.o \ corelib_brush.o \ corelib_clipbrd.o \ @@ -12776,9 +12780,6 @@ monodll_graphicc.o: $(srcdir)/src/generic/graphicc.cpp $(MONODLL_ODEP) monodll_artgtk.o: $(srcdir)/src/gtk/artgtk.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/artgtk.cpp -monodll_assertdlg_gtk.o: $(srcdir)/src/gtk/assertdlg_gtk.c $(MONODLL_ODEP) - $(CCC) -c -o $@ $(MONODLL_CFLAGS) $(srcdir)/src/gtk/assertdlg_gtk.c - monodll_collpane.o: $(srcdir)/src/gtk/collpane.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/collpane.cpp @@ -13877,6 +13878,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_app.o: $(srcdir)/src/os2/app.cpp $(MONODLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/app.cpp +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_assertdlg_gtk.o: $(srcdir)/src/gtk/assertdlg_gtk.c $(MONODLL_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CCC) -c -o $@ $(MONODLL_CFLAGS) $(srcdir)/src/gtk/assertdlg_gtk.c + @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_bitmap.o: $(srcdir)/src/gtk/bitmap.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/bitmap.cpp @@ -16883,9 +16887,6 @@ monolib_graphicc.o: $(srcdir)/src/generic/graphicc.cpp $(MONOLIB_ODEP) monolib_artgtk.o: $(srcdir)/src/gtk/artgtk.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/artgtk.cpp -monolib_assertdlg_gtk.o: $(srcdir)/src/gtk/assertdlg_gtk.c $(MONOLIB_ODEP) - $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $(srcdir)/src/gtk/assertdlg_gtk.c - monolib_collpane.o: $(srcdir)/src/gtk/collpane.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/collpane.cpp @@ -17984,6 +17985,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_app.o: $(srcdir)/src/os2/app.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/app.cpp +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_assertdlg_gtk.o: $(srcdir)/src/gtk/assertdlg_gtk.c $(MONOLIB_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $(srcdir)/src/gtk/assertdlg_gtk.c + @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_bitmap.o: $(srcdir)/src/gtk/bitmap.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/bitmap.cpp @@ -21989,9 +21993,6 @@ coredll_graphicc.o: $(srcdir)/src/generic/graphicc.cpp $(COREDLL_ODEP) coredll_artgtk.o: $(srcdir)/src/gtk/artgtk.cpp $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/artgtk.cpp -coredll_assertdlg_gtk.o: $(srcdir)/src/gtk/assertdlg_gtk.c $(COREDLL_ODEP) - $(CCC) -c -o $@ $(COREDLL_CFLAGS) $(srcdir)/src/gtk/assertdlg_gtk.c - coredll_collpane.o: $(srcdir)/src/gtk/collpane.cpp $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/collpane.cpp @@ -22472,6 +22473,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_app.o: $(srcdir)/src/os2/app.cpp $(COREDLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/app.cpp +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_assertdlg_gtk.o: $(srcdir)/src/gtk/assertdlg_gtk.c $(COREDLL_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CCC) -c -o $@ $(COREDLL_CFLAGS) $(srcdir)/src/gtk/assertdlg_gtk.c + @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_bitmap.o: $(srcdir)/src/gtk/bitmap.cpp $(COREDLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/bitmap.cpp @@ -24932,9 +24936,6 @@ corelib_graphicc.o: $(srcdir)/src/generic/graphicc.cpp $(CORELIB_ODEP) corelib_artgtk.o: $(srcdir)/src/gtk/artgtk.cpp $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/artgtk.cpp -corelib_assertdlg_gtk.o: $(srcdir)/src/gtk/assertdlg_gtk.c $(CORELIB_ODEP) - $(CCC) -c -o $@ $(CORELIB_CFLAGS) $(srcdir)/src/gtk/assertdlg_gtk.c - corelib_collpane.o: $(srcdir)/src/gtk/collpane.cpp $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/collpane.cpp @@ -25415,6 +25416,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_app.o: $(srcdir)/src/os2/app.cpp $(CORELIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/app.cpp +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_assertdlg_gtk.o: $(srcdir)/src/gtk/assertdlg_gtk.c $(CORELIB_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CCC) -c -o $@ $(CORELIB_CFLAGS) $(srcdir)/src/gtk/assertdlg_gtk.c + @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_bitmap.o: $(srcdir)/src/gtk/bitmap.cpp $(CORELIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/bitmap.cpp diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index 38f06d6548..e2d27953d2 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -906,6 +906,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/generic/icon.cpp src/generic/paletteg.cpp src/gtk/app.cpp + src/gtk/assertdlg_gtk.c src/gtk/bitmap.cpp src/gtk/brush.cpp src/gtk/clipbrd.cpp @@ -940,6 +941,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/generic/icon.h wx/generic/paletteg.h wx/gtk/app.h + wx/gtk/assertdlg_gtk.h wx/gtk/bitmap.h wx/gtk/brush.h wx/gtk/clipbrd.h @@ -981,7 +983,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/generic/fontdlgg.cpp src/gtk/artgtk.cpp - src/gtk/assertdlg_gtk.c src/gtk/bmpbuttn.cpp src/gtk/button.cpp src/gtk/checkbox.cpp @@ -1032,7 +1033,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/generic/statusbr.h wx/generic/tabg.h wx/gtk/accel.h - wx/gtk/assertdlg_gtk.h wx/gtk/bmpbuttn.h wx/gtk/button.h wx/gtk/checkbox.h