|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r48706 - in sandbox/guigl: boost/guigl/widget libs/guigl/build libs/guigl/build/xcodeide/guigl.xcodeproj libs/guigl/src/widget
From: stipe_at_[hidden]
Date: 2008-09-10 16:38:13
Author: srajko
Date: 2008-09-10 16:38:13 EDT (Wed, 10 Sep 2008)
New Revision: 48706
URL: http://svn.boost.org/trac/boost/changeset/48706
Log:
added compound widget
Added:
sandbox/guigl/boost/guigl/widget/compound.hpp (contents, props changed)
sandbox/guigl/libs/guigl/src/widget/compound.cpp (contents, props changed)
Text files modified:
sandbox/guigl/libs/guigl/build/Jamfile | 4 +---
sandbox/guigl/libs/guigl/build/xcodeide/guigl.xcodeproj/project.pbxproj | 4 ++++
2 files changed, 5 insertions(+), 3 deletions(-)
Added: sandbox/guigl/boost/guigl/widget/compound.hpp
==============================================================================
--- (empty file)
+++ sandbox/guigl/boost/guigl/widget/compound.hpp 2008-09-10 16:38:13 EDT (Wed, 10 Sep 2008)
@@ -0,0 +1,41 @@
+/*=================================---------------------------------------------
+ Copyright 2008 Stjepan Rajko
+
+ Distributed under the Boost Software License, Version 1.0.
+ (See accompanying file LICENSE_1_0.txt or copy at
+ http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------===============================*/
+
+#ifndef BOOST__GUIGL__WIDGET__COMPOUND_HPP
+#define BOOST__GUIGL__WIDGET__COMPOUND_HPP
+
+#include <boost/guigl/view/compound.hpp>
+#include <boost/guigl/view/positioned.hpp>
+#include <boost/guigl/view/solid_background.hpp>
+
+namespace boost { namespace guigl { namespace widget {
+
+typedef
+ view::compound<
+ view::solid_background<
+ view::positioned<>
+ > > compound_base_type;
+
+/// A button which sends a signal when clicked.
+class compound : public compound_base_type
+{
+public:
+ typedef compound_base_type base_type;
+
+ template<typename ArgumentPack>
+ compound(const ArgumentPack &args)
+ : base_type(args)
+ {}
+
+protected:
+ void draw();
+};
+
+}}}
+
+#endif // BOOST__GUIGL__WIDGET__COMPOUND_HPP
\ No newline at end of file
Modified: sandbox/guigl/libs/guigl/build/Jamfile
==============================================================================
--- sandbox/guigl/libs/guigl/build/Jamfile (original)
+++ sandbox/guigl/libs/guigl/build/Jamfile 2008-09-10 16:38:13 EDT (Wed, 10 Sep 2008)
@@ -17,11 +17,9 @@
SOURCES =
window application
- widget/button widget/labeled_button widget/slider ;
-# view/positioned view/compound view/solid_background ;
+ widget/button widget/labeled_button widget/slider widget/compound ;
lib boost_guigl
: $(SOURCES).cpp
[ obj widget_window_obj : widget/window.cpp ]
-# [ obj view_window_obj : view/window.cpp ]
;
Modified: sandbox/guigl/libs/guigl/build/xcodeide/guigl.xcodeproj/project.pbxproj
==============================================================================
--- sandbox/guigl/libs/guigl/build/xcodeide/guigl.xcodeproj/project.pbxproj (original)
+++ sandbox/guigl/libs/guigl/build/xcodeide/guigl.xcodeproj/project.pbxproj 2008-09-10 16:38:13 EDT (Wed, 10 Sep 2008)
@@ -128,6 +128,8 @@
0897912F0E5DBB0F00C79062 /* labeled_button.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = labeled_button.hpp; sourceTree = "<group>"; };
0897913B0E5DBC1000C79062 /* glut.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = glut.hpp; sourceTree = "<group>"; };
089791BA0E5DC06400C79062 /* event.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = event.hpp; sourceTree = "<group>"; };
+ 089926680E7865B500285958 /* compound.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = compound.hpp; sourceTree = "<group>"; };
+ 0899266B0E78664900285958 /* compound.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = compound.cpp; sourceTree = "<group>"; };
08998DDF0E528C1F00F583A2 /* window.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = window.hpp; sourceTree = "<group>"; };
089B15050E5302870033B2D8 /* test_field_map.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = test_field_map.cpp; sourceTree = "<group>"; };
089B15410E5304660033B2D8 /* types.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = types.hpp; sourceTree = "<group>"; };
@@ -228,6 +230,7 @@
08978E1F0E5D9E1900C79062 /* window.cpp */,
081B06720E5FD90300EF7F91 /* labeled_button.cpp */,
081B07890E5FF8D100EF7F91 /* slider.cpp */,
+ 0899266B0E78664900285958 /* compound.cpp */,
);
path = widget;
sourceTree = "<group>";
@@ -269,6 +272,7 @@
08978E0C0E5D9C2200C79062 /* window.hpp */,
0897912F0E5DBB0F00C79062 /* labeled_button.hpp */,
081B076E0E5FF2DC00EF7F91 /* slider.hpp */,
+ 089926680E7865B500285958 /* compound.hpp */,
);
path = widget;
sourceTree = "<group>";
Added: sandbox/guigl/libs/guigl/src/widget/compound.cpp
==============================================================================
--- (empty file)
+++ sandbox/guigl/libs/guigl/src/widget/compound.cpp 2008-09-10 16:38:13 EDT (Wed, 10 Sep 2008)
@@ -0,0 +1,22 @@
+/*=================================---------------------------------------------
+ Copyright 2008 Stjepan Rajko
+
+ Distributed under the Boost Software License, Version 1.0.
+ (See accompanying file LICENSE_1_0.txt or copy at
+ http://www.boost.org/LICENSE_1_0.txt)
+-----------------------------------------------===============================*/
+
+#include <boost/guigl/widget/compound.hpp>
+#include <boost/guigl/view/impl/compound.hpp>
+#include <boost/guigl/view/impl/positioned.hpp>
+#include <boost/guigl/view/impl/solid_background.hpp>
+
+namespace boost { namespace guigl { namespace widget {
+
+void compound::draw()
+{
+ draw_prologue();
+ draw_epilogue();
+}
+
+}}}
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk