[matroska] r873 - trunk/DvdMenuXtractor

Author: robux4
Date: 2004-10-08 17:53:55 +0400 (Fri, 08 Oct 2004)
New Revision: 873

Modified:
   trunk/DvdMenuXtractor/DvdMenuXtractor.cpp
   trunk/DvdMenuXtractor/IFOFile.cpp
Log:
supposedly use all found languages

Modified: trunk/DvdMenuXtractor/DvdMenuXtractor.cpp
===================================================================
--- trunk/DvdMenuXtractor/DvdMenuXtractor.cpp	2004-10-08 13:34:51 UTC (rev 872)
+++ trunk/DvdMenuXtractor/DvdMenuXtractor.cpp	2004-10-08 13:53:55 UTC (rev 873)
@@ -484,28 +484,28 @@
 public:
     wxMyWizardPage4(wxWindow *parent) : wxMyWizardPageSimple(parent)
     {
-        this->m_pageTitle = "Data menu extraction";
-        this->m_pageDesc = "Processing menu VOB";
-
-        wxFlexGridSizer *fgs = new wxFlexGridSizer(3,1,0,0);
-        fgs->AddGrowableCol(0);
-        fgs->AddGrowableRow(2);
-
-        m_lbStep = new wxStaticText(this,-1,"");
-        m_gaDemuxProgress = new wxGauge(this,-1,100);
-        m_txtDemuxLog = new wxTextCtrl(this, -1,wxEmptyString,
-            wxDefaultPosition,wxDefaultSize,wxTE_MULTILINE|wxTE_READONLY);
-
-        fgs->Add(m_lbStep,0,wxALL|wxEXPAND,5);
-        fgs->Add(m_gaDemuxProgress,0,wxALL|wxEXPAND,5);
-        fgs->Add(m_txtDemuxLog,0,wxALL|wxEXPAND,5);
-
-        this->SetAutoLayout(TRUE);
-        this->SetSizer(fgs);
-        fgs->Fit(this);
-        fgs->SetSizeHints(this);
-
-        m_OperationInProgress = FALSE;
+		this->m_pageTitle = "Data menu extraction";
+		this->m_pageDesc = "Processing menu VOB";
+		
+		wxFlexGridSizer *fgs = new wxFlexGridSizer(3,1,0,0);
+		fgs->AddGrowableCol(0);
+		fgs->AddGrowableRow(2);
+		
+		m_lbStep = new wxStaticText(this,-1,"");
+		m_gaDemuxProgress = new wxGauge(this,-1,100);
+		m_txtDemuxLog = new wxTextCtrl(this, -1,wxEmptyString,
+		wxDefaultPosition,wxDefaultSize,wxTE_MULTILINE|wxTE_READONLY);
+		
+		fgs->Add(m_lbStep,0,wxALL|wxEXPAND,5);
+		fgs->Add(m_gaDemuxProgress,0,wxALL|wxEXPAND,5);
+		fgs->Add(m_txtDemuxLog,0,wxALL|wxEXPAND,5);
+		
+		this->SetAutoLayout(TRUE);
+		this->SetSizer(fgs);
+		fgs->Fit(this);
+		fgs->SetSizeHints(this);
+		
+		m_OperationInProgress = FALSE;
     }
 
 	~wxMyWizardPage4()
@@ -1349,13 +1349,14 @@
 #endif
 
     wxMyWizardPage1 *page1 = new wxMyWizardPage1(wizard->GetMainPanel());
-    wxMyWizardPage2 *page2 = new wxMyWizardPage2(wizard->GetMainPanel());
+    //wxMyWizardPage2 *page2 = new wxMyWizardPage2(wizard->GetMainPanel());
     //wxMyWizardPage3 *page3 = new wxMyWizardPage3(wizard->GetMainPanel());
     wxMyWizardPage4 *page4 = new wxMyWizardPage4(wizard->GetMainPanel());
 
-    wxMyWizardPageSimple::Chain(page1,page2);
+    wxMyWizardPageSimple::Chain(page1,page4);
+    //wxMyWizardPageSimple::Chain(page1,page2);
     //wxMyWizardPageSimple::Chain(page2,page3);
-    wxMyWizardPageSimple::Chain(page2,page4);
+    //wxMyWizardPageSimple::Chain(page2,page4);
 
     bool modal = FALSE;
     wizard->RunWizard(page1, modal);

Modified: trunk/DvdMenuXtractor/IFOFile.cpp
===================================================================
--- trunk/DvdMenuXtractor/IFOFile.cpp	2004-10-08 13:34:51 UTC (rev 872)
+++ trunk/DvdMenuXtractor/IFOFile.cpp	2004-10-08 13:53:55 UTC (rev 873)
@@ -85,6 +85,7 @@
 	{
 		pgci_lu_t* lu = &m_ifos.Item(0)->GetData()->pgci_ut->lu[i];
 		m_languageList.Add(DecodeLanguage(lu->lang_code));
+		m_SelectionTab[i] = 1;
 	}
 
 	return m_languageList;