From 32e422327c81721d1b3adf4e661b46b0a493e47f Mon Sep 17 00:00:00 2001
From: "simon.kagstrom" <simon.kagstrom@feb19cf6-d755-11dd-8179-53c65a4d6d95>
Date: Sun, 6 Dec 2009 09:17:21 +0000
Subject: [PATCH] Rename

---
 Makefile                      | 5 ++---
 gui.cpp                       | 7 +++++--
 main_menu.hh => main_menu.cpp | 0
 3 files changed, 7 insertions(+), 5 deletions(-)
 rename main_menu.hh => main_menu.cpp (100%)

diff --git a/Makefile b/Makefile
index 7524443..f07b7de 100644
--- a/Makefile
+++ b/Makefile
@@ -7,9 +7,8 @@ all: menu
 
 menu.oo: menu.cpp menu.hh utils.hh font.hh Makefile
 
-gui.oo: gui.cpp gui.hh font.hh menu.hh \
-	sdl_ttf_font.hh dialogue_box.hh help_box.hh main_menu.hh \
-	Makefile
+gui.oo: Makefile gui.cpp gui.hh font.hh menu.hh sdl_ttf_font.hh \
+	dialogue_box.hh help_box.hh main_menu.cpp
 
 utils.oo: utils.cpp utils.hh Makefile
 
diff --git a/gui.cpp b/gui.cpp
index 803c7aa..c9b36ee 100644
--- a/gui.cpp
+++ b/gui.cpp
@@ -7,12 +7,13 @@
 #include "help_box.hh"
 #include "dialogue_box.hh"
 #include "sdl_ttf_font.hh"
-#include "main_menu.hh"
 #include "utils.hh"
 
 extern SDL_Surface *screen;
 
 class Gui;
+class MainMenu;
+class MainView;
 
 static const char *get_theme_path(const char *dir, const char *what)
 {
@@ -25,6 +26,9 @@ static const char *get_theme_path(const char *dir, const char *what)
 	return buf;
 }
 
+/* These are a bit of special cases... */
+#include "main_menu.cpp"
+
 Gui::Gui()
 {
 	this->focus = NULL;
@@ -112,7 +116,6 @@ void Gui::runLogic(void)
 	cur_view->runLogic();
 }
 
-
 void Gui::pushView(GuiView *view)
 {
 	int cur = this->n_views;
diff --git a/main_menu.hh b/main_menu.cpp
similarity index 100%
rename from main_menu.hh
rename to main_menu.cpp