[med-svn] [SCM] aghermann branch, master, updated. 5727b0b7844548ed4c4fceab25995fc02b87da50

[Andrei Zavada]

The following commit has been merged in the master branch:
commit 049f42da0576dea947005017b2ae73189ee5e2c5
Author: Andrei Zavada <johnhommer at gmail.com>
Date:   Tue Dec 4 02:15:55 2012 +0200

    ICM

diff --git a/src/ui/mw/mw-mainmenu_cb.cc b/src/ui/mw/mw-mainmenu_cb.cc
index a6b3cf4..9de8772 100644
--- a/src/ui/mw/mw-mainmenu_cb.cc
+++ b/src/ui/mw/mw-mainmenu_cb.cc
@@ -120,6 +120,11 @@ iExpBasicSADetectUltradianCycles_activate_cb( GtkMenuItem*, gpointer userdata)
 	ED.ED->for_all_episodes( F, reporter, filter);
 }
 
+
+
+
+
+
 void
 iExpGloballyDetectArtifacts_activate_cb( GtkMenuItem*, gpointer userdata)
 {
@@ -243,16 +248,6 @@ eGlobalADProfiles_changed_cb( GtkComboBox *b, gpointer userdata)
 
 
 
-// iMontageSetDefaults_activate_cb( GtkMenuItem*, gpointer userdata)
-// {
-// 	auto& ED = *(SExpDesignUI*)userdata;
-
-// 	if ( GTK_RESPONSE_OK ==
-// 	     gtk_dialog_run( ED.wMontageDefaults) )
-// 		FAFA;
-// }
-
-
 
 void
 iExpGloballySetFilters_activate_cb( GtkMenuItem*, gpointer userdata)
diff --git a/src/ui/mw/mw-settings_cb.cc b/src/ui/mw/mw-settings_cb.cc
index f8d266c..e6ec5a0 100644
--- a/src/ui/mw/mw-settings_cb.cc
+++ b/src/ui/mw/mw-settings_cb.cc
@@ -25,7 +25,8 @@ using namespace aghui;
 
 
 
-extern "C"
+extern "C" {
+
 void
 tDesign_switch_page_cb( GtkNotebook*, gpointer, guint page_num, gpointer userdata)
 {
@@ -169,7 +170,6 @@ __adjust_tunables_down( SExpDesignUI& ED)
 
 } // inline namespace
 
-extern "C"
 void
 tSimulations_switch_page_cb( GtkNotebook*, gpointer, guint page_num, gpointer userdata)
 {
@@ -213,7 +213,6 @@ tSimulations_switch_page_cb( GtkNotebook*, gpointer, guint page_num, gpointer us
 
 
 
-extern "C"
 void
 bSimParamRevertTunables_clicked_cb( GtkButton*, gpointer userdata)
 {
@@ -229,7 +228,6 @@ bSimParamRevertTunables_clicked_cb( GtkButton*, gpointer userdata)
 }
 
 
-extern "C"
 void
 eCtlParamDBAmendment1_toggled_cb( GtkToggleButton *button, gpointer userdata)
 {
@@ -239,7 +237,7 @@ eCtlParamDBAmendment1_toggled_cb( GtkToggleButton *button, gpointer userdata)
 			      ? "<small>Let SWA be affected by <i>S</i> at all times</small>"
 			      : "<small>Cancel <i>rc</i>-dependent SWA increase in Wake</small>");
 }
-extern "C"
+
 void
 eCtlParamDBAmendment2_toggled_cb( GtkToggleButton *button, gpointer userdata)
 {
@@ -249,7 +247,7 @@ eCtlParamDBAmendment2_toggled_cb( GtkToggleButton *button, gpointer userdata)
 			      ? "<small>Assume sleep homeostat is stable (<i>S</i><sub>24h</sub> = <i>S</i><sub>0</sub>)</small>"
 			      : "<small>Don't assume <i>S</i><sub>24h</sub> = <i>S</i><sub>0</sub></small>");
 }
-extern "C"
+
 void
 eCtlParamAZAmendment1_toggled_cb( GtkToggleButton *button, gpointer userdata)
 {
@@ -260,5 +258,15 @@ eCtlParamAZAmendment1_toggled_cb( GtkToggleButton *button, gpointer userdata)
 			      : "<small>Assume <i>gc</i> is not variable across episodes</small>");
 }
 
+// -------- colours
+void
+bColourX_color_set_cb( GtkColorButton *widget,
+		       gpointer        userdata)
+{
+	auto& mc = *(SManagedColor*)userdata;
+	mc.acquire();
+}
+
+} // extern "C"
 
 // eof
diff --git a/src/ui/mw/mw_cb.cc b/src/ui/mw/mw_cb.cc
index e96001a..1282e93 100644
--- a/src/ui/mw/mw_cb.cc
+++ b/src/ui/mw/mw_cb.cc
@@ -272,18 +272,6 @@ bMainCloseThatSF_clicked_cb( GtkButton*, gpointer userdata)
 	ED.close_this_SF_now = nullptr;
 }
 
-
-
-
-// -------- colours
-void
-bColourX_color_set_cb( GtkColorButton *widget,
-		       gpointer        userdata)
-{
-	auto& mc = *(SManagedColor*)userdata;
-	mc.acquire();
-}
-
 } // extern "C"
 
 // eof

-- 
Sleep experiment manager