[med-svn] [SCM] aghermann branch, master, updated. 4f7a3b774136ffffbaf9b05d90bd568347bc5461

[Andrei Zavada]

The following commit has been merged in the master branch:
commit 90a21a1f240466c34e8d59e401948dc8e08e3e00
Author: Andrei Zavada <johnhommer at gmail.com>
Date:   Sun Oct 14 02:36:50 2012 +0300

    reinstate gtk_widget_destroy in SF dialog dtors

diff --git a/src/ui/scoring-facility-artifacts.cc b/src/ui/scoring-facility-artifacts.cc
index bfd1fdc..d9bd18c 100644
--- a/src/ui/scoring-facility-artifacts.cc
+++ b/src/ui/scoring-facility-artifacts.cc
@@ -41,4 +41,11 @@ SArtifactDetectionDialog (aghui::SScoringFacility& p_)
 	W_V.up();
 }
 
+
+aghui::SScoringFacility::SArtifactDetectionDialog::
+~SArtifactDetectionDialog ()
+{
+	gtk_widget_destroy( (GtkWidget*)_p.wSFArtifactDetectionSetup);
+}
+
 // eof
diff --git a/src/ui/scoring-facility-filter.cc b/src/ui/scoring-facility-filter.cc
index 2854ec2..8712b4a 100644
--- a/src/ui/scoring-facility-filter.cc
+++ b/src/ui/scoring-facility-filter.cc
@@ -18,12 +18,12 @@ using namespace std;
 
 
 
-// aghui::SScoringFacility::SFiltersDialog::
-// ~SFiltersDialog()
-// {
-// 	// gtk_widget_destroy( (GtkWidget*)wFilters);
-// 	// done in a swoop in ~SF
-// }
+aghui::SScoringFacility::SFiltersDialog::
+~SFiltersDialog()
+{
+	gtk_widget_destroy( (GtkWidget*)_p.wFilters);
+	// done in a swoop in ~SF
+}
 
 
 // eof
diff --git a/src/ui/scoring-facility-patterns.cc b/src/ui/scoring-facility-patterns.cc
index f7d879b..8a12f40 100644
--- a/src/ui/scoring-facility-patterns.cc
+++ b/src/ui/scoring-facility-patterns.cc
@@ -50,7 +50,7 @@ aghui::SScoringFacility::SFindDialog::
 ~SFindDialog ()
 {
 	// g_object_unref( mPatterns);
-	// gtk_widget_destroy( (GtkWidget*)wPattern);
+	gtk_widget_destroy( (GtkWidget*)_p.wPattern);
 }
 
 
diff --git a/src/ui/scoring-facility-phasediff.cc b/src/ui/scoring-facility-phasediff.cc
index 7fefdff..1fda00b 100644
--- a/src/ui/scoring-facility-phasediff.cc
+++ b/src/ui/scoring-facility-phasediff.cc
@@ -39,7 +39,7 @@ SPhasediffDialog (aghui::SScoringFacility& parent)
 aghui::SScoringFacility::SPhasediffDialog::
 ~SPhasediffDialog ()
 {
-	// gtk_widget_destroy( (GtkWidget*)wSFPD);
+	gtk_widget_destroy( (GtkWidget*)_p.wSFPD);
 }
 
 
diff --git a/src/ui/scoring-facility.hh b/src/ui/scoring-facility.hh
index f0de567..e90f421 100644
--- a/src/ui/scoring-facility.hh
+++ b/src/ui/scoring-facility.hh
@@ -587,6 +587,7 @@ class SScoringFacility
 		SFiltersDialog (SScoringFacility& parent)
 		      : _p (parent)
 			{}
+	      ~SFiltersDialog ();
 
 		SUIVarCollection
 			W_V;
@@ -638,6 +639,7 @@ class SScoringFacility
 		DELETE_DEFAULT_METHODS (SArtifactDetectionDialog);
 
 		SArtifactDetectionDialog (SScoringFacility&);
+	       ~SArtifactDetectionDialog ();
 
 		SChannel::SDetectArtifactsParamPack
 			P;

-- 
Sleep experiment manager