Move gui::Colour into its own file
authorNick Gasson <nick@nickg.me.uk>
Mon, 17 Aug 2009 18:28:49 +0000 (19:28 +0100)
committerNick Gasson <nick@nickg.me.uk>
Mon, 17 Aug 2009 18:28:49 +0000 (19:28 +0100)
include/gui/Colour.hpp [new file with mode: 0644]
include/gui/IControl.hpp
src/Editor.cpp

diff --git a/include/gui/Colour.hpp b/include/gui/Colour.hpp
new file mode 100644 (file)
index 0000000..ec87f2a
--- /dev/null
@@ -0,0 +1,32 @@
+//
+//  Copyright (C) 2006-2009  Nick Gasson
+//
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+#ifndef INC_GUI_COLOUR_HPP
+#define INC_GUI_COLOUR_HPP
+
+#include "Platform.hpp"
+
+namespace gui {
+   typedef tuple<float, float, float> Colour;
+
+   inline Colour makeColour(float r, float g, float b)
+   {
+      return make_tuple(r, g, b);
+   }
+}
+
+#endif
index 66ffac1c4a201b975b2f54fba3bffb7269fa4a78..471d0ed7eb3d020158985d28069dc624cb643c83 100644 (file)
@@ -20,6 +20,7 @@
 
 #include "Platform.hpp"
 #include "IFont.hpp"
+#include "Colour.hpp"
 
 #include <string>
 
@@ -27,8 +28,6 @@
 
 namespace gui {
 
-   typedef std::tr1::tuple<float, float, float> Colour;
-
    // Interface to any UI control
    struct IControl {
       virtual ~IControl() {}
index 1c449a23745d50c63714b49b86e90987c5fba659..e841cbb1bf037be17c4cb4c5ce542b004123e757 100644 (file)
@@ -183,10 +183,10 @@ void addEditorGUI()
    theModelViewer = new ModelViewer(0, 40, panelW, 200);
 
    theBldPrevButton = new Fl_Button(0, 240, 60, 25, "Prev");
-   theBldRotateButton->callback(onBldPrevClick);
+   theBldPrevButton->callback(onBldPrevClick);
    
    theBldNextButton = new Fl_Button(60, 240, 60, 25, "Next");
-   theBldRotateButton->callback(onBldNextClick);
+   theBldNextButton->callback(onBldNextClick);
    
    theBldRotateButton = new Fl_Button(120, 240, 60, 25, "Rotate");
    theBldRotateButton->callback(onBldRotateClick);