added missing parent parameter to Cocoa version of wxAboutBox(); also pass it to...

[wxWidgets.git] / samples / dataview / Makefile.in

diff --git a/samples/dataview/Makefile.in b/samples/dataview/Makefile.in
index 959504a903ac64cf3b3fa664eeb94c1fd19f9c1b..2f424dc3a986a5ba9d0e092f01931a4e7b1024b9 100644 (file)
--- a/samples/dataview/Makefile.in
+++ b/samples/dataview/Makefile.in
@@ -35,7 +35,6 @@ EXTRALIBS_SDL = @EXTRALIBS_SDL@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@

-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@

 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###


@@ -51,6 +50,7 @@ DATAVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 DATAVIEW_OBJECTS =  \
        $(__dataview_os2_lib_res) \
        dataview_dataview.o \
 DATAVIEW_OBJECTS =  \
        $(__dataview_os2_lib_res) \
        dataview_dataview.o \

+       dataview_mymodels.o \

        $(__dataview___win32rc)
 
 ### Conditionally set variables: ###
        $(__dataview___win32rc)
 
 ### Conditionally set variables: ###


@@ -156,7 +156,6 @@ dataview$(EXEEXT): $(DATAVIEW_OBJECTS) $(__dataview___win32rc)
        
        $(__dataview___mac_setfilecmd)
        $(__dataview___os2_emxbindcmd)
        
        $(__dataview___mac_setfilecmd)
        $(__dataview___os2_emxbindcmd)

-       $(SAMPLES_RPATH_POSTLINK)

 
 @COND_PLATFORM_MACOSX_1@dataview.app/Contents/PkgInfo: dataview$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p dataview.app/Contents
 
 @COND_PLATFORM_MACOSX_1@dataview.app/Contents/PkgInfo: dataview$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p dataview.app/Contents


@@ -183,6 +182,9 @@ dataview$(EXEEXT): $(DATAVIEW_OBJECTS) $(__dataview___win32rc)
 dataview_dataview.o: $(srcdir)/dataview.cpp
        $(CXXC) -c -o $@ $(DATAVIEW_CXXFLAGS) $(srcdir)/dataview.cpp
 
 dataview_dataview.o: $(srcdir)/dataview.cpp
        $(CXXC) -c -o $@ $(DATAVIEW_CXXFLAGS) $(srcdir)/dataview.cpp
 

+dataview_mymodels.o: $(srcdir)/mymodels.cpp
+       $(CXXC) -c -o $@ $(DATAVIEW_CXXFLAGS) $(srcdir)/mymodels.cpp
+

 dataview_sample_rc.o: $(srcdir)/../sample.rc
        $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)  $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2)   --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include
 
 dataview_sample_rc.o: $(srcdir)/../sample.rc
        $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)  $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2)   --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include