Ported trunk over to Guichan 0.8.0. Based on merge from 0.0 branch, but because

of quite a bit of GUI differences there were additional changes and probably
additional issues. You have been warned. ;)

Merged revisions 4045-4049,4051-4059 via svnmerge from
https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/branches/0.0

........
  r4045 | b_lindeijer | 2008-04-07 17:23:07 +0200 (Mon, 07 Apr 2008) | 3 lines

  Upgraded to Guichan 0.8.0 (merge from guichan-0.8 branch, except for
  gcn::TabbedArea usage)
........
  r4059 | b_lindeijer | 2008-04-09 16:25:42 +0200 (Wed, 09 Apr 2008) | 2 lines

  Fixed problem with row height in shop list box.
........

1 files changed, 12 insertions, 12 deletions

diff --git a/src/gui/scrollarea.cpp b/src/gui/scrollarea.cpp
index cf555ef4..97384fa3 100644
--- a/src/gui/scrollarea.cpp
+++ b/src/gui/scrollarea.cpp
@@ -153,12 +153,12 @@ void ScrollArea::logic()
         if (getHorizontalScrollPolicy() == gcn::ScrollArea::SHOW_NEVER)
         {
             content->setWidth(getChildrenArea().width -
-                    2 * content->getBorderSize());
+                    2 * content->getFrameSize());
         }
         if (getVerticalScrollPolicy() == gcn::ScrollArea::SHOW_NEVER)
         {
             content->setHeight(getChildrenArea().height -
-                    2 * content->getBorderSize());
+                    2 * content->getFrameSize());
         }
     }
 }
@@ -204,15 +204,15 @@ void ScrollArea::draw(gcn::Graphics *graphics)
     {
         graphics->pushClipArea(getChildrenArea());
 
-        if (content->getBorderSize() > 0)
+        if (content->getFrameSize() > 0)
         {
             gcn::Rectangle rec = content->getDimension();
-            rec.x -= content->getBorderSize();
-            rec.y -= content->getBorderSize();
-            rec.width += 2 * content->getBorderSize();
-            rec.height += 2 * content->getBorderSize();
+            rec.x -= content->getFrameSize();
+            rec.y -= content->getFrameSize();
+            rec.width += 2 * content->getFrameSize();
+            rec.height += 2 * content->getFrameSize();
             graphics->pushClipArea(rec);
-            content->drawBorder(graphics);
+            content->drawFrame(graphics);
             graphics->popClipArea();
         }
 
@@ -223,9 +223,9 @@ void ScrollArea::draw(gcn::Graphics *graphics)
     }
 }
 
-void ScrollArea::drawBorder(gcn::Graphics *graphics)
+void ScrollArea::drawFrame(gcn::Graphics *graphics)
 {
-    int bs = getBorderSize();
+    int bs = getFrameSize();
     int w = getWidth() + bs * 2;
     int h = getHeight() + bs * 2;
 
@@ -240,10 +240,10 @@ void ScrollArea::setOpaque(bool opaque)
     mOpaque = opaque;
 
     if (mOpaque) {
-        setBorderSize(2);
+        setFrameSize(2);
     }
     else {
-        setBorderSize(0);
+        setFrameSize(0);
     }
 }