[matroska] r1130 - trunk/DvdMenuXtractor

Author: robux4
Date: 2005-04-11 13:12:09 +0400 (Mon, 11 Apr 2005)
New Revision: 1130

Modified:
   trunk/DvdMenuXtractor/Makefile
   trunk/DvdMenuXtractor/MyWizard.cpp
Log:
DMX: fixes for older versions of wxWidgets

Modified: trunk/DvdMenuXtractor/Makefile
===================================================================
--- trunk/DvdMenuXtractor/Makefile	2005-04-11 09:04:45 UTC (rev 1129)
+++ trunk/DvdMenuXtractor/Makefile	2005-04-11 09:12:09 UTC (rev 1130)
@@ -25,17 +25,17 @@
 DVDMENUXTRACTOR_CXXFLAGS = $(__WX_FLAGS_p) \
 	-I./ $(CPPFLAGS) $(CXXFLAGS)
 DVDMENUXTRACTOR_OBJECTS =  \
-	build/DvdMenuXtractor_DvdMenuXtractor.o \
-	build/DvdMenuXtractor_IFOFile.o \
-	build/DvdMenuXtractor_MyWizard.o \
-	build/DvdMenuXtractor_SUBDecoder.o \
-	build/DvdMenuXtractor_VobParser.o \
-	build/DvdMenuXtractor_base64.o \
-	build/DvdMenuXtractor_spudec.o \
-	build/DvdMenuXtractor_iso_lang.o \
-	build/DvdMenuXtractor_CircBuffer.o \
-	build/DvdMenuXtractor_M2VParser.o \
-	build/DvdMenuXtractor_MPEGVideoBuffer.o
+	DvdMenuXtractor_DvdMenuXtractor.o \
+	DvdMenuXtractor_IFOFile.o \
+	DvdMenuXtractor_MyWizard.o \
+	DvdMenuXtractor_SUBDecoder.o \
+	DvdMenuXtractor_VobParser.o \
+	DvdMenuXtractor_base64.o \
+	DvdMenuXtractor_spudec.o \
+	DvdMenuXtractor_iso_lang.o \
+	DvdMenuXtractor_CircBuffer.o \
+	DvdMenuXtractor_M2VParser.o \
+	DvdMenuXtractor_MPEGVideoBuffer.o
 
 ### Conditionally set variables: ###
 
@@ -46,7 +46,7 @@
 
 ### Targets: ###
 
-all: build/DvdMenuXtractor$(EXEEXT)
+all: DvdMenuXtractor$(EXEEXT)
 
 install: all
 
@@ -55,51 +55,50 @@
 install-strip: install
 
 clean: 
-	rm -rf build/.deps build/.pch
-	rm -f build/*.o
-	rm -f build/DvdMenuXtractor$(EXEEXT)
+	rm -rf .deps .pch
+	rm -f *.o
+	rm -f DvdMenuXtractor$(EXEEXT)
 
 distclean: clean
 	rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
-build/DvdMenuXtractor$(EXEEXT): $(DVDMENUXTRACTOR_OBJECTS) $(libdvdread)
-	mkdir build
+DvdMenuXtractor$(EXEEXT): $(DVDMENUXTRACTOR_OBJECTS) $(libdvdread)
 	$(CXX) -o $@ $(DVDMENUXTRACTOR_OBJECTS) $(LDFLAGS)  $(LDFLAGS_GUI)
 	
 	$(__DvdMenuXtractor___mac_setfilecmd)
 	$(__DvdMenuXtractor___os2_emxbindcmd)
 
-build/DvdMenuXtractor_DvdMenuXtractor.o: $(srcdir)/DvdMenuXtractor.cpp
+DvdMenuXtractor_DvdMenuXtractor.o: $(srcdir)/DvdMenuXtractor.cpp
 	$(CXXC) -c -o $@ $(DVDMENUXTRACTOR_CXXFLAGS) $<
 
-build/DvdMenuXtractor_IFOFile.o: $(srcdir)/IFOFile.cpp
+DvdMenuXtractor_IFOFile.o: $(srcdir)/IFOFile.cpp
 	$(CXXC) -c -o $@ $(DVDMENUXTRACTOR_CXXFLAGS) $<
 
-build/DvdMenuXtractor_MyWizard.o: $(srcdir)/MyWizard.cpp
+DvdMenuXtractor_MyWizard.o: $(srcdir)/MyWizard.cpp
 	$(CXXC) -c -o $@ $(DVDMENUXTRACTOR_CXXFLAGS) $<
 
-build/DvdMenuXtractor_SUBDecoder.o: $(srcdir)/SUBDecoder.cpp
+DvdMenuXtractor_SUBDecoder.o: $(srcdir)/SUBDecoder.cpp
 	$(CXXC) -c -o $@ $(DVDMENUXTRACTOR_CXXFLAGS) $<
 
-build/DvdMenuXtractor_VobParser.o: $(srcdir)/VobParser.cpp
+DvdMenuXtractor_VobParser.o: $(srcdir)/VobParser.cpp
 	$(CXXC) -c -o $@ $(DVDMENUXTRACTOR_CXXFLAGS) $<
 
-build/DvdMenuXtractor_base64.o: $(srcdir)/base64.cpp
+DvdMenuXtractor_base64.o: $(srcdir)/base64.cpp
 	$(CXXC) -c -o $@ $(DVDMENUXTRACTOR_CXXFLAGS) $<
 
-build/DvdMenuXtractor_spudec.o: $(srcdir)/spudec/spudec.c
+DvdMenuXtractor_spudec.o: $(srcdir)/spudec/spudec.c
 	$(CCC) -c -o $@ $(DVDMENUXTRACTOR_CFLAGS) $<
 
-build/DvdMenuXtractor_iso_lang.o: $(srcdir)/iso/iso_lang.c
+DvdMenuXtractor_iso_lang.o: $(srcdir)/iso/iso_lang.c
 	$(CCC) -c -o $@ $(DVDMENUXTRACTOR_CFLAGS) $<
 
-build/DvdMenuXtractor_CircBuffer.o: $(srcdir)/mpegparser/CircBuffer.cpp
+DvdMenuXtractor_CircBuffer.o: $(srcdir)/mpegparser/CircBuffer.cpp
 	$(CCC) -c -o $@ $(DVDMENUXTRACTOR_CXXFLAGS) $<
 
-build/DvdMenuXtractor_M2VParser.o: $(srcdir)/mpegparser/M2VParser.cpp
+DvdMenuXtractor_M2VParser.o: $(srcdir)/mpegparser/M2VParser.cpp
 	$(CCC) -c -o $@ $(DVDMENUXTRACTOR_CXXFLAGS) $<
 
-build/DvdMenuXtractor_MPEGVideoBuffer.o: $(srcdir)/mpegparser/MPEGVideoBuffer.cpp
+DvdMenuXtractor_MPEGVideoBuffer.o: $(srcdir)/mpegparser/MPEGVideoBuffer.cpp
 	$(CCC) -c -o $@ $(DVDMENUXTRACTOR_CXXFLAGS) $<
 
 .PHONY: all install uninstall clean distclean

Modified: trunk/DvdMenuXtractor/MyWizard.cpp
===================================================================
--- trunk/DvdMenuXtractor/MyWizard.cpp	2005-04-11 09:04:45 UTC (rev 1129)
+++ trunk/DvdMenuXtractor/MyWizard.cpp	2005-04-11 09:12:09 UTC (rev 1130)
@@ -227,7 +227,11 @@
     {
         m_page->BeforeHide();
         m_page->Hide();
+#if (wxMAJOR_VERSION >= 2) && (xwMINOR_VERSION < 5 )
+        sizer->Remove(m_page);
+#else
         sizer->Detach(m_page);
+#endif
         m_page->AfterHide();
     }