[Hugin-cvs] SF.net SVN: hugin:[4381] hugin/releases/2009.2/src/hugin1/hugin/ CPDetectorConfig.cpp

[<har...@us...>]

Revision: 4381
          http://hugin.svn.sourceforge.net/hugin/?rev=4381&view=rev
Author:   harryvanderwolf
Date:     2009-09-11 17:39:06 +0000 (Fri, 11 Sep 2009)

Log Message:
-----------
[OSX] MacOSX bundle use AutoCustome CP value which was therefore also used (hidden) for other OSses. I disabled this functionality (not removed) due to the fact that MacOSX now adopted TModes AutoCP generator structure. This needs to be dealt with carefully for the 2009.4 release

Modified Paths:
--------------
    hugin/releases/2009.2/src/hugin1/hugin/CPDetectorConfig.cpp

Modified: hugin/releases/2009.2/src/hugin1/hugin/CPDetectorConfig.cpp
===================================================================
--- hugin/releases/2009.2/src/hugin1/hugin/CPDetectorConfig.cpp	2009-09-11 17:36:39 UTC (rev 4380)
+++ hugin/releases/2009.2/src/hugin1/hugin/CPDetectorConfig.cpp	2009-09-11 17:39:06 UTC (rev 4381)
@@ -145,11 +145,11 @@
             desc=default_cpdetectors[new_type].desc;
             prog=default_cpdetectors[new_type].prog;
             args=default_cpdetectors[new_type].args;
-#ifdef MAC_SELF_CONTAINED_BUNDLE
+/* #ifdef MAC_SELF_CONTAINED_BUNDLE
             custom=default_cpdetectors[new_type].custom;
-#else
+#else */
             custom=true;
-#endif
+/* #endif */
         };
     };
 };
@@ -160,11 +160,11 @@
     desc=config->Read(path+wxT("/Description"),default_cpdetectors[0].desc);
     prog=config->Read(path+wxT("/Program"),default_cpdetectors[0].prog);
     args=config->Read(path+wxT("/Arguments"),default_cpdetectors[0].args);
-#if defined MAC_SELF_CONTAINED_BUNDLE
+/* #if defined MAC_SELF_CONTAINED_BUNDLE
     custom=config->Read(path+wxT("/AutopanoExeCustom"),(bool*)default_cpdetectors[0].custom);
-#else
+#else */
     custom=true;
-#endif
+/* #endif */
 };
 
 void CPDetectorSetting::Write(wxConfigBase *config, wxString path)
@@ -173,9 +173,9 @@
     config->Write(path+wxT("/Description"),desc);
     config->Write(path+wxT("/Program"),prog);
     config->Write(path+wxT("/Arguments"),args);
-#if defined MAC_SELF_CONTAINED_BUNDLE
+/* #if defined MAC_SELF_CONTAINED_BUNDLE
     config->Write(path+wxT("/AutopanoExeCustom"),custom);
-#endif
+#endif */
 };
 
 // dialog for showing settings of one autopano setting
@@ -205,15 +205,15 @@
     m_cpdetector_type = XRCCTRL(*this, "prefs_cpdetector_type", wxChoice);
     m_cpdetector_type->SetSelection(1);
     m_custom_cpdetector = XRCCTRL(*this, "prefs_cpdetector_custom", wxCheckBox);
-#ifdef MAC_SELF_CONTAINED_BUNDLE
+/* #ifdef MAC_SELF_CONTAINED_BUNDLE
     m_custom_cpdetector->SetValue(FALSE);
-#else
+#else */
     m_custom_cpdetector->SetValue(TRUE);
-#endif
+/* #endif */
     EnableControls(m_custom_cpdetector->GetValue());
-#ifndef MAC_SELF_CONTAINED_BUNDLE
+/* #ifndef MAC_SELF_CONTAINED_BUNDLE */
     m_custom_cpdetector->Hide();
-#endif
+/* #endif */
 };
 
 CPDetectorDialog::~CPDetectorDialog()


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.