Miscellaneous other fixes

diff --git a/Build b/Build
index 090f15ceff5b98083d8f91a37e0d38ddc449175e..a06c7622155f02a802d86ddccd9e42701aeffd54 100644 (file)
--- 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 8ff4d8ca2fd091af94408d9edf0f2671b03a0633..4f85964d9d2c45e28aa90bae843237d92d657d47 100644 (file)
--- 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 e929940f46655d97e98af351bece30151b0e7317..643331602b16069863d03e905bb17f455a12f695 100644 (file)
--- 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"