|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r49062 - in sandbox/guigl: boost/guigl boost/guigl/platform boost/guigl/view boost/guigl/view/impl boost/guigl/widget boost/parameter/aux_ libs/guigl/build libs/guigl/build/vc8ide libs/guigl/example libs/guigl/src libs/guigl/src/widget
From: stipe_at_[hidden]
Date: 2008-09-29 20:15:02
Author: srajko
Date: 2008-09-29 20:14:58 EDT (Mon, 29 Sep 2008)
New Revision: 49062
URL: http://svn.boost.org/trac/boost/changeset/49062
Log:
guigl example works on windows
Text files modified:
sandbox/guigl/boost/guigl/access.hpp | 10 +++---
sandbox/guigl/boost/guigl/platform/glu.hpp | 11 ++++++
sandbox/guigl/boost/guigl/platform/glut.hpp | 8 +++++
sandbox/guigl/boost/guigl/platform/opengl.hpp | 15 ++++++++
sandbox/guigl/boost/guigl/view/clickable.hpp | 4 ++
sandbox/guigl/boost/guigl/view/colored.hpp | 4 ++
sandbox/guigl/boost/guigl/view/compound.hpp | 3 +
sandbox/guigl/boost/guigl/view/draggable.hpp | 4 ++
sandbox/guigl/boost/guigl/view/impl/labeled.hpp | 2
sandbox/guigl/boost/guigl/view/impl/navigable.hpp | 2
sandbox/guigl/boost/guigl/view/labeled.hpp | 4 ++
sandbox/guigl/boost/guigl/view/mouse_tracking.hpp | 3 +
sandbox/guigl/boost/guigl/view/periodic.hpp | 2
sandbox/guigl/boost/guigl/view/positioned.hpp | 5 +++
sandbox/guigl/boost/guigl/view/static_compound.hpp | 6 +-
sandbox/guigl/boost/guigl/widget/button.hpp | 5 +-
sandbox/guigl/boost/guigl/widget/compound.hpp | 1
sandbox/guigl/boost/guigl/widget/label.hpp | 2 +
sandbox/guigl/boost/guigl/widget/labeled_button.hpp | 6 +++
sandbox/guigl/boost/guigl/widget/labeled_slider.hpp | 1
sandbox/guigl/boost/guigl/widget/slider.hpp | 3 +
sandbox/guigl/boost/guigl/widget/window.hpp | 4 +
sandbox/guigl/boost/parameter/aux_/typed_tagged_argument.hpp | 7 ---
sandbox/guigl/libs/guigl/build/Jamfile | 2 +
sandbox/guigl/libs/guigl/build/vc8ide/build.vcproj | 50 +++++++++++++++++++++----------
sandbox/guigl/libs/guigl/build/vc8ide/doc.vcproj | 63 +++++++++++++++++++--------------------
sandbox/guigl/libs/guigl/build/vc8ide/example.vcproj | 42 ++++++++++++-------------
sandbox/guigl/libs/guigl/build/vc8ide/guigl.sln | 42 +++++++++++++-------------
sandbox/guigl/libs/guigl/build/vc8ide/test.vcproj | 42 ++++++++++++-------------
sandbox/guigl/libs/guigl/example/two_buttons.cpp | 7 +++
sandbox/guigl/libs/guigl/example/two_buttons.hpp | 1
sandbox/guigl/libs/guigl/example/two_spheres.cpp | 5 +++
sandbox/guigl/libs/guigl/example/two_spheres.hpp | 2 +
sandbox/guigl/libs/guigl/example/window_example.cpp | 4 +-
sandbox/guigl/libs/guigl/src/widget/button.cpp | 5 +++
sandbox/guigl/libs/guigl/src/widget/compound.cpp | 5 +++
sandbox/guigl/libs/guigl/src/widget/label.cpp | 5 +++
sandbox/guigl/libs/guigl/src/widget/labeled_button.cpp | 5 +++
sandbox/guigl/libs/guigl/src/widget/labeled_slider.cpp | 5 +++
sandbox/guigl/libs/guigl/src/widget/slider.cpp | 7 +++
sandbox/guigl/libs/guigl/src/widget/window.cpp | 9 +----
sandbox/guigl/libs/guigl/src/window.cpp | 2
42 files changed, 266 insertions(+), 149 deletions(-)
Modified: sandbox/guigl/boost/guigl/access.hpp
==============================================================================
--- sandbox/guigl/boost/guigl/access.hpp (original)
+++ sandbox/guigl/boost/guigl/access.hpp 2008-09-29 20:14:58 EDT (Mon, 29 Sep 2008)
@@ -26,16 +26,16 @@
namespace detail {
template<typename BaseView>
- class compound_event_visitor;
+ struct compound_event_visitor;
template<typename ChildrenSequence, typename BaseView>
- class static_compound_event_visitor;
+ struct static_compound_event_visitor;
}
}
-struct access
+class access
{
private:
template<typename T>
@@ -60,12 +60,12 @@
template<typename BaseType>
friend class view::compound;
template<typename BaseType>
- friend class view::detail::compound_event_visitor;
+ friend struct view::detail::compound_event_visitor;
template<typename ChildrenSequence, typename BaseView>
friend class view::static_compound;
template<typename ChildrenSequence, typename BaseType>
- friend class view::detail::static_compound_event_visitor;
+ friend struct view::detail::static_compound_event_visitor;
};
}}
Modified: sandbox/guigl/boost/guigl/platform/glu.hpp
==============================================================================
--- sandbox/guigl/boost/guigl/platform/glu.hpp (original)
+++ sandbox/guigl/boost/guigl/platform/glu.hpp 2008-09-29 20:14:58 EDT (Mon, 29 Sep 2008)
@@ -6,4 +6,13 @@
http://www.boost.org/LICENSE_1_0.txt)
-----------------------------------------------===============================*/
-#include <OpenGL/glu.h>
\ No newline at end of file
+#ifdef __APPLE__
+
+#include <OpenGL/glu.h>
+
+#else
+
+#include <GL/glu.h>
+
+#endif
+
Modified: sandbox/guigl/boost/guigl/platform/glut.hpp
==============================================================================
--- sandbox/guigl/boost/guigl/platform/glut.hpp (original)
+++ sandbox/guigl/boost/guigl/platform/glut.hpp 2008-09-29 20:14:58 EDT (Mon, 29 Sep 2008)
@@ -6,4 +6,12 @@
http://www.boost.org/LICENSE_1_0.txt)
-----------------------------------------------===============================*/
+#ifdef __APPLE__
+
#include <GLUT/glut.h>
+
+#else
+
+#include <GL/glut.h>
+
+#endif
\ No newline at end of file
Modified: sandbox/guigl/boost/guigl/platform/opengl.hpp
==============================================================================
--- sandbox/guigl/boost/guigl/platform/opengl.hpp (original)
+++ sandbox/guigl/boost/guigl/platform/opengl.hpp 2008-09-29 20:14:58 EDT (Mon, 29 Sep 2008)
@@ -6,4 +6,17 @@
http://www.boost.org/LICENSE_1_0.txt)
-----------------------------------------------===============================*/
-#include <OpenGL/gl.h>
\ No newline at end of file
+#ifdef __APPLE__
+
+#include <OpenGL/gl.h>
+
+#else
+
+#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32)
+#include "windows.h"
+#endif
+
+#include <GL/gl.h>
+
+#endif
+
Modified: sandbox/guigl/boost/guigl/view/clickable.hpp
==============================================================================
--- sandbox/guigl/boost/guigl/view/clickable.hpp (original)
+++ sandbox/guigl/boost/guigl/view/clickable.hpp 2008-09-29 20:14:58 EDT (Mon, 29 Sep 2008)
@@ -35,6 +35,10 @@
: base_type(args)
, m_button_down(false)
{}
+ clickable(const clickable &rhs)
+ : base_type(static_cast<const base_type &>(rhs))
+ , m_button_down(false)
+ {}
protected:
bool on_event(const event_type &event_info);
Modified: sandbox/guigl/boost/guigl/view/colored.hpp
==============================================================================
--- sandbox/guigl/boost/guigl/view/colored.hpp (original)
+++ sandbox/guigl/boost/guigl/view/colored.hpp 2008-09-29 20:14:58 EDT (Mon, 29 Sep 2008)
@@ -23,6 +23,10 @@
: base_type(args)
, m_color(args[_color])
{}
+ colored(const colored &rhs)
+ : base_type(static_cast<const base_type &>(rhs))
+ , m_color(rhs.m_color)
+ {}
const color_type &color() const
{ return m_color; }
Modified: sandbox/guigl/boost/guigl/view/compound.hpp
==============================================================================
--- sandbox/guigl/boost/guigl/view/compound.hpp (original)
+++ sandbox/guigl/boost/guigl/view/compound.hpp 2008-09-29 20:14:58 EDT (Mon, 29 Sep 2008)
@@ -31,6 +31,9 @@
compound(const ArgumentPack &args)
: base_type(( args, _children=0 ))
{}
+ compound(const compound &rhs)
+ : base_type(static_cast<const base_type &>(rhs))
+ {}
compound & operator << (positioned<> *v)
{
Modified: sandbox/guigl/boost/guigl/view/draggable.hpp
==============================================================================
--- sandbox/guigl/boost/guigl/view/draggable.hpp (original)
+++ sandbox/guigl/boost/guigl/view/draggable.hpp 2008-09-29 20:14:58 EDT (Mon, 29 Sep 2008)
@@ -36,6 +36,10 @@
: base_type(args)
, m_dragging(false)
{}
+ draggable(const draggable &rhs)
+ : base_type(static_cast<const base_type &>(rhs))
+ , m_dragging(false)
+ {}
protected:
bool on_event(const event_type &event_info);
Modified: sandbox/guigl/boost/guigl/view/impl/labeled.hpp
==============================================================================
--- sandbox/guigl/boost/guigl/view/impl/labeled.hpp (original)
+++ sandbox/guigl/boost/guigl/view/impl/labeled.hpp 2008-09-29 20:14:58 EDT (Mon, 29 Sep 2008)
@@ -21,7 +21,7 @@
{
BaseView::draw_prologue();
- glRasterPos3f((BaseView::size().x - 9*m_label.size())/2, BaseView::size().y-(BaseView::size().y-15)/2, 0);
+ glRasterPos3d((BaseView::size().x - 9*m_label.size())/2, BaseView::size().y-(BaseView::size().y-15)/2, 0);
for (std::string::const_iterator it=m_label.begin(); it!=m_label.end(); it++)
glutBitmapCharacter(GLUT_BITMAP_9_BY_15, *it);
}
Modified: sandbox/guigl/boost/guigl/view/impl/navigable.hpp
==============================================================================
--- sandbox/guigl/boost/guigl/view/impl/navigable.hpp (original)
+++ sandbox/guigl/boost/guigl/view/impl/navigable.hpp 2008-09-29 20:14:58 EDT (Mon, 29 Sep 2008)
@@ -23,7 +23,7 @@
glPushMatrix();
glRotated(m_angle.x, 0, 1, 0);
glRotated(m_angle.y, 1, 0, 0);
- glTranslatef(0, 0, -m_distance);
+ glTranslated(0, 0, -m_distance);
}
template<typename BaseView>
Modified: sandbox/guigl/boost/guigl/view/labeled.hpp
==============================================================================
--- sandbox/guigl/boost/guigl/view/labeled.hpp (original)
+++ sandbox/guigl/boost/guigl/view/labeled.hpp 2008-09-29 20:14:58 EDT (Mon, 29 Sep 2008)
@@ -24,6 +24,10 @@
: base_type(args)
, m_label(args[_label])
{}
+ labeled(const labeled &rhs)
+ : base_type(static_cast<const base_type &>(rhs))
+ , m_label(rhs.m_label)
+ {}
const std::string &label() const
{ return m_label; }
Modified: sandbox/guigl/boost/guigl/view/mouse_tracking.hpp
==============================================================================
--- sandbox/guigl/boost/guigl/view/mouse_tracking.hpp (original)
+++ sandbox/guigl/boost/guigl/view/mouse_tracking.hpp 2008-09-29 20:14:58 EDT (Mon, 29 Sep 2008)
@@ -43,6 +43,9 @@
mouse_tracking(const ArgumentPack &args)
: base_type(args)
{}
+ mouse_tracking(const mouse_tracking &rhs)
+ : base_type(static_cast<const base_type &>(rhs))
+ {}
const guigl::mouse_state &mouse_state() const
{ return m_mouse_state; }
Modified: sandbox/guigl/boost/guigl/view/periodic.hpp
==============================================================================
--- sandbox/guigl/boost/guigl/view/periodic.hpp (original)
+++ sandbox/guigl/boost/guigl/view/periodic.hpp 2008-09-29 20:14:58 EDT (Mon, 29 Sep 2008)
@@ -33,7 +33,7 @@
void enable(double seconds)
{
m_enabled = true;
- m_milliseconds = seconds * 1000;
+ m_milliseconds = int(seconds * 1000);
timer_callback();
}
Modified: sandbox/guigl/boost/guigl/view/positioned.hpp
==============================================================================
--- sandbox/guigl/boost/guigl/view/positioned.hpp (original)
+++ sandbox/guigl/boost/guigl/view/positioned.hpp 2008-09-29 20:14:58 EDT (Mon, 29 Sep 2008)
@@ -39,6 +39,11 @@
, m_position(args[_position])
, m_parent(0)
{}
+ positioned(const positioned &rhs)
+ : base_type(static_cast<const base_type &>(rhs))
+ , m_position(rhs.m_position)
+ , m_parent(0)
+ {}
/** Returns the position */
const position_type &position() const
Modified: sandbox/guigl/boost/guigl/view/static_compound.hpp
==============================================================================
--- sandbox/guigl/boost/guigl/view/static_compound.hpp (original)
+++ sandbox/guigl/boost/guigl/view/static_compound.hpp 2008-09-29 20:14:58 EDT (Mon, 29 Sep 2008)
@@ -79,9 +79,9 @@
access::set_parent(view, *this);
}
- friend class detail::static_compound_event_visitor<ChildrenSequence, BaseView>;
- friend class detail::draw<static_compound>;
- friend class detail::set_parent<static_compound>;
+ friend struct detail::static_compound_event_visitor<ChildrenSequence, BaseView>;
+ friend struct detail::draw<static_compound>;
+ friend struct detail::set_parent<static_compound>;
};
}}}
Modified: sandbox/guigl/boost/guigl/widget/button.hpp
==============================================================================
--- sandbox/guigl/boost/guigl/widget/button.hpp (original)
+++ sandbox/guigl/boost/guigl/widget/button.hpp 2008-09-29 20:14:58 EDT (Mon, 29 Sep 2008)
@@ -41,13 +41,14 @@
button &operator=(const button &rhs)
{
- base_type::operator=(static_cast<const base_type &>(rhs));
+ base_type::operator=(*static_cast<const base_type *>(&rhs));
return *this;
}
boost::signal<void()> on_click;
protected:
BOOST_GUIGL_WIDGET_DRAW
-
+ bool on_event(const event_type &event_info);
+
private:
void clickable_button_down(bool state);
void clickable_on_click()
Modified: sandbox/guigl/boost/guigl/widget/compound.hpp
==============================================================================
--- sandbox/guigl/boost/guigl/widget/compound.hpp (original)
+++ sandbox/guigl/boost/guigl/widget/compound.hpp 2008-09-29 20:14:58 EDT (Mon, 29 Sep 2008)
@@ -34,6 +34,7 @@
protected:
void draw();
+ bool on_event(const event_type &event_info);
};
}}}
Modified: sandbox/guigl/boost/guigl/widget/label.hpp
==============================================================================
--- sandbox/guigl/boost/guigl/widget/label.hpp (original)
+++ sandbox/guigl/boost/guigl/widget/label.hpp 2008-09-29 20:14:58 EDT (Mon, 29 Sep 2008)
@@ -33,6 +33,8 @@
protected:
void draw();
+ bool on_event(const event_type &event_info);
+
friend class guigl::access;
};
Modified: sandbox/guigl/boost/guigl/widget/labeled_button.hpp
==============================================================================
--- sandbox/guigl/boost/guigl/widget/labeled_button.hpp (original)
+++ sandbox/guigl/boost/guigl/widget/labeled_button.hpp 2008-09-29 20:14:58 EDT (Mon, 29 Sep 2008)
@@ -26,11 +26,15 @@
public:
template<typename ArgumentPack>
labeled_button(const ArgumentPack &args)
- : labeled_button_base_type(args)
+ : base_type(args)
+ {}
+ labeled_button(const labeled_button &rhs)
+ : base_type(static_cast<const base_type &>(rhs))
{}
protected:
void draw();
+ bool on_event(const event_type &event_info);
friend class guigl::access;
};
Modified: sandbox/guigl/boost/guigl/widget/labeled_slider.hpp
==============================================================================
--- sandbox/guigl/boost/guigl/widget/labeled_slider.hpp (original)
+++ sandbox/guigl/boost/guigl/widget/labeled_slider.hpp 2008-09-29 20:14:58 EDT (Mon, 29 Sep 2008)
@@ -31,6 +31,7 @@
protected:
void draw();
+ bool on_event(const event_type &event_info);
friend class guigl::access;
};
Modified: sandbox/guigl/boost/guigl/widget/slider.hpp
==============================================================================
--- sandbox/guigl/boost/guigl/widget/slider.hpp (original)
+++ sandbox/guigl/boost/guigl/widget/slider.hpp 2008-09-29 20:14:58 EDT (Mon, 29 Sep 2008)
@@ -49,7 +49,8 @@
void set_value(double value);
protected:
BOOST_GUIGL_WIDGET_DRAW
-
+ bool on_event(const event_type &event_info);
+
private:
double m_value;
double m_min, m_max, m_step;
Modified: sandbox/guigl/boost/guigl/widget/window.hpp
==============================================================================
--- sandbox/guigl/boost/guigl/widget/window.hpp (original)
+++ sandbox/guigl/boost/guigl/widget/window.hpp 2008-09-29 20:14:58 EDT (Mon, 29 Sep 2008)
@@ -31,7 +31,9 @@
{}
protected:
- BOOST_GUIGL_WIDGET_DRAW
+ void draw();
+
+ bool on_event(const event_type &event_info);
};
}}}
Modified: sandbox/guigl/boost/parameter/aux_/typed_tagged_argument.hpp
==============================================================================
--- sandbox/guigl/boost/parameter/aux_/typed_tagged_argument.hpp (original)
+++ sandbox/guigl/boost/parameter/aux_/typed_tagged_argument.hpp 2008-09-29 20:14:58 EDT (Mon, 29 Sep 2008)
@@ -129,12 +129,7 @@
);
reference value;
-# if BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1310))
- // warning suppression
- private:
- void operator=(tagged_argument const&);
- public:
-# endif
+
// MPL sequence support
typedef typed_tagged_argument type; // Convenience for users
typedef empty_typed_arg_list tail_type; // For the benefit of iterators
Modified: sandbox/guigl/libs/guigl/build/Jamfile
==============================================================================
--- sandbox/guigl/libs/guigl/build/Jamfile (original)
+++ sandbox/guigl/libs/guigl/build/Jamfile 2008-09-29 20:14:58 EDT (Mon, 29 Sep 2008)
@@ -10,9 +10,11 @@
: source-location ../src
: requirements
<toolset>darwin:<linkflags>"-framework GLUT -framework OpenGL"
+ <define>BOOST_ALL_NO_LIB=1
: usage-requirements
<toolset>darwin:<linkflags>"-framework GLUT -framework OpenGL"
<library>/boost/signals//boost_signals
+ <define>BOOST_ALL_NO_LIB=1
;
SOURCES =
Modified: sandbox/guigl/libs/guigl/build/vc8ide/build.vcproj
==============================================================================
--- sandbox/guigl/libs/guigl/build/vc8ide/build.vcproj (original)
+++ sandbox/guigl/libs/guigl/build/vc8ide/build.vcproj 2008-09-29 20:14:58 EDT (Mon, 29 Sep 2008)
@@ -3,7 +3,7 @@
ProjectType="Visual C++"
Version="8.00"
Name="build"
- ProjectGUID="{96dd7085-0763-49ff-9986-0244d7b43704}"
+ ProjectGUID="{96DD7085-0763-49FF-9986-0244D7B43704}"
>
<Platforms>
<Platform
@@ -24,7 +24,6 @@
BuildCommandLine="bjam --v2 ../../$(ProjectName) $(ConfigurationName)"
ReBuildCommandLine="bjam --v2 -a ../../$(ProjectName) $(ConfigurationName)"
CleanCommandLine="bjam --v2 --clean ../../$(ProjectName) $(ConfigurationName)"
-
Output=""
PreprocessorDefinitions=""
IncludeSearchPath=""
@@ -45,7 +44,6 @@
BuildCommandLine="bjam --v2 ../../$(ProjectName) $(ConfigurationName)"
ReBuildCommandLine="bjam --v2 -a ../../$(ProjectName) $(ConfigurationName)"
CleanCommandLine="bjam --v2 --clean ../../$(ProjectName) $(ConfigurationName)"
-
Output=""
PreprocessorDefinitions=""
IncludeSearchPath=""
@@ -328,23 +326,43 @@
</Filter>
</Filter>
<Filter
- Name="solution build"
+ Name="src"
>
- <File
- RelativePath="..\..\..\..\boost-build.jam"
- >
- </File>
- <File
- RelativePath="..\..\..\..\project-root.jam"
- >
- </File>
- <File
- RelativePath="..\..\..\..\Jamfile.v2"
+ <Filter
+ Name="widget"
>
- </File>
+ <File
+ RelativePath="..\..\src\widget\button.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\src\widget\compound.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\src\widget\label.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\src\widget\labeled_button.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\src\widget\labeled_slider.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\src\widget\slider.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\src\widget\window.cpp"
+ >
+ </File>
+ </Filter>
</Filter>
<File
- RelativePath="..\..\build\Jamfile.v2"
+ RelativePath="..\Jamfile"
>
</File>
</Files>
Modified: sandbox/guigl/libs/guigl/build/vc8ide/doc.vcproj
==============================================================================
--- sandbox/guigl/libs/guigl/build/vc8ide/doc.vcproj (original)
+++ sandbox/guigl/libs/guigl/build/vc8ide/doc.vcproj 2008-09-29 20:14:58 EDT (Mon, 29 Sep 2008)
@@ -3,28 +3,27 @@
ProjectType="Visual C++"
Version="8.00"
Name="doc"
- ProjectGUID="{03a0b274-9816-4644-a53d-9f70f01ea5cd}"
+ ProjectGUID="{9D6EDF83-2360-4267-8075-64934F754048}"
>
- <Platforms>
- <Platform
+ <Platforms>
+ <Platform
Name="Win32"
/>
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
Name="release|Win32"
OutputDirectory="..\..\..\..\bin.v2\libs\$(SolutionName)\$(ProjectName)\msvc-8.0\$(ConfigurationName)\threading-multi"
IntermediateDirectory="$(OutDir)"
ConfigurationType="0"
>
- <Tool
+ <Tool
Name="VCNMakeTool"
BuildCommandLine="cd ../../doc
bjam --v2 $(ConfigurationName)"
ReBuildCommandLine="cd ../../doc
bjam --v2 -a $(ConfigurationName)"
CleanCommandLine="bjam --v2 --clean ../../$(ProjectName) $(ConfigurationName)"
-
Output=""
PreprocessorDefinitions=""
IncludeSearchPath=""
@@ -33,23 +32,11 @@
ForcedUsingAssemblies=""
CompileAsManaged=""
/>
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath="..\../doc/guigl.qbk"
- >
- </File>
- <File
- RelativePath="..\../doc/guigl_doxygen.xml"
- >
- </File>
- <File
- RelativePath="..\../doc/Jamfile"
- >
- </File>
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
<Filter
Name="html"
>
@@ -58,11 +45,11 @@
>
</File>
<File
- RelativePath="..\../doc/html/reference.css"
+ RelativePath="..\../doc/html/index.html"
>
</File>
<File
- RelativePath="..\../doc/html/index.html"
+ RelativePath="..\../doc/html/reference.css"
>
</File>
<File
@@ -754,7 +741,19 @@
</Filter>
</Filter>
</Filter>
- </Files>
- <Globals>
- </Globals>
+ <File
+ RelativePath="..\../doc/guigl.qbk"
+ >
+ </File>
+ <File
+ RelativePath="..\../doc/guigl_doxygen.xml"
+ >
+ </File>
+ <File
+ RelativePath="..\../doc/Jamfile"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
</VisualStudioProject>
Modified: sandbox/guigl/libs/guigl/build/vc8ide/example.vcproj
==============================================================================
--- sandbox/guigl/libs/guigl/build/vc8ide/example.vcproj (original)
+++ sandbox/guigl/libs/guigl/build/vc8ide/example.vcproj 2008-09-29 20:14:58 EDT (Mon, 29 Sep 2008)
@@ -3,28 +3,27 @@
ProjectType="Visual C++"
Version="8.00"
Name="example"
- ProjectGUID="{ce89bcc4-f1e3-4de4-8d55-b09c5b4dab17}"
+ ProjectGUID="{9E866DB0-47D4-4A21-BFBD-2877DE504697}"
>
- <Platforms>
- <Platform
+ <Platforms>
+ <Platform
Name="Win32"
/>
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
Name="debug|Win32"
OutputDirectory="..\..\..\..\bin.v2\libs\$(SolutionName)\$(ProjectName)\msvc-8.0\$(ConfigurationName)\threading-multi"
IntermediateDirectory="$(OutDir)"
ConfigurationType="0"
>
- <Tool
+ <Tool
Name="VCNMakeTool"
BuildCommandLine="bjam --v2 ../../$(ProjectName) $(ConfigurationName)"
ReBuildCommandLine="bjam --v2 -a ../../$(ProjectName) $(ConfigurationName)"
CleanCommandLine="bjam --v2 --clean ../../$(ProjectName) $(ConfigurationName)"
-
Output=""
PreprocessorDefinitions=""
IncludeSearchPath=""
@@ -33,19 +32,18 @@
ForcedUsingAssemblies=""
CompileAsManaged=""
/>
- </Configuration>
- <Configuration
+ </Configuration>
+ <Configuration
Name="release|Win32"
OutputDirectory="..\..\..\..\bin.v2\libs\$(SolutionName)\$(ProjectName)\msvc-8.0\$(ConfigurationName)\threading-multi"
IntermediateDirectory="$(OutDir)"
ConfigurationType="0"
>
- <Tool
+ <Tool
Name="VCNMakeTool"
BuildCommandLine="bjam --v2 ../../$(ProjectName) $(ConfigurationName)"
ReBuildCommandLine="bjam --v2 -a ../../$(ProjectName) $(ConfigurationName)"
CleanCommandLine="bjam --v2 --clean ../../$(ProjectName) $(ConfigurationName)"
-
Output=""
PreprocessorDefinitions=""
IncludeSearchPath=""
@@ -54,11 +52,11 @@
ForcedUsingAssemblies=""
CompileAsManaged=""
/>
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
<File
RelativePath="..\../example/Jamfile"
>
@@ -83,7 +81,7 @@
RelativePath="..\../example/window_example.cpp"
>
</File>
- </Files>
- <Globals>
- </Globals>
+ </Files>
+ <Globals>
+ </Globals>
</VisualStudioProject>
Modified: sandbox/guigl/libs/guigl/build/vc8ide/guigl.sln
==============================================================================
--- sandbox/guigl/libs/guigl/build/vc8ide/guigl.sln (original)
+++ sandbox/guigl/libs/guigl/build/vc8ide/guigl.sln 2008-09-29 20:14:58 EDT (Mon, 29 Sep 2008)
@@ -1,12 +1,12 @@
Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "build", "build.vcproj", "{96dd7085-0763-49ff-9986-0244d7b43704}"
+# Visual C++ Express 2005
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "build", "build.vcproj", "{96DD7085-0763-49FF-9986-0244D7B43704}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "doc", "doc.vcproj", "{$template_msvc_doc_uuid_}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "doc", "doc.vcproj", "{9D6EDF83-2360-4267-8075-64934F754048}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example", "example.vcproj", "{$template_msvc_example_uuid_}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example", "example.vcproj", "{9E866DB0-47D4-4A21-BFBD-2877DE504697}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test", "test.vcproj", "{$template_msvc_test_uuid_}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test", "test.vcproj", "{A3977511-76A6-42A1-B6E4-917905E23ABA}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -14,22 +14,22 @@
release|Win32 = release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {96dd7085-0763-49ff-9986-0244d7b43704}.debug|Win32.ActiveCfg = debug|Win32
- {96dd7085-0763-49ff-9986-0244d7b43704}.debug|Win32.Build.0 = debug|Win32
- {96dd7085-0763-49ff-9986-0244d7b43704}.release|Win32.ActiveCfg = release|Win32
- {96dd7085-0763-49ff-9986-0244d7b43704}.release|Win32.Build.0 = release|Win32
- {03a0b274-9816-4644-a53d-9f70f01ea5cd}.debug|Win32.ActiveCfg = release|Win32
- {03a0b274-9816-4644-a53d-9f70f01ea5cd}.debug|Win32.Build.0 = release|Win32
- {03a0b274-9816-4644-a53d-9f70f01ea5cd}.release|Win32.ActiveCfg = release|Win32
- {03a0b274-9816-4644-a53d-9f70f01ea5cd}.release|Win32.Build.0 = release|Win32
- {ce89bcc4-f1e3-4de4-8d55-b09c5b4dab17}.debug|Win32.ActiveCfg = debug|Win32
- {ce89bcc4-f1e3-4de4-8d55-b09c5b4dab17}.debug|Win32.Build.0 = debug|Win32
- {ce89bcc4-f1e3-4de4-8d55-b09c5b4dab17}.release|Win32.ActiveCfg = release|Win32
- {ce89bcc4-f1e3-4de4-8d55-b09c5b4dab17}.release|Win32.Build.0 = release|Win32
- {3402e7c7-5fab-45bc-8408-5ab3bf74aa4a}.debug|Win32.ActiveCfg = debug|Win32
- {3402e7c7-5fab-45bc-8408-5ab3bf74aa4a}.debug|Win32.Build.0 = debug|Win32
- {3402e7c7-5fab-45bc-8408-5ab3bf74aa4a}.release|Win32.ActiveCfg = release|Win32
- {3402e7c7-5fab-45bc-8408-5ab3bf74aa4a}.release|Win32.Build.0 = release|Win32
+ {96DD7085-0763-49FF-9986-0244D7B43704}.debug|Win32.ActiveCfg = debug|Win32
+ {96DD7085-0763-49FF-9986-0244D7B43704}.debug|Win32.Build.0 = debug|Win32
+ {96DD7085-0763-49FF-9986-0244D7B43704}.release|Win32.ActiveCfg = release|Win32
+ {96DD7085-0763-49FF-9986-0244D7B43704}.release|Win32.Build.0 = release|Win32
+ {9D6EDF83-2360-4267-8075-64934F754048}.debug|Win32.ActiveCfg = release|Win32
+ {9D6EDF83-2360-4267-8075-64934F754048}.debug|Win32.Build.0 = release|Win32
+ {9D6EDF83-2360-4267-8075-64934F754048}.release|Win32.ActiveCfg = release|Win32
+ {9D6EDF83-2360-4267-8075-64934F754048}.release|Win32.Build.0 = release|Win32
+ {9E866DB0-47D4-4A21-BFBD-2877DE504697}.debug|Win32.ActiveCfg = debug|Win32
+ {9E866DB0-47D4-4A21-BFBD-2877DE504697}.debug|Win32.Build.0 = debug|Win32
+ {9E866DB0-47D4-4A21-BFBD-2877DE504697}.release|Win32.ActiveCfg = release|Win32
+ {9E866DB0-47D4-4A21-BFBD-2877DE504697}.release|Win32.Build.0 = release|Win32
+ {A3977511-76A6-42A1-B6E4-917905E23ABA}.debug|Win32.ActiveCfg = debug|Win32
+ {A3977511-76A6-42A1-B6E4-917905E23ABA}.debug|Win32.Build.0 = debug|Win32
+ {A3977511-76A6-42A1-B6E4-917905E23ABA}.release|Win32.ActiveCfg = release|Win32
+ {A3977511-76A6-42A1-B6E4-917905E23ABA}.release|Win32.Build.0 = release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Modified: sandbox/guigl/libs/guigl/build/vc8ide/test.vcproj
==============================================================================
--- sandbox/guigl/libs/guigl/build/vc8ide/test.vcproj (original)
+++ sandbox/guigl/libs/guigl/build/vc8ide/test.vcproj 2008-09-29 20:14:58 EDT (Mon, 29 Sep 2008)
@@ -3,28 +3,27 @@
ProjectType="Visual C++"
Version="8.00"
Name="test"
- ProjectGUID="{3402e7c7-5fab-45bc-8408-5ab3bf74aa4a}"
+ ProjectGUID="{A3977511-76A6-42A1-B6E4-917905E23ABA}"
>
- <Platforms>
- <Platform
+ <Platforms>
+ <Platform
Name="Win32"
/>
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
Name="debug|Win32"
OutputDirectory="..\..\..\..\bin.v2\libs\$(SolutionName)\$(ProjectName)\msvc-8.0\$(ConfigurationName)\threading-multi"
IntermediateDirectory="$(OutDir)"
ConfigurationType="0"
>
- <Tool
+ <Tool
Name="VCNMakeTool"
BuildCommandLine="bjam --v2 ../../$(ProjectName) $(ConfigurationName)"
ReBuildCommandLine="bjam --v2 -a ../../$(ProjectName) $(ConfigurationName)"
CleanCommandLine="bjam --v2 --clean ../../$(ProjectName) $(ConfigurationName)"
-
Output=""
PreprocessorDefinitions=""
IncludeSearchPath=""
@@ -33,19 +32,18 @@
ForcedUsingAssemblies=""
CompileAsManaged=""
/>
- </Configuration>
- <Configuration
+ </Configuration>
+ <Configuration
Name="release|Win32"
OutputDirectory="..\..\..\..\bin.v2\libs\$(SolutionName)\$(ProjectName)\msvc-8.0\$(ConfigurationName)\threading-multi"
IntermediateDirectory="$(OutDir)"
ConfigurationType="0"
>
- <Tool
+ <Tool
Name="VCNMakeTool"
BuildCommandLine="bjam --v2 ../../$(ProjectName) $(ConfigurationName)"
ReBuildCommandLine="bjam --v2 -a ../../$(ProjectName) $(ConfigurationName)"
CleanCommandLine="bjam --v2 --clean ../../$(ProjectName) $(ConfigurationName)"
-
Output=""
PreprocessorDefinitions=""
IncludeSearchPath=""
@@ -54,11 +52,11 @@
ForcedUsingAssemblies=""
CompileAsManaged=""
/>
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
<File
RelativePath="..\../test/Jamfile"
>
@@ -103,7 +101,7 @@
RelativePath="..\../test/test_parameter_map_compilation.hpp"
>
</File>
- </Files>
- <Globals>
- </Globals>
+ </Files>
+ <Globals>
+ </Globals>
</VisualStudioProject>
Modified: sandbox/guigl/libs/guigl/example/two_buttons.cpp
==============================================================================
--- sandbox/guigl/libs/guigl/example/two_buttons.cpp (original)
+++ sandbox/guigl/libs/guigl/example/two_buttons.cpp 2008-09-29 20:14:58 EDT (Mon, 29 Sep 2008)
@@ -16,4 +16,9 @@
{
draw_prologue();
draw_epilogue();
-}
\ No newline at end of file
+}
+
+bool two_buttons::on_event(const boost::guigl::event_type &event_info)
+{
+ return base_type::on_event(event_info);
+}
Modified: sandbox/guigl/libs/guigl/example/two_buttons.hpp
==============================================================================
--- sandbox/guigl/libs/guigl/example/two_buttons.hpp (original)
+++ sandbox/guigl/libs/guigl/example/two_buttons.hpp 2008-09-29 20:14:58 EDT (Mon, 29 Sep 2008)
@@ -40,6 +40,7 @@
}
protected:
void draw();
+ bool on_event(const boost::guigl::event_type &event_info);
};
#endif // BOOST__GUIGL__EXAMPLE__TWO_BUTTONS_HPP
\ No newline at end of file
Modified: sandbox/guigl/libs/guigl/example/two_spheres.cpp
==============================================================================
--- sandbox/guigl/libs/guigl/example/two_spheres.cpp (original)
+++ sandbox/guigl/libs/guigl/example/two_spheres.cpp 2008-09-29 20:14:58 EDT (Mon, 29 Sep 2008)
@@ -50,3 +50,8 @@
}
void *two_spheres::s_sphere = 0;
+
+bool two_spheres::on_event(const boost::guigl::event_type &event_info)
+{
+ return base_type::on_event(event_info);
+}
Modified: sandbox/guigl/libs/guigl/example/two_spheres.hpp
==============================================================================
--- sandbox/guigl/libs/guigl/example/two_spheres.hpp (original)
+++ sandbox/guigl/libs/guigl/example/two_spheres.hpp 2008-09-29 20:14:58 EDT (Mon, 29 Sep 2008)
@@ -39,6 +39,8 @@
protected:
void draw();
void draw_prologue();
+ bool on_event(const boost::guigl::event_type &event_info);
+
static void *sphere();
static void *s_sphere;
Modified: sandbox/guigl/libs/guigl/example/window_example.cpp
==============================================================================
--- sandbox/guigl/libs/guigl/example/window_example.cpp (original)
+++ sandbox/guigl/libs/guigl/example/window_example.cpp 2008-09-29 20:14:58 EDT (Mon, 29 Sep 2008)
@@ -26,7 +26,7 @@
using namespace boost::guigl;
-color_type make_grey(double value)
+color_type make_grey(float value)
{
return color_type(value, value, value);
}
@@ -86,7 +86,7 @@
layout::grid grid_layout(( _grid_size=test_window3.size(), _horizontal=3, _vertical=3 ));
for(int i=1; i<=9; i++)
- test_window3 << grid_layout.create<widget::button>(( _background=color_type(1.0/i,1.0/i,1.0/i) ));
+ test_window3 << grid_layout.create<widget::button>(( _background=color_type(1.0f/i,1.0f/i,1.0f/i) ));
window test_window_3d(( _depth = true, _label="3D", _color=make_grey(1) ));
test_window_3d << new two_spheres(_period = 0.01);
Modified: sandbox/guigl/libs/guigl/src/widget/button.cpp
==============================================================================
--- sandbox/guigl/libs/guigl/src/widget/button.cpp (original)
+++ sandbox/guigl/libs/guigl/src/widget/button.cpp 2008-09-29 20:14:58 EDT (Mon, 29 Sep 2008)
@@ -38,4 +38,9 @@
guigl::window::redraw(*this);
}
+bool button::on_event(const event_type &event_info)
+{
+ return base_type::on_event(event_info);
+}
+
}}}
\ No newline at end of file
Modified: sandbox/guigl/libs/guigl/src/widget/compound.cpp
==============================================================================
--- sandbox/guigl/libs/guigl/src/widget/compound.cpp (original)
+++ sandbox/guigl/libs/guigl/src/widget/compound.cpp 2008-09-29 20:14:58 EDT (Mon, 29 Sep 2008)
@@ -19,4 +19,9 @@
draw_epilogue();
}
+bool compound::on_event(const event_type &event_info)
+{
+ return base_type::on_event(event_info);
+}
+
}}}
Modified: sandbox/guigl/libs/guigl/src/widget/label.cpp
==============================================================================
--- sandbox/guigl/libs/guigl/src/widget/label.cpp (original)
+++ sandbox/guigl/libs/guigl/src/widget/label.cpp 2008-09-29 20:14:58 EDT (Mon, 29 Sep 2008)
@@ -18,4 +18,9 @@
BOOST_GUIGL_WIDGET_DRAW_IMPL(label)
+bool label::on_event(const event_type &event_info)
+{
+ return base_type::on_event(event_info);
+}
+
}}}
\ No newline at end of file
Modified: sandbox/guigl/libs/guigl/src/widget/labeled_button.cpp
==============================================================================
--- sandbox/guigl/libs/guigl/src/widget/labeled_button.cpp (original)
+++ sandbox/guigl/libs/guigl/src/widget/labeled_button.cpp 2008-09-29 20:14:58 EDT (Mon, 29 Sep 2008)
@@ -15,4 +15,9 @@
BOOST_GUIGL_WIDGET_DRAW_IMPL(labeled_button)
+bool labeled_button::on_event(const event_type &event_info)
+{
+ return base_type::on_event(event_info);
+}
+
}}}
\ No newline at end of file
Modified: sandbox/guigl/libs/guigl/src/widget/labeled_slider.cpp
==============================================================================
--- sandbox/guigl/libs/guigl/src/widget/labeled_slider.cpp (original)
+++ sandbox/guigl/libs/guigl/src/widget/labeled_slider.cpp 2008-09-29 20:14:58 EDT (Mon, 29 Sep 2008)
@@ -15,4 +15,9 @@
BOOST_GUIGL_WIDGET_DRAW_IMPL(labeled_slider)
+bool labeled_slider::on_event(const event_type &event_info)
+{
+ return base_type::on_event(event_info);
+}
+
}}}
\ No newline at end of file
Modified: sandbox/guigl/libs/guigl/src/widget/slider.cpp
==============================================================================
--- sandbox/guigl/libs/guigl/src/widget/slider.cpp (original)
+++ sandbox/guigl/libs/guigl/src/widget/slider.cpp 2008-09-29 20:14:58 EDT (Mon, 29 Sep 2008)
@@ -14,6 +14,7 @@
#include <boost/guigl/view/impl/solid_background.hpp>
#include <boost/guigl/view/impl/draggable.hpp>
#include <iostream>
+#include <cmath>
namespace boost { namespace guigl { namespace widget {
@@ -36,7 +37,7 @@
{
double new_value = (position.x / size().x) * (m_max-m_min);
if(m_step!=0.0)
- new_value = round(new_value / m_step) * m_step;
+ new_value = floor(new_value / m_step) * m_step;
new_value += m_min;
new_value = (std::max)(m_min, new_value);
new_value = (std::min)(m_max, new_value);
@@ -53,5 +54,9 @@
}
}
+bool slider::on_event(const event_type &event_info)
+{
+ return base_type::on_event(event_info);
+}
}}}
\ No newline at end of file
Modified: sandbox/guigl/libs/guigl/src/widget/window.cpp
==============================================================================
--- sandbox/guigl/libs/guigl/src/widget/window.cpp (original)
+++ sandbox/guigl/libs/guigl/src/widget/window.cpp 2008-09-29 20:14:58 EDT (Mon, 29 Sep 2008)
@@ -17,14 +17,9 @@
BOOST_GUIGL_WIDGET_DRAW_IMPL(window)
-inline void window::draw_prologue()
+bool window::on_event(const event_type &event_info)
{
- base_type::draw_prologue();
-}
-
-inline void window::draw_epilogue()
-{
- base_type::draw_epilogue();
+ return base_type::on_event(event_info);
}
Modified: sandbox/guigl/libs/guigl/src/window.cpp
==============================================================================
--- sandbox/guigl/libs/guigl/src/window.cpp (original)
+++ sandbox/guigl/libs/guigl/src/window.cpp 2008-09-29 20:14:58 EDT (Mon, 29 Sep 2008)
@@ -28,7 +28,7 @@
int create_window(const size_type &size, const std::string &label, bool depth, window::impl *impl)
{
- glutInitWindowSize(size.x, size.y);
+ glutInitWindowSize((int)size.x, (int)size.y);
glutInitDisplayMode(GLUT_RGBA | GLUT_DOUBLE | GLUT_ALPHA | (depth?GLUT_DEPTH:0));
int id = glutCreateWindow(label.c_str());
if(depth)
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