try this for distinguishing inner and outer tabs

[lyx.git] / src / frontends / xforms / FormBase.h

diff --git a/src/frontends/xforms/FormBase.h b/src/frontends/xforms/FormBase.h
index 78d6e03d1c7c1b9ff8b2a624767a7587573c607c..1cf0f693b1531b3836b376cac5136841247370b0 100644 (file)
--- a/src/frontends/xforms/FormBase.h
+++ b/src/frontends/xforms/FormBase.h
@@ -14,11 +14,10 @@
 
 #include "DialogBase.h"
 #include "LString.h"
-#include <boost/utility.hpp>
 #include FORMS_H_LOCATION
 #include "ButtonController.h"
 #include "gettext.h"
-#include <sigc++/signal_system.h> // temporary
+#include <sigc++/signal_system.h>
 
 class Buffer;
 class Dialogs;
@@ -34,7 +33,7 @@ class LyXView;
     @author Angus Leeming
  */
 
-class FormBase : public DialogBase, public noncopyable {
+class FormBase : public DialogBase {
 public:
        /// Callback functions
        static  int WMHideCB(FL_FORM *, void *);
@@ -57,14 +56,14 @@ protected: // methods
        virtual ~FormBase();
 
        /** Redraw the form (on receipt of a Signal indicating, for example,
-           that the xform colours have been re-mapped).
+           that the xform colors have been re-mapped).
            Must be virtual because dialogs with tabbed folders will need to
            redraw the form for each tab.
        */
        virtual void redraw();
 
        /// Create the dialog if necessary, update it and display it.
-       void show();
+       virtual void show();
        /// Hide the dialog.
        virtual void hide();
        /// Update the dialog.
@@ -72,7 +71,7 @@ protected: // methods
        /// Connect signals. Also perform any necessary initialisation.
        virtual void connect();
        /// Disconnect signals. Also perform any necessary housekeeping.
-       virtual void disconnect() = 0;
+       virtual void disconnect();
        /// Build the dialog
        virtual void build() = 0;
        /** Filter the inputs on callback from xforms
@@ -110,10 +109,14 @@ protected: // methods
        Dialogs * d_;
        /// Hide connection.
        Connection h_;
+       /// Redraw connection.
+       Connection r_;
        /// dialog title, displayed by WM.
        string title;
+private:
        ///
        ButtonPolicy * bp_;
+public:
        /// Overcome a dumb xforms sizing bug
        mutable int minw_;
        ///
@@ -129,14 +132,12 @@ class FormBaseBI : public FormBase {
 protected:
        /// Constructor
        FormBaseBI(LyXView *, Dialogs *, string const &,
-                  ButtonPolicy * bp = new OkApplyCancelPolicy,
+                  ButtonPolicy * bp,
                   char const * close = N_("Close"),
                   char const * cancel = N_("Cancel"));
 
        /// Connect signals
        virtual void connect();
-       /// Disconnect signals
-       virtual void disconnect();
 };
 
 
@@ -146,7 +147,7 @@ class FormBaseBD : public FormBase {
 protected:
        /// Constructor
        FormBaseBD(LyXView *, Dialogs *, string const &,
-                  ButtonPolicy * bp = new OkApplyCancelReadOnlyPolicy,
+                  ButtonPolicy * bp,
                   char const * close = N_("Close"),
                   char const * cancel = N_("Cancel"));