Bugfixes: checkboxes to radiobuttons (from J�rgen S) and remove a little

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

diff --git a/src/frontends/xforms/FormBaseDeprecated.h b/src/frontends/xforms/FormBaseDeprecated.h
index 6372a7683a804717824b00543554ce5297526905..ca29b23a0899c815cb3ab2f0472a8e7bd2bdec28 100644 (file)
--- a/src/frontends/xforms/FormBaseDeprecated.h
+++ b/src/frontends/xforms/FormBaseDeprecated.h
@@ -4,7 +4,7 @@
  *
  *           LyX, The Document Processor
  *
- *           Copyright 2000 The LyX Team.
+ *           Copyright 2000-2001 The LyX Team.
  *
  * ======================================================
  */
@@ -12,20 +12,21 @@
 #ifndef FORMBASEDEPRECATED_H
 #define FORMBASEDEPRECATED_H
 
-#include "DialogBase.h"
-#include "LString.h"
 #include FORMS_H_LOCATION
 #include <sigc++/signal_system.h>
 
-class Buffer;
-class Dialogs;
-class LyXView;
-class xformsBC;
-
 #ifdef __GNUG__
 #pragma interface
 #endif
 
+#include "DialogBase.h"
+#include "LString.h"
+#include "xformsBC.h"
+
+class Buffer;
+class Dialogs;
+class LyXView;
+
 /** This class is an XForms GUI base class.
     It is meant to be used solely as the parent class to FormBaseBI
     and FormBaseBD.
@@ -51,7 +52,7 @@ public:
 
 protected: // methods
        ///
-       FormBaseDeprecated(LyXView *, Dialogs *, string const &);
+       FormBaseDeprecated(LyXView *, Dialogs *, string const &, bool);
        ///
        virtual ~FormBaseDeprecated() {}
 
@@ -109,16 +110,19 @@ protected: // methods
        /// Used so we can get at the signals we have to connect to.
        Dialogs * d_;
        /// Hide connection.
-       Connection h_;
+       SigC::Connection h_;
        /// Redraw connection.
-       Connection r_;
+       SigC::Connection r_;
        /// dialog title, displayed by WM.
-       string title;
-public:
-       /// Overcome a dumb xforms sizing bug
-       mutable int minw_;
+       string title_;
+
+private:
+       /// The dialog's minimum allowable dimensions.
+       int minw_;
        ///
-       mutable int minh_;
+       int minh_;
+       /// Can the dialog be resized after it has been created?
+       bool allow_resize_;
 };
 
 
@@ -129,7 +133,7 @@ public:
 class FormBaseBI : public FormBaseDeprecated {
 protected:
        /// Constructor
-       FormBaseBI(LyXView *, Dialogs *, string const &);
+       FormBaseBI(LyXView *, Dialogs *, string const &, bool allowResize=true);
 
        /// Connect signals
        virtual void connect();
@@ -141,7 +145,7 @@ protected:
 class FormBaseBD : public FormBaseDeprecated {
 protected:
        /// Constructor
-       FormBaseBD(LyXView *, Dialogs *, string const &);
+       FormBaseBD(LyXView *, Dialogs *, string const &, bool allowResize=true);
 
        /// Connect signals
        virtual void connect();
@@ -151,7 +155,7 @@ protected:
        virtual void updateSlot(bool) { update(); }
 
        /// Update connection.
-       Connection u_;
+       SigC::Connection u_;
 };