Hugin

Update of /cvsroot/hugin/hugin/src/hugin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14861/src/hugin

Modified Files:
	PreferencesDialog.cpp 
Log Message:
use wxNotebook::GetSelection(), its compatible with wx 2.4.
disabled deleting of tiff input by default.


Index: PreferencesDialog.cpp
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/PreferencesDialog.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- PreferencesDialog.cpp	15 Aug 2005 21:03:48 -0000	1.32
+++ PreferencesDialog.cpp	15 Aug 2005 21:38:57 -0000	1.33
@@ -125,7 +125,7 @@
 PreferencesDialog::~PreferencesDialog()
 {
     DEBUG_TRACE("begin dtor");
-    
+
     StoreFramePosition(this, wxT("PreferencesDialog"));
 
     DEBUG_TRACE("end dtor");
@@ -583,13 +583,13 @@
                                 wxYES_NO, this);
     if ( really == wxYES)
     {
-        if (noteb->GetCurrentPage() == noteb->GetPage(0)) {
+        if (noteb->GetSelection() == 0) {
             cfg->Write(wxT("/Panotools/PTStitcherExe"), wxT(HUGIN_PT_STITCHER_EXE) );
             cfg->Write(wxT("/Panotools/PTOptimizerExe"), wxT(HUGIN_PT_OPTIMIZER_EXE) );
             cfg->Write(wxT("/PanoTools/ScriptFile"), wxT("PT_script.txt"));
         }
 
-        if (noteb->GetCurrentPage() == noteb->GetPage(1)) {
+        if (noteb->GetSelection() == 1) {
             // Fine tune settings
             cfg->Write(wxT("/Finetune/SearchAreaPercent"), HUGIN_FT_SEARCH_AREA_PERCENT);
             cfg->Write(wxT("/Finetune/TemplateSize"), HUGIN_FT_TEMPLATE_SIZE);
@@ -603,7 +603,7 @@
             cfg->Write(wxT("/Finetune/RotationStopAngle"), HUGIN_FT_ROTATION_STOP_ANGLE);
             cfg->Write(wxT("/Finetune/RotationSteps"), HUGIN_FT_ROTATION_STEPS);
         }
-        if (noteb->GetCurrentPage() == noteb->GetPage(2)) {
+        if (noteb->GetSelection() == 2) {
             // MISC
             // cache
             cfg->Write(wxT("/ImageCache/UpperBound"), HUGIN_IMGCACHE_UPPERBOUND);
@@ -614,7 +614,7 @@
             // use preview images as active images
             cfg->Write(wxT("/General/UseOnlySelectedImages"), HUGIN_USE_SELECTED_IMAGES);
         }
-        if (noteb->GetCurrentPage() == noteb->GetPage(3)) {
+        if (noteb->GetSelection() == 3) {
             /////
             /// AUTOPANO
             cfg->Write(wxT("/AutoPano/Type"), HUGIN_AP_TYPE);
@@ -625,13 +625,13 @@
             cfg->Write(wxT("/AutoPanoKolor/AutopanoExe"), wxT(HUGIN_APKOLOR_EXE));
             cfg->Write(wxT("/AutoPanoKolor/Args"), wxT(HUGIN_APKOLOR_ARGS));
         }
-        if (noteb->GetCurrentPage() == noteb->GetPage(3)) {
+        if (noteb->GetSelection() == 4) {
             /// ENBLEND
             cfg->Write(wxT("/Enblend/EnblendExe"), wxT(HUGIN_ENBLEND_EXE));
             cfg->Write(wxT("/Enblend/EnblendArgs"), wxT(HUGIN_ENBLEND_ARGS));
             cfg->Write(wxT("/Enblend/DeleteRemappedFiles"), HUGIN_ENBLEND_DELETE_REMAPPED_FILES);
         }
-        
+
         UpdateDisplayData();
     }
 }