Fixing old Dalos, and fixing Linux compilation.

1 files changed, 4 insertions, 4 deletions

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;