From 1ffae360041448a5ef0d977ba12f0d5aa8c530ec Mon Sep 17 00:00:00 2001
From: Maarten ter Huurne <maarten@treewalker.org>
Date: Wed, 14 Aug 2013 11:38:38 +0200
Subject: [PATCH] Made Surface argument to drawTopBar/drawBottomBar() mandatory

---
 src/gmenu2x.cpp | 4 ----
 src/gmenu2x.h   | 4 ++--
 src/linkapp.cpp | 2 +-
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/gmenu2x.cpp b/src/gmenu2x.cpp
index 31e1da0..5fa94e0 100644
--- a/src/gmenu2x.cpp
+++ b/src/gmenu2x.cpp
@@ -1208,8 +1208,6 @@ void GMenu2X::drawScrollBar(uint pageSize, uint totalSize, uint pagePos) {
 }
 
 void GMenu2X::drawTopBar(Surface *s) {
-	if (s==NULL) s = this->s;
-
 	Surface *bar = sc.skinRes("imgs/topbar.png", false);
 	if (bar != NULL)
 		bar->blit(s, 0, 0);
@@ -1219,8 +1217,6 @@ void GMenu2X::drawTopBar(Surface *s) {
 }
 
 void GMenu2X::drawBottomBar(Surface *s) {
-	if (s==NULL) s = this->s;
-
 	Surface *bar = sc.skinRes("imgs/bottombar.png", false);
 	if (bar != NULL)
 		bar->blit(s, 0, resY-bar->height());
diff --git a/src/gmenu2x.h b/src/gmenu2x.h
index 6464102..d597580 100644
--- a/src/gmenu2x.h
+++ b/src/gmenu2x.h
@@ -192,8 +192,8 @@ public:
 	int drawButtonRight(Surface *s, const std::string &btn, const std::string &text, int x=5, int y=-10);
 	void drawScrollBar(uint pageSize, uint totalSize, uint pagePos);
 
-	void drawTopBar(Surface *s=NULL);
-	void drawBottomBar(Surface *s=NULL);
+	void drawTopBar(Surface *s);
+	void drawBottomBar(Surface *s);
 };
 
 #endif // GMENU2X_H
diff --git a/src/linkapp.cpp b/src/linkapp.cpp
index a2a107d..78a5644 100644
--- a/src/linkapp.cpp
+++ b/src/linkapp.cpp
@@ -466,7 +466,7 @@ void LinkApp::showManual() {
 				bg->blit(gmenu2x->s, 0, 0);
 				pngman->blit(gmenu2x->s, -page*320, 0);
 
-				gmenu2x->drawBottomBar();
+				gmenu2x->drawBottomBar(gmenu2x->s);
 				gmenu2x->drawButton(gmenu2x->s, "start", gmenu2x->tr["Exit"],
 				gmenu2x->drawButton(gmenu2x->s, "cancel", "",
 				gmenu2x->drawButton(gmenu2x->s, "right", gmenu2x->tr["Change page"],