← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/bombono-dvd/oneiric

« back to all changes in this revision

Viewing changes to src/mgui/editor/kit.h

  • Committer: Bazaar Package Importer
  • Author(s): Alessio Treglia
  • Date: 2010-11-04 11:46:25 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20101104114625-2tfaxma74eqggp5r
Tags: 0.8.0-0ubuntu1
https://launchpad.net/bugs/670193
* New upstream release (LP: #670193).
* Refresh 02_sparc.diff patch.
* Replace 05-boost_filesystem-link.patch with 05-fix_boost.patch, it fixes
  build failure with Boost <= 1.44.
* Bump Standards.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/mgui/editor/kit.h
28
28
#include <mgui/text_style.h> 
29
29
#include <mgui/render/rgba.h> 
30
30
 
 
31
#include <mlib/resingleton.h>
 
32
 
31
33
namespace Editor
32
34
{
33
35
 
59
61
};
60
62
 
61
63
// редактор меню с панелью инструментов и прочим
62
 
class Kit: public /*Gtk::DrawingArea*/ DisplayArea, public EditorRegion,
63
 
           public MEdt::ToolData
 
64
class Kit: public ReSingleton<Kit>, public /*Gtk::DrawingArea*/ DisplayArea, 
 
65
           public EditorRegion, public MEdt::ToolData
64
66
{
65
67
    typedef Gtk::DrawingArea MyParent;
66
68
    public:
124
126
 
125
127
} // namespace Editor
126
128
 
 
129
inline Editor::Kit& MenuEditor() { return Editor::Kit::Instance(); }
 
130
 
 
131
 
127
132
#endif // __MGUI_EDITOR_KIT_H__
128
133
 
129
134