From: Mikko Rasa <tdb@tdb.fi>
Date: Wed, 21 Nov 2012 15:58:11 +0000 (+0200)
Subject: Miscellaneous other fixes
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=411a387be30f4fc25e0ce8924fb115b5863356f1;p=libs%2Fgltk.git

Miscellaneous other fixes
---

diff --git a/Build b/Build
index 090f15c..a06c762 100644
--- a/Build
+++ b/Build
@@ -6,6 +6,7 @@ package "mspgltk"
 	require "mspgl";
 	require "mspgui";
 	require "mspcore";
+	require "mspdatafile";
 
 	headers "msp/gltk"
 	{
diff --git a/helloworld.cpp b/helloworld.cpp
index 8ff4d8c..4f85964 100644
--- a/helloworld.cpp
+++ b/helloworld.cpp
@@ -4,7 +4,7 @@ Demonstrates some of the most common widget types.
 */
 
 #include <msp/core/application.h>
-#include <msp/gbase/simplewindow.h>
+#include <msp/graphics/simplewindow.h>
 #include <msp/gl/blend.h>
 #include <msp/gl/matrix.h>
 #include <msp/gltk/button.h>
@@ -17,7 +17,7 @@ Demonstrates some of the most common widget types.
 using namespace Msp;
 
 // Application class.  Because it's so much nicer than global variables.
-class HelloWorld: public Msp::Application
+class HelloWorld: public Msp::RegisteredApplication<HelloWorld>
 {
 private:
 	// An OpenGL window to display our widgets in
@@ -29,9 +29,6 @@ private:
 	GLtk::Entry *ent_name;
 	GLtk::Label *lbl_hello;
 
-	// Indicate our main class to the core library
-	static Application::RegApp<HelloWorld> reg;
-
 public:
 	HelloWorld(int, char **);
 private:
@@ -40,8 +37,6 @@ private:
 };
 
 
-Application::RegApp<HelloWorld> HelloWorld::reg;
-
 HelloWorld::HelloWorld(int, char **):
 	wnd(200, 200),
 	// Load resources.  This must be done before the root widget is created.
diff --git a/source/widget.cpp b/source/widget.cpp
index e929940..6433316 100644
--- a/source/widget.cpp
+++ b/source/widget.cpp
@@ -1,7 +1,7 @@
 #include <msp/gl/immediate.h>
 #include <msp/gl/matrix.h>
 #include <msp/gl/transform.h>
-#include <msp/strings/formatter.h>
+#include <msp/strings/format.h>
 #include "container.h"
 #include "resources.h"
 #include "root.h"