Fixing old Dalos, and fixing Linux compilation.

4 files changed, 16 insertions, 14 deletions

diff --git a/include/widgets.h b/include/widgets.h
index e46a226..eb51051 100644
--- a/include/widgets.h
+++ b/include/widgets.h
@@ -17,7 +17,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* $Id: widgets.h,v 1.15 2006-02-01 18:32:25 pixel Exp $ */
+/* $Id: widgets.h,v 1.16 2006-02-02 11:01:13 pixel Exp $ */
 
 #ifndef __WIDGETS_H__
 #define __WIDGETS_H__
@@ -174,7 +174,7 @@ namespace mogltk {
         class Button : public widget {
           public:
               Button(action *, shape *, widget * father, int x, int y, int w, int h, const String & caption);
-              virtual ~Button();
+              virtual ~Button() throw (GeneralException);
             void simulate_press();
             action * cascade_action();
           protected:
@@ -192,6 +192,7 @@ namespace mogltk {
         class Label : public widget {
           public:
               Label(shape *, widget * father, int x, int y, int w, int h, const String & caption, const ColorP & color = BLACK, mogltk::font * = mogltk::SystemFont);
+	      virtual ~Label() throw (GeneralException) {}
           protected:
             virtual void draw();
           private:
@@ -228,7 +229,7 @@ namespace mogltk {
         class MsgBox : public SmartBox {
           public:
               MsgBox(action *, shape *, widget * father, const String & caption, const String & text, mogltk::font * = mogltk::SystemFont);
-              virtual ~MsgBox();
+              virtual ~MsgBox() throw (GeneralException);
           private:
             mogltk::font * msgbox_font;
         };
@@ -252,7 +253,7 @@ namespace mogltk {
         class ContextMenu : public widget {
           public:
               ContextMenu(shape *, widget * father, int x, int y);
-              virtual ~ContextMenu();
+              virtual ~ContextMenu() throw (GeneralException);
             void addnode(const String &, action *);
             void addline();
             void addsub(const String &, ContextMenu *);
@@ -303,6 +304,7 @@ namespace mogltk {
         class Menu : public widget {
           public:
               Menu(shape *, widget * father);
+	      virtual ~Menu() throw (GeneralException) {}
             void addnode(const String &, action *);
             void addsub(const String &, ContextMenu * sub);
             ContextMenu * createsub(const String &);
@@ -342,7 +344,7 @@ namespace mogltk {
         class InputText : public widget {
           public:
               InputText(action *, shape *, widget * father, int x, int y);
-              virtual ~InputText();
+              virtual ~InputText() throw (GeneralException);
             virtual void draw();
             const String & GetText() const;
             void SetText(const String &);
@@ -373,7 +375,7 @@ namespace mogltk {
         class InputDialog : public SmartBox {
           public:
               InputDialog(action *, shape *, widget * father, const String & caption, const String & text, mogltk::font * = mogltk::SystemFont);
-              virtual ~InputDialog();
+              virtual ~InputDialog() throw (GeneralException);
             String GetText();
           private:
             InputText * it;
diff --git a/lib/contextmenu.cc b/lib/contextmenu.cc
index 5b8309e..1c513cf 100644
--- a/lib/contextmenu.cc
+++ b/lib/contextmenu.cc
@@ -17,7 +17,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* $Id: contextmenu.cc,v 1.1 2005-12-02 16:21:59 pixel Exp $ */
+/* $Id: contextmenu.cc,v 1.2 2006-02-02 11:01:13 pixel Exp $ */
 
 #include <SDL.h>
 #include <vector>
@@ -81,7 +81,7 @@ int mogltk::widgets::ContextMenu::node::GetH() {
 mogltk::widgets::ContextMenu::ContextMenu(shape * sh, mogltk::widget * father, int x, int y) : widget(father, x, y, 8, 4, 1, "ContextMenu", sh), selected(-1), subselected(0), in_click(false), sticky(false) {
 }
 
-mogltk::widgets::ContextMenu::~ContextMenu() {
+mogltk::widgets::ContextMenu::~ContextMenu() throw (GeneralException) {
     std::vector<node>::iterator i;
     ContextMenu * sub;
 
diff --git a/lib/inputtext.cc b/lib/inputtext.cc
index a73a8cd..094f04b 100644
--- a/lib/inputtext.cc
+++ b/lib/inputtext.cc
@@ -17,7 +17,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* $Id: inputtext.cc,v 1.2 2006-01-31 17:02:39 pixel Exp $ */
+/* $Id: inputtext.cc,v 1.3 2006-02-02 11:01:13 pixel Exp $ */
 
 #include <SDL.h>
 #include <vector>
@@ -36,7 +36,7 @@ mogltk::widgets::InputText::InputText(mogltk::widgets::action * _a, shape * sh,
     set_timed_event(500);
 }
 
-mogltk::widgets::InputText::~InputText() {
+mogltk::widgets::InputText::~InputText() throw (GeneralException) {
     delete it_keyevent;
 }
 
@@ -130,7 +130,7 @@ mogltk::widgets::InputDialog::InputDialog(mogltk::widgets::action * a, shape * s
     set_exclusive(father);
 }
 
-mogltk::widgets::InputDialog::~InputDialog() {
+mogltk::widgets::InputDialog::~InputDialog() throw (GeneralException) {
     unset_exclusive(Father());
 }
 
diff --git a/lib/widgets.cc b/lib/widgets.cc
index 02b6d6f..2cc7295 100644
--- a/lib/widgets.cc
+++ b/lib/widgets.cc
@@ -17,7 +17,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* $Id: widgets.cc,v 1.18 2006-02-01 18:32:26 pixel Exp $ */
+/* $Id: widgets.cc,v 1.19 2006-02-02 11:01:13 pixel Exp $ */
 
 #include <SDL.h>
 #include <vector>
@@ -724,7 +724,7 @@ mogltk::widgets::Button::Button(action * _a, shape * sh, widget * father, int x,
     caption = _caption;
 }
 
-mogltk::widgets::Button::~Button() {
+mogltk::widgets::Button::~Button() throw (GeneralException) {
     if (cascade)
         delete cascade;
 }
@@ -859,7 +859,7 @@ mogltk::widgets::MsgBox::MsgBox(action * a, shape * sh, mogltk::widget * father,
     set_exclusive(father);
 }
 
-mogltk::widgets::MsgBox::~MsgBox() {
+mogltk::widgets::MsgBox::~MsgBox() throw (GeneralException) {
     unset_exclusive(Father());
 }