From 05c16eb64901a7f09d2d2deea8f8f390f132a49b Mon Sep 17 00:00:00 2001
From: fluxgen <fluxgen>
Date: Tue, 29 Oct 2002 15:59:35 +0000
Subject: const fixes and function renaming for toolbar

---
 src/Slit.cc | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Slit.cc b/src/Slit.cc
index 4b04028..fe6711b 100644
--- a/src/Slit.cc
+++ b/src/Slit.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Slit.cc,v 1.22 2002/10/13 21:47:54 fluxgen Exp $
+// $Id: Slit.cc,v 1.23 2002/10/29 15:59:35 fluxgen Exp $
 
 //use GNU extensions
 #ifndef	 _GNU_SOURCE
@@ -635,14 +635,14 @@ void Slit::reposition() {
 		break;
 	}
 
-	Toolbar *tbar = screen->getToolbar();
+	const Toolbar * const tbar = screen->getToolbar();
 	int sw = frame.width + screen->getBorderWidth2x(),
 		sh = frame.height + screen->getBorderWidth2x(),
-		tw = tbar->getWidth() + screen->getBorderWidth(),
-		th = tbar->getHeight() + screen->getBorderWidth();
+		tw = tbar->width() + screen->getBorderWidth(),
+		th = tbar->height() + screen->getBorderWidth();
 
-	if (tbar->getX() < frame.x + sw && tbar->getX() + tw > frame.x &&
-			tbar->getY() < frame.y + sh && tbar->getY() + th > frame.y) {
+	if (tbar->x() < frame.x + sw && tbar->x() + tw > frame.x &&
+			tbar->y() < frame.y + sh && tbar->y() + th > frame.y) {
 		if (frame.y < th) {
 			frame.y += tbar->getExposedHeight();
 			if (screen->getSlitDirection() == VERTICAL)
-- 
cgit v0.11.2