From d05884755c37c131b610c6ce1aef2201d99a10f5 Mon Sep 17 00:00:00 2001
From: pixel <pixel>
Date: Thu, 2 Feb 2006 11:01:12 +0000
Subject: Fixing old Dalos, and fixing Linux compilation.

---
 Dalos/Console.cc | 4 ++--
 Dalos/Console.h  | 6 +++---
 Dalos/Dalos.cc   | 6 +++---
 Dalos/Hexview.cc | 8 ++++----
 Dalos/Hexview.h  | 4 ++--
 5 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'Dalos')

diff --git a/Dalos/Console.cc b/Dalos/Console.cc
index b15c4bf..972349f 100644
--- a/Dalos/Console.cc
+++ b/Dalos/Console.cc
@@ -17,7 +17,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
  */
 
-/* $Id: Console.cc,v 1.6 2005-12-01 13:15:16 pixel Exp $ */
+/* $Id: Console.cc,v 1.7 2006-02-02 11:01:12 pixel Exp $ */
 
 #include <SDL.h>
 #include <SDL_thread.h>
@@ -218,7 +218,7 @@ console::console(mogltk::shape * sh, mogltk::widget * father, int y, int _nlines
     SetVisible(false);
 }
 
-console::~console() {
+console::~console() throw (GeneralException) {
     SDL_DestroyMutex(protect_add_line);
 }
 
diff --git a/Dalos/Console.h b/Dalos/Console.h
index df66e09..e818aba 100644
--- a/Dalos/Console.h
+++ b/Dalos/Console.h
@@ -17,13 +17,13 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
  */
 
-/* $Id: Console.h,v 1.5 2005-11-05 14:36:11 pixel Exp $ */
+/* $Id: Console.h,v 1.6 2006-02-02 11:01:12 pixel Exp $ */
 
 #ifndef __CONSOLE_H__
 #define __CONSOLE_H__
 
 #include <SDL.h>
-#include <SDL_Thread.h>
+#include <SDL_thread.h>
 
 #include <Buffer.h>
 
@@ -38,7 +38,7 @@ class console : public mogltk::widget {
         virtual void up(SDL_keysym k);
     };
       console(mogltk::shape * sh, mogltk::widget * father, int y, int _nlines);
-      virtual ~console();
+      virtual ~console() throw (GeneralException);
     void add_line(const String & s);
     void page_reset();
     void page_up();
diff --git a/Dalos/Dalos.cc b/Dalos/Dalos.cc
index df2a5a6..673e7a4 100644
--- a/Dalos/Dalos.cc
+++ b/Dalos/Dalos.cc
@@ -17,7 +17,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
  */
 
-/* $Id: Dalos.cc,v 1.22 2006-01-31 17:02:38 pixel Exp $ */
+/* $Id: Dalos.cc,v 1.23 2006-02-02 11:01:12 pixel Exp $ */
 
 #include <SDL.h>
 #include <SDL_thread.h>
@@ -287,7 +287,7 @@ class quit : public mogltk::widgets::action {
 class about : public mogltk::widgets::action {
   public:
     virtual void do_action(mogltk::widget * w) {
-        new mogltk::widgets::MsgBox(w->Shaper(), w->Father(), "About...",
+        new mogltk::widgets::MsgBox(0, w->Shaper(), w->Father(), "About...",
             "Dalos version 0.1 - OpenGL version\n"
             "Copyright (C) 2004-2005 Nicolas \"Pixel\" Noble\n"
             "\n"
@@ -311,7 +311,7 @@ virtual int startup() throw (GeneralException) {
     }
     
     mogltk::widgets::ContextMenu * c;
-#ifdef _DEBUG
+#if 1
     mogltk::base * gl = new mogltk::glbase();
 #else
     mogltk::base * gl = new mogltk::glbase(800, 600, SDL_FULLSCREEN);
diff --git a/Dalos/Hexview.cc b/Dalos/Hexview.cc
index b5f43ae..bc45d9d 100644
--- a/Dalos/Hexview.cc
+++ b/Dalos/Hexview.cc
@@ -17,7 +17,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
  */
 
-/* $Id: Hexview.cc,v 1.4 2005-11-05 14:36:11 pixel Exp $ */
+/* $Id: Hexview.cc,v 1.5 2006-02-02 11:01:12 pixel Exp $ */
 
 #include <SDL.h>
 
@@ -86,7 +86,7 @@ hexview::hexview(mogltk::shape * sh, mogltk::widget * father) :
     nlines = GetH() / 13; CurrentHexview = this;
 }
 
-hexview::~hexview() {
+hexview::~hexview() throw (GeneralException) {
     free(data);
     CurrentHexview = 0;
 }
@@ -178,7 +178,7 @@ void hexview::draw() {
     mogltk::FixedFont->setcolor(WHITE);
     mogltk::FixedFont->putcursor(GetAX() - shift * 6, GetAY());
 
-    max_o = min(h->GetSize(), offset + nlines * width);
+    max_o = MIN(h->GetSize(), offset + nlines * width);
 
     for (i = start_o = offset, j = 0, l = 0; i < max_o; i++) {
         if ((j % width) == 0) {
@@ -205,4 +205,4 @@ void hexview::resize_notify() {
     resize(Father()->GetW(), Father()->GetH());
 }
 
-hexview * CurrentHexview;
\ No newline at end of file
+hexview * CurrentHexview;
diff --git a/Dalos/Hexview.h b/Dalos/Hexview.h
index ea7209c..4bee1f8 100644
--- a/Dalos/Hexview.h
+++ b/Dalos/Hexview.h
@@ -17,7 +17,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
  */
 
-/* $Id: Hexview.h,v 1.4 2005-11-05 14:36:11 pixel Exp $ */
+/* $Id: Hexview.h,v 1.5 2006-02-02 11:01:12 pixel Exp $ */
 
 #ifndef __HEXVIEW_H__
 #define __HEXVIEW_H__
@@ -33,7 +33,7 @@ class hexview : public mogltk::widget {
         virtual void up(SDL_keysym k);
     };
       hexview(mogltk::shape * sh, mogltk::widget * father);
-      virtual ~hexview();
+      virtual ~hexview() throw (GeneralException);
     void set_virtual_base(int _virtual_base);
     int get_nlines();
     int get_size();
-- 
cgit v1.2.3