From: Julian Smart Date: Thu, 31 Mar 2005 14:55:24 +0000 (+0000) Subject: Removed obsolete WXR file X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/32aae41e683cf6214aa6e3e9d01bd3f2f6f167fd Removed obsolete WXR file git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33215 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/build/bakefiles/make_dist.mk b/build/bakefiles/make_dist.mk index 6f24e0e5ef..76737700a8 100644 --- a/build/bakefiles/make_dist.mk +++ b/build/bakefiles/make_dist.mk @@ -488,7 +488,6 @@ SAMPLES_DIST: ALL_GUI_DIST mkdir $(DISTDIR)/samples/dnd cp $(SAMPDIR)/dnd/Makefile.in $(DISTDIR)/samples/dnd cp $(SAMPDIR)/dnd/makefile.unx $(DISTDIR)/samples/dnd - cp $(SAMPDIR)/dnd/*.wxr $(DISTDIR)/samples/dnd cp $(SAMPDIR)/dnd/*.cpp $(DISTDIR)/samples/dnd cp $(SAMPDIR)/dnd/*.xpm $(DISTDIR)/samples/dnd cp $(SAMPDIR)/dnd/*.txt $(DISTDIR)/samples/dnd diff --git a/samples/dnd/Makefile.in b/samples/dnd/Makefile.in index e241013d68..df4db2083c 100644 --- a/samples/dnd/Makefile.in +++ b/samples/dnd/Makefile.in @@ -173,7 +173,7 @@ dnd.app/Contents/PkgInfo: dnd$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.i data: @mkdir -p . - @for f in wxwin.png dnd.wxr; do \ + @for f in wxwin.png; do \ if test ! -e ./$$f ; \ then x=yep ; \ else x=`find $(srcdir)/$$f -newer ./$$f -print` ; \ diff --git a/samples/dnd/dnd.bkl b/samples/dnd/dnd.bkl index 406de44049..5ad9f3fed2 100644 --- a/samples/dnd/dnd.bkl +++ b/samples/dnd/dnd.bkl @@ -11,7 +11,7 @@ - wxwin.png dnd.wxr + wxwin.png diff --git a/samples/dnd/dnd.wxr b/samples/dnd/dnd.wxr deleted file mode 100644 index 68609212e8..0000000000 --- a/samples/dnd/dnd.wxr +++ /dev/null @@ -1,36 +0,0 @@ -static char *dialogShape = "dialog(name = 'dialogShape',\ - style = 'wxRAISED_BORDER | wxCAPTION | wxTHICK_FRAME | wxSYSTEM_MENU',\ - title = 'Choose Shape',\ - id = 6001,\ - x = 10, y = 10, width = 224, height = 135,\ - background_colour = 'C0C0C0',\ - use_dialog_units = 1,\ - use_system_defaults = 0,\ - font = [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif'],\ - control = [6002, wxStaticBox, '&Attributes', '0', 'staticbox2', 4, 50, 216, 54,\ - [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\ - control = [5100, wxButton, 'Ok', '0', 'button3', 124, 118, 45, 11, '',\ - [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\ - control = [5101, wxButton, 'Cancel', '0', 'button4', 176, 118, 45, 11, '',\ - [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\ - control = [6005, wxRadioBox, '&Shape', 'wxRA_SPECIFY_COLS', 'radio', 4, 4, 216, 25, ['None', 'Triangle', 'Rectangle', 'Ellipse'], 4,\ - [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\ - control = [6006, wxStaticText, 'Position &X:', '0', 'statictext6', 8, 64, 56, 13, '',\ - [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\ - control = [6008, wxTextCtrl, '', '0', 'textX', 46, 62, 33, 11, '',\ - [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\ - control = [6009, wxStaticText, '&Y:', '0', 'statictext9', 92, 63, 15, 6, '',\ - [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\ - control = [6010, wxTextCtrl, '', '0', 'textY', 104, 61, 32, 13, '',\ - [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\ - control = [6011, wxStaticText, 'Size &width:', '0', 'statictext11', 9, 87, 15, 6, '',\ - [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\ - control = [6012, wxTextCtrl, '', '0', 'textW', 46, 85, 32, 11, '',\ - [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\ - control = [6013, wxStaticText, '&height:', '0', 'statictext13', 82, 88, 15, 6, '',\ - [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\ - control = [6014, wxTextCtrl, '', '0', 'textH', 104, 84, 32, 11, '',\ - [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\ - control = [1001, wxButton, '&Colour...', '0', 'button15', 153, 73, 45, 11, '',\ - [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']])."; - diff --git a/samples/dnd/makefile.bcc b/samples/dnd/makefile.bcc index a326857c50..3597030a81 100644 --- a/samples/dnd/makefile.bcc +++ b/samples/dnd/makefile.bcc @@ -212,7 +212,7 @@ $(OBJS)\dnd.exe: $(DND_OBJECTS) $(OBJS)\dnd_dnd.res data: if not exist $(OBJS) mkdir $(OBJS) - for %f in (wxwin.png dnd.wxr) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + for %f in (wxwin.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS) $(OBJS)\dnd_dnd.obj: .\dnd.cpp $(CXX) -q -c -P -o$@ $(DND_CXXFLAGS) $** diff --git a/samples/dnd/makefile.gcc b/samples/dnd/makefile.gcc index bf7547bcb4..a2202a1268 100644 --- a/samples/dnd/makefile.gcc +++ b/samples/dnd/makefile.gcc @@ -203,7 +203,7 @@ $(OBJS)\dnd.exe: $(DND_OBJECTS) $(OBJS)\dnd_dnd_rc.o data: if not exist $(OBJS) mkdir $(OBJS) - for %%f in (wxwin.png dnd.wxr) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS) + for %%f in (wxwin.png) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS) $(OBJS)\dnd_dnd.o: ./dnd.cpp $(CXX) -c -o $@ $(DND_CXXFLAGS) $< diff --git a/samples/dnd/makefile.vc b/samples/dnd/makefile.vc index 309e83e604..9b7f3da708 100644 --- a/samples/dnd/makefile.vc +++ b/samples/dnd/makefile.vc @@ -290,7 +290,7 @@ $(OBJS)\dnd.exe: $(DND_OBJECTS) $(OBJS)\dnd_dnd.res data: if not exist $(OBJS) mkdir $(OBJS) - for %f in (wxwin.png dnd.wxr) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + for %f in (wxwin.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS) $(OBJS)\dnd_dnd.obj: .\dnd.cpp $(CXX) /c /nologo /TP /Fo$@ $(DND_CXXFLAGS) $** diff --git a/samples/dnd/makefile.wat b/samples/dnd/makefile.wat index 391b918625..b2776f0396 100644 --- a/samples/dnd/makefile.wat +++ b/samples/dnd/makefile.wat @@ -246,7 +246,7 @@ $(OBJS)\dnd.exe : $(DND_OBJECTS) $(OBJS)\dnd_dnd.res data : .SYMBOLIC if not exist $(OBJS) mkdir $(OBJS) - for %f in (wxwin.png dnd.wxr) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + for %f in (wxwin.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS) $(OBJS)\dnd_dnd.obj : .AUTODEPEND .\dnd.cpp $(CXX) -zq -fo=$^@ $(DND_CXXFLAGS) $<