gtkmm-2 upgrade. Still some small bugs to iron out, but mostly functional

[lyx.git] / src / frontends / gnome / Dialogs.C

diff --git a/src/frontends/gnome/Dialogs.C b/src/frontends/gnome/Dialogs.C
index 94e9627886faf64ba411ee1f72a7063c1bf098a1..9874ad9c688979e271c95cddbbdfcc200bbf81f9 100644 (file)
--- a/src/frontends/gnome/Dialogs.C
+++ b/src/frontends/gnome/Dialogs.C
@@ -14,19 +14,22 @@
 #pragma implementation
 #endif
 
-#include "gettext.h"
 
 #include "Dialogs.h"
-#include "frontends/LyXView.h"
-#include "gnomeBC.h"
-#include "Tooltips.h"
+
 #include "GUI.h"
+#include "gnomeBC.h"
+
+#include "frontends/LyXView.h"
 
-#include "GUrl.h"
 #include "GError.h"
-#include "GTabularCreate.h"
 #include "GERT.h"
 #include "GPreamble.h"
+#include "GTabularCreate.h"
+#include "GUrl.h"
+
+
+#include "Tooltips.h"
 
 bool Dialogs::tooltipsEnabled()
 {
@@ -34,15 +37,21 @@ bool Dialogs::tooltipsEnabled()
 }
 Dialogs::Dialogs(LyXView * lv)
 {
-       add(new GUIUrl<GUrl, gnomeBC>(*lv, *this));
-       add(new GUIError<GError, gnomeBC>(*lv, *this));
-       add(new GUITabularCreate<GTabularCreate, gnomeBC>(*lv, *this));
-       add(new GUIERT<GERT, gnomeBC>(*lv, *this));
-       add(new GUIPreamble<GPreamble, gnomeBC>(*lv, *this));
+
+       add(new GUI<ControlError,GErrorDialog, 
+           OkCancelPolicy, gnomeBC>(*lv, *this));
+       add(new GUI<ControlERT, GERT,
+           NoRepeatedApplyReadOnlyPolicy, gnomeBC>(*lv, *this));
+       add(new GUI<ControlUrl, GUrl,
+           NoRepeatedApplyReadOnlyPolicy, gnomeBC>(*lv,*this));
+       add(new GUI<ControlPreamble, GPreamble,
+           NoRepeatedApplyReadOnlyPolicy, gnomeBC>(*lv, *this));
+       add(new GUI<ControlTabularCreate, GTabularCreate,
+           OkApplyCancelReadOnlyPolicy, gnomeBC>(*lv, *this));
 
        // reduce the number of connections needed in
        // dialogs by a simple connection here.
-       hideAll.connect(hideBufferDependent.slot());
+       hideAll.connect(hideBufferDependent);
 }
 
 /*****************************************************************************