From 4e69ff22681b5625f52c2b4c7e47c1815df7c306 Mon Sep 17 00:00:00 2001 From: Ryan Norton Date: Tue, 16 Nov 2004 15:53:38 +0000 Subject: [PATCH] makefile regen, include fix, duplicate file fix git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30575 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 62 ++++++++++++++----- build/bakefiles/files.bkl | 4 +- .../carbon/{colordlg.mm => colordlgosx.mm} | 8 +-- src/mac/carbon/{fontdlg.mm => fontdlgosx.mm} | 8 +-- 4 files changed, 58 insertions(+), 24 deletions(-) rename src/mac/carbon/{colordlg.mm => colordlgosx.mm} (100%) rename src/mac/carbon/{fontdlg.mm => fontdlgosx.mm} (100%) diff --git a/Makefile.in b/Makefile.in index 997146b144..3874841940 100644 --- a/Makefile.in +++ b/Makefile.in @@ -3583,8 +3583,12 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS = \ monodll_tbarwce.o \ monodll_textctrlce.o @COND_TOOLKIT_WINCE@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS) -@COND_PLATFORM_MACOSX_1@__MAC_OSX_SRC_OBJECTS = \ -@COND_PLATFORM_MACOSX_1@ monodll_snglinst.o monodll_webkit.o +COND_PLATFORM_MACOSX_1___MAC_OSX_SRC_OBJECTS = \ + monodll_snglinst.o \ + monodll_webkit.o \ + monodll_fontdlgosx.o \ + monodll_colordlgosx.o +@COND_PLATFORM_MACOSX_1@__MAC_OSX_SRC_OBJECTS = $(COND_PLATFORM_MACOSX_1___MAC_OSX_SRC_OBJECTS) @COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_1 = \ @COND_TOOLKIT_COCOA@ monodll_gsockosx.o monodll_utilsexc_cf.o COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_1 = \ @@ -5019,8 +5023,12 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_1 = \ monolib_tbarwce.o \ monolib_textctrlce.o @COND_TOOLKIT_WINCE@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_1) -@COND_PLATFORM_MACOSX_1@__MAC_OSX_SRC_OBJECTS_1 = \ -@COND_PLATFORM_MACOSX_1@ monolib_snglinst.o monolib_webkit.o +COND_PLATFORM_MACOSX_1___MAC_OSX_SRC_OBJECTS_1 = \ + monolib_snglinst.o \ + monolib_webkit.o \ + monolib_fontdlgosx.o \ + monolib_colordlgosx.o +@COND_PLATFORM_MACOSX_1@__MAC_OSX_SRC_OBJECTS_1 = $(COND_PLATFORM_MACOSX_1___MAC_OSX_SRC_OBJECTS_1) @COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_3 = \ @COND_TOOLKIT_COCOA@ monolib_gsockosx.o monolib_utilsexc_cf.o COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_3 = \ @@ -6649,8 +6657,12 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_2 = \ coredll_tbarwce.o \ coredll_textctrlce.o @COND_TOOLKIT_WINCE@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_2) -@COND_PLATFORM_MACOSX_1@__MAC_OSX_SRC_OBJECTS_2 = \ -@COND_PLATFORM_MACOSX_1@ coredll_snglinst.o coredll_webkit.o +COND_PLATFORM_MACOSX_1___MAC_OSX_SRC_OBJECTS_2 = \ + coredll_snglinst.o \ + coredll_webkit.o \ + coredll_fontdlgosx.o \ + coredll_colordlgosx.o +@COND_PLATFORM_MACOSX_1@__MAC_OSX_SRC_OBJECTS_2 = $(COND_PLATFORM_MACOSX_1___MAC_OSX_SRC_OBJECTS_2) @COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_5 = \ @COND_TOOLKIT_COCOA@ coredll_gsockosx.o coredll_utilsexc_cf.o COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_5 = \ @@ -7835,8 +7847,12 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_3 = \ corelib_tbarwce.o \ corelib_textctrlce.o @COND_TOOLKIT_WINCE@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_3) -@COND_PLATFORM_MACOSX_1@__MAC_OSX_SRC_OBJECTS_3 = \ -@COND_PLATFORM_MACOSX_1@ corelib_snglinst.o corelib_webkit.o +COND_PLATFORM_MACOSX_1___MAC_OSX_SRC_OBJECTS_3 = \ + corelib_snglinst.o \ + corelib_webkit.o \ + corelib_fontdlgosx.o \ + corelib_colordlgosx.o +@COND_PLATFORM_MACOSX_1@__MAC_OSX_SRC_OBJECTS_3 = $(COND_PLATFORM_MACOSX_1___MAC_OSX_SRC_OBJECTS_3) @COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_7 = \ @COND_TOOLKIT_COCOA@ corelib_gsockosx.o corelib_utilsexc_cf.o COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_7 = \ @@ -9927,6 +9943,12 @@ monodll_statlmac.o: $(srcdir)/src/mac/carbon/statlmac.cpp $(MONODLL_ODEP) monodll_webkit.o: $(srcdir)/src/html/htmlctrl/webkit/webkit.mm $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +monodll_fontdlgosx.o: $(srcdir)/src/mac/carbon/fontdlgosx.mm $(MONODLL_ODEP) + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + +monodll_colordlgosx.o: $(srcdir)/src/mac/carbon/colordlgosx.mm $(MONODLL_ODEP) + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + monodll_NSBox.o: $(srcdir)/src/cocoa/NSBox.mm $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -13245,6 +13267,12 @@ monolib_statlmac.o: $(srcdir)/src/mac/carbon/statlmac.cpp $(MONOLIB_ODEP) monolib_webkit.o: $(srcdir)/src/html/htmlctrl/webkit/webkit.mm $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +monolib_fontdlgosx.o: $(srcdir)/src/mac/carbon/fontdlgosx.mm $(MONOLIB_ODEP) + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +monolib_colordlgosx.o: $(srcdir)/src/mac/carbon/colordlgosx.mm $(MONOLIB_ODEP) + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + monolib_NSBox.o: $(srcdir)/src/cocoa/NSBox.mm $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -17370,6 +17398,12 @@ coredll_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(COREDLL_ODEP) coredll_webkit.o: $(srcdir)/src/html/htmlctrl/webkit/webkit.mm $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +coredll_fontdlgosx.o: $(srcdir)/src/mac/carbon/fontdlgosx.mm $(COREDLL_ODEP) + $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + +coredll_colordlgosx.o: $(srcdir)/src/mac/carbon/colordlgosx.mm $(COREDLL_ODEP) + $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + coredll_NSBox.o: $(srcdir)/src/cocoa/NSBox.mm $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -19854,6 +19888,12 @@ corelib_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(CORELIB_ODEP) corelib_webkit.o: $(srcdir)/src/html/htmlctrl/webkit/webkit.mm $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +corelib_fontdlgosx.o: $(srcdir)/src/mac/carbon/fontdlgosx.mm $(CORELIB_ODEP) + $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + +corelib_colordlgosx.o: $(srcdir)/src/mac/carbon/colordlgosx.mm $(CORELIB_ODEP) + $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + corelib_NSBox.o: $(srcdir)/src/cocoa/NSBox.mm $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -23665,12 +23705,6 @@ SAMPLES_DIST: ALL_GUI_DIST cp $(SAMPDIR)/mdi/*.xpm $(DISTDIR)/samples/mdi cp $(SAMPDIR)/mdi/bitmaps/*.xpm $(DISTDIR)/samples/mdi/bitmaps - mkdir $(DISTDIR)/samples/mediaplayer - cp $(SAMPDIR)/mediaplayer/Makefile.in $(DISTDIR)/samples/mediaplayer - cp $(SAMPDIR)/mediaplayer/makefile.unx $(DISTDIR)/samples/mediaplayer - cp $(SAMPDIR)/mediaplayer/*.cpp $(DISTDIR)/samples/mediaplayer - cp $(SAMPDIR)/mediaplayer/*.xpm $(DISTDIR)/samples/mediaplayer - mkdir $(DISTDIR)/samples/memcheck cp $(SAMPDIR)/memcheck/Makefile.in $(DISTDIR)/samples/memcheck cp $(SAMPDIR)/memcheck/makefile.unx $(DISTDIR)/samples/memcheck diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index a315dd91b5..a04986cf00 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -1669,8 +1669,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/html/htmlctrl/webkit/webkit.mm - src/mac/carbon/fontdlg.mm - src/mac/carbon/colordlg.mm + src/mac/carbon/fontdlgosx.mm + src/mac/carbon/colordlgosx.mm diff --git a/src/mac/carbon/colordlg.mm b/src/mac/carbon/colordlgosx.mm similarity index 100% rename from src/mac/carbon/colordlg.mm rename to src/mac/carbon/colordlgosx.mm index 790785c4dc..f1246b418a 100644 --- a/src/mac/carbon/colordlg.mm +++ b/src/mac/carbon/colordlgosx.mm @@ -25,10 +25,6 @@ #include "wx/mac/colordlg.h" #include "wx/fontdlg.h" -#if !USE_SHARED_LIBRARY -IMPLEMENT_DYNAMIC_CLASS(wxColourDialog, wxDialog) -#endif - // ============================================================================ // implementation // ============================================================================ @@ -36,6 +32,10 @@ IMPLEMENT_DYNAMIC_CLASS(wxColourDialog, wxDialog) //Mac OSX 10.2+ only #if USE_NATIVE_FONT_DIALOG_FOR_MACOSX +#if !USE_SHARED_LIBRARY +IMPLEMENT_DYNAMIC_CLASS(wxColourDialog, wxDialog) +#endif + // Cocoa headers #include "wx/cocoa/autorelease.h" #include "wx/cocoa/string.h" diff --git a/src/mac/carbon/fontdlg.mm b/src/mac/carbon/fontdlgosx.mm similarity index 100% rename from src/mac/carbon/fontdlg.mm rename to src/mac/carbon/fontdlgosx.mm index be1a6e1b05..7bc885bd3c 100644 --- a/src/mac/carbon/fontdlg.mm +++ b/src/mac/carbon/fontdlgosx.mm @@ -35,10 +35,6 @@ #include "wx/log.h" #endif -#if !USE_SHARED_LIBRARY -IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog) -#endif - // ============================================================================ // implementation // ============================================================================ @@ -46,6 +42,10 @@ IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog) //Mac OSX 10.2+ only #if USE_NATIVE_FONT_DIALOG_FOR_MACOSX +#if !USE_SHARED_LIBRARY +IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog) +#endif + // Cocoa headers #include "wx/cocoa/autorelease.h" #include "wx/cocoa/string.h" -- 2.50.0