Merge lp:~azzar1/nux/nux-clean-up into lp:nux

[Andrea Azzarone]

[lp:~azzar1/nux/nux-clean-up]

864. By Andrea Azzarone on 2014-10-23

Remove focus.cpp

865. By Andrea Azzarone on 2014-10-23

Delete *ComboBox*

866. By Andrea Azzarone on 2014-10-23

Remove Canvas.*

867. By Andrea Azzarone on 2014-10-23

Remove AnimatedTextureArea.*

868. By Andrea Azzarone on 2014-10-23

Remove color picker dialog stuff.

869. By Andrea Azzarone on 2014-10-23

Remove ClientArea.*

870. By Andrea Azzarone on 2014-10-23

Remoe Radio/Check button classes.

871. By Andrea Azzarone on 2014-10-23

Remove EMMetrics.*

872. By Andrea Azzarone on 2014-10-23

Remove FileSelector.*

873. By Andrea Azzarone on 2014-10-23

Remove GroupBox*

874. By Andrea Azzarone on 2014-10-23

Remove RGBValuator.*

875. By Andrea Azzarone on 2014-10-23

Remove RangeValue*

876. By Andrea Azzarone on 2014-10-23

Remove NumericValuator*

877. By Andrea Azzarone on 2014-10-23

Remove SpinBox*

878. By Andrea Azzarone on 2014-10-23

Remove DoubleValidator* and HexRegExpValidator*

879. By Andrea Azzarone on 2014-10-23

Remove EditTextBox* IntegerValidator* Validator*

880. By Andrea Azzarone on 2014-10-23

Remove PopUpWindow.*

881. By Andrea Azzarone on 2014-10-23

Remove Dialog* and FloatingWindow*

882. By Andrea Azzarone on 2014-10-23

Remove MouseAreaCtrl.*

883. By Andrea Azzarone on 2014-10-23

Remove Panel*

884. By Andrea Azzarone on 2014-10-23

Remove KeyboardHandler.*

885. By Andrea Azzarone on 2014-10-23

Remove Menu*

886. By Andrea Azzarone on 2014-10-23

Remove ActionItem.*

887. By Andrea Azzarone on 2014-10-23

Remove PangoText

888. By Andrea Azzarone on 2014-10-23

Remove StaticTextBox

889. By Andrea Azzarone on 2014-10-23

Remove TabView.*

890. By Andrea Azzarone on 2014-10-24

Remove multiplataform support.

891. By Andrea Azzarone on 2014-10-24

Remove Process.*

892. By Andrea Azzarone on 2014-10-24

Remove GLThread.h

893. By Andrea Azzarone on 2014-10-24

Remove GdiImageLoader.*

894. By Andrea Azzarone on 2014-10-24

Remove OpenGLDefinitions.h

895. By Andrea Azzarone on 2014-10-24

Remove GLSh_ColorPicker.*

896. By Andrea Azzarone on 2014-10-24

Remove GLSh_DrawFunction.*

897. By Andrea Azzarone on 2014-10-24

Remove GLSh_Fill.*

898. By Andrea Azzarone on 2014-10-24

Remove GLPBuffer.*

899. By Andrea Azzarone on 2014-10-24

Remove D2DTextRenderer.*

Unmerged revisions

899. By Andrea Azzarone on 2014-10-24

Remove D2DTextRenderer.*

898. By Andrea Azzarone on 2014-10-24

Remove GLPBuffer.*

897. By Andrea Azzarone on 2014-10-24

Remove GLSh_Fill.*

896. By Andrea Azzarone on 2014-10-24

Remove GLSh_DrawFunction.*

895. By Andrea Azzarone on 2014-10-24

Remove GLSh_ColorPicker.*

894. By Andrea Azzarone on 2014-10-24

Remove OpenGLDefinitions.h

893. By Andrea Azzarone on 2014-10-24

Remove GdiImageLoader.*

892. By Andrea Azzarone on 2014-10-24

Remove GLThread.h

891. By Andrea Azzarone on 2014-10-24

Remove Process.*

890. By Andrea Azzarone on 2014-10-24

Remove multiplataform support.

=== modified file '.bzrignore'
--- .bzrignore	2012-11-05 21:31:06 +0000
+++ .bzrignore	2014-10-24 19:52:50 +0000
@@ -30,7 +30,6 @@
 examples/canvas
 examples/checkbox
 examples/combobox
-examples/coverflow
 examples/focus
 examples/gestures
 examples/gridlayout
@@ -47,7 +46,6 @@
 examples/text_entry_focus
 examples/tiles_view
 examples/timegraph
-examples/timeline
 examples/tooltip
 m4
 m4/*

=== removed file 'Nux/AbstractCheckedButton.cpp'
--- Nux/AbstractCheckedButton.cpp	2012-11-05 21:31:06 +0000
+++ Nux/AbstractCheckedButton.cpp	1970-01-01 00:00:00 +0000
@@ -1,217 +0,0 @@
-/*
- * Copyright 2010 Inalogic® Inc.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License, as
- * published by the  Free Software Foundation; either version 2.1 or 3.0
- * of the License.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the applicable version of the GNU Lesser General Public
- * License for more details.
- *
- * You should have received a copy of both the GNU Lesser General Public
- * License along with this program. If not, see <http://www.gnu.org/licenses/>
- *
- * Authored by: Jay Taoko <[e-mail]>
- *
- */
-
-
-#include "Nux.h"
-#include "HLayout.h"
-#include "AbstractCheckedButton.h"
-#include "StaticText.h"
-
-namespace nux
-{
-  NUX_IMPLEMENT_OBJECT_TYPE(AbstractCheckedButton);
-  
-  AbstractCheckedButton::AbstractCheckedButton(const std::string &str, bool state, NUX_FILE_LINE_DECL)
-    : AbstractButton(NUX_FILE_LINE_PARAM)
-  {
-    label_ = str;
-    active_ = state;
-    hlayout_ = 0;
-
-    static_text_  = new StaticText(label_, NUX_TRACKER_LOCATION);
-    static_text_->SetTextColor(label_color_);
-    hlayout_      = new HLayout(NUX_TRACKER_LOCATION);
-    check_area_   = new BasicView(NUX_TRACKER_LOCATION);
-
-    check_area_->SetInputEventSensitivity(false);
-    static_text_->SetInputEventSensitivity(false);
-
-    // Set Geometry
-    check_area_->SetMinMaxSize(14, 14);
-
-    hlayout_->SetSpaceBetweenChildren(4);
-    hlayout_->SetContentDistribution(MAJOR_POSITION_LEFT);
-    hlayout_->AddView(check_area_, 0, MINOR_POSITION_CENTER, MINOR_SIZE_MATCHCONTENT);
-    hlayout_->AddView(static_text_, 1, MINOR_POSITION_CENTER, MINOR_SIZE_MATCHCONTENT);
-
-//     // This is convenient to make the layout and the AbstractCheckedButton fit the check area and the caption area.
-//     // Since the check area is bigger than 4x4, it will force the layout and the AbstractCheckedButton to grow.
-//     // This is useful if the AbstractCheckedButton is put in a vertical layout and it has a stretch factor of 0. Then the width of the AbstractCheckedButton
-//     // will be adjusted to fit the minimum width of the check area and the caption area.
-//     {
-//       hlayout_->SetMinimumSize(1, 1);
-//       SetMinimumSize(14, 14);
-//       ApplyMinWidth();
-//       ApplyMinHeight();
-//     }
-
-    hlayout_->SetScaleFactor(0);
-    SetLayout(hlayout_);
-
-  }
-
-  AbstractCheckedButton::~AbstractCheckedButton()
-  {
-  }
-
-  void AbstractCheckedButton::SetLabel(const std::string &checkbox_label)
-  {
-    label_ = checkbox_label;
-    static_text_->SetText(label_);
-    QueueDraw();
-  }
-
-  std::string AbstractCheckedButton::GetLabel() const
-  {
-    return label_;
-  }
-
-  void AbstractCheckedButton::Draw(GraphicsEngine &graphics_engine, bool /* force_draw */)
-  {
-    Geometry base = GetGeometry();
-    graphics_engine.PushClippingRectangle(base);
-
-    GetPainter().PaintBackground(graphics_engine, base);
-
-    InteractState is;
-    is.is_on = active_;
-
-    if (visual_state_ == VISUAL_STATE_PRESSED)
-    {
-      is.is_focus = true;
-    }
-    else if (visual_state_ == VISUAL_STATE_PRELIGHT)
-    {
-      is.is_prelight = true;
-    }
-    else
-    {
-      is.is_focus = false;
-      is.is_prelight = false;
-    }
-
-    GetPainter().PushPaintLayerStack();
-    {
-      GetPainter().PaintCheckBox(graphics_engine, check_area_->GetGeometry(), is, Color(0xff000000));
-      static_text_->ProcessDraw(graphics_engine, true);
-    }
-    GetPainter().PopPaintLayerStack();
-
-    graphics_engine.PopClippingRectangle();
-  }
-
-  long AbstractCheckedButton::ComputeContentSize()
-  {
-    if (view_layout_)
-    {
-      PreLayoutManagement();
-
-      int old_width = GetBaseWidth();
-      int old_height = GetBaseHeight();
-
-      // Let the text view be as large as possible.
-      static_text_->SetMaximumWidth(AREA_MAX_WIDTH);
-
-      // Constrain the vertical expansion of the color selector.
-      view_layout_->SetBaseHeight(1);
-      long ret = view_layout_->ComputeContentSize();
-
-      PostLayoutManagement(ret);
-
-      {
-        // Check if the text view goes out of the AbstractCheckedButton area.
-        Geometry base = GetGeometry();
-        Geometry text_geo = static_text_->GetGeometry();
- 
-        // Intersect the AbstractCheckedButton and the text view
-        Geometry intersection = base.Intersect(text_geo);
-        if (intersection != text_geo)
-        {
-          // The text view goes outside of the AbstractCheckedButton area. We have to clip it
-          static_text_->SetMaximumWidth(intersection.width);
-
-          // Assign a size of 1 to the layout and call ComputeContentSize.
-          // Inside the StaticText::ComputeContentSize there is code that takes care of size negociation.
-          view_layout_->SetBaseWidth(1);
-          ret = view_layout_->ComputeContentSize();
-
-          // Assign the layout geometry to the AbstractCheckedButton view.
-          PostLayoutManagement(ret);
-        }
-      }
-
-      int new_width = GetBaseWidth();
-      int new_height = GetBaseHeight();
-
-      long size_compliance = 0;
-
-      // The layout has been resized to tightly pack its content
-      if (new_width > old_width)
-      {
-        size_compliance |= eLargerWidth; // need scrollbar
-      }
-      else if (new_width < old_width)
-      {
-        size_compliance |= eSmallerWidth;
-      }
-      else
-      {
-        size_compliance |= eCompliantWidth;
-      }
-
-      // The layout has been resized to tightly pack its content
-      if (new_height > old_height)
-      {
-        size_compliance |= eLargerHeight; // need scrollbar
-      }
-      else if (new_height < old_height)
-      {
-        size_compliance |= eSmallerHeight;
-      }
-      else
-      {
-        size_compliance |= eCompliantHeight;
-      }
-
-      return size_compliance;
-    }
-    else
-    {
-      PreLayoutManagement();
-      int ret = PostLayoutManagement(eCompliantHeight | eCompliantWidth);
-      return ret;
-    }
-
-    return 0;
-  }
-
-  void AbstractCheckedButton::SetLabelFontSize(int point)
-  {
-    AbstractButton::SetLabelFontSize(point);
-    if (static_text_ == NULL)
-      return;
-    
-    static_text_->SetTextPointSize(point);
-    
-    ComputeContentSize();
-    QueueDraw();
-  }
-}

=== removed file 'Nux/AbstractCheckedButton.h'
--- Nux/AbstractCheckedButton.h	2013-11-04 14:09:54 +0000
+++ Nux/AbstractCheckedButton.h	1970-01-01 00:00:00 +0000
@@ -1,110 +0,0 @@
-/*
- * Copyright 2010 Inalogic® Inc.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License, as
- * published by the  Free Software Foundation; either version 2.1 or 3.0
- * of the License.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the applicable version of the GNU Lesser General Public
- * License for more details.
- *
- * You should have received a copy of both the GNU Lesser General Public
- * License along with this program. If not, see <http://www.gnu.org/licenses/>
- *
- * Authored by: Jay Taoko <[e-mail]>
- *
- */
-
-
-#ifndef ABSTRACTCHECKEDBUTTON_H
-#define ABSTRACTCHECKEDBUTTON_H
-
-#include "AbstractButton.h"
-
-namespace nux
-{
-  class HLayout;
-  class InputArea;
-  class StaticText;
-
-  //! AbstractCheckedButton class
-  /*!
-      Acts as a base class for CheckBox and radioButton.\n
-  */
-  class AbstractCheckedButton: public AbstractButton
-  {
-    NUX_DECLARE_OBJECT_TYPE(AbstractCheckedButton, AbstractButton);
-  public:
-    AbstractCheckedButton(const std::string &str, bool state = false, NUX_FILE_LINE_PROTO);
-    virtual ~AbstractCheckedButton();
-
-    //! Emitted when the button is clicked.
-    sigc::signal<void, AbstractCheckedButton*> click;
-
-    //! Emitted when the active state changes.
-    /*!
-        Emitted when the active state changes, as a result of a mouse click or an API call.\n
-        \sa Activate, Deactivate.
-    */
-    sigc::signal<void, AbstractCheckedButton*> state_change;
-
-    //! Set the label.
-    /*!
-        Set the label of this AbstractCheckedButton. If the \a label argument is an empty string, then the the AbstractCheckedButton label is destroyed,
-        and the content of the AbstractCheckedButton is re-arranged accordingly.
-
-        @param label The label of the AbstractCheckedButton.
-    */
-    void SetLabel(const std::string &checkbox_label);
-
-    //!Return the label of this AbstractCheckedButton.
-    /*!
-        Return the label of this AbstractCheckedButton.
-
-        @return The AbstractCheckedButton label string.
-    */
-    std::string GetLabel() const;
-
-    //! Activate the check box.
-    /*!
-         Activate the check box.
-    */
-    virtual void Activate() = 0;
-
-    //! Deactivate the check box.
-    /*!
-         Deactivate the check box.
-    */
-    virtual void Deactivate() = 0;
-
-    virtual void SetLabelFontSize(int point);
-
-  protected:
-    virtual void Draw(GraphicsEngine &graphics_engine, bool force_draw) = 0;
-    virtual void RecvClick(int x, int y, unsigned long button_flags, unsigned long key_flags) = 0;
-    virtual long ComputeContentSize();
-
-    HLayout   *hlayout_;
-    InputArea *check_area_;
-
-  private:
-    //! Override of Area::SetMinimumHeight and made private.
-    /*!
-        Prevent changing the minimum height of the StaticText view.
-    */
-    virtual void SetMinimumHeight(int h){};
-
-    //! Override of Area::SetMaximumHeight and made private.
-    /*!
-        Prevent changing the maximum height of the StaticText view.
-    */
-    virtual void SetMaximumHeight(int h){};
-  };
-
-}
-
-#endif // ABSTRACTCHECKEDBUTTON_H

=== removed file 'Nux/AbstractComboBox.cpp'
--- Nux/AbstractComboBox.cpp	2012-11-05 21:31:06 +0000
+++ Nux/AbstractComboBox.cpp	1970-01-01 00:00:00 +0000
@@ -1,120 +0,0 @@
-/*
- * Copyright 2010 Inalogic® Inc.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License, as
- * published by the  Free Software Foundation; either version 2.1 or 3.0
- * of the License.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the applicable version of the GNU Lesser General Public
- * License for more details.
- *
- * You should have received a copy of both the GNU Lesser General Public
- * License along with this program. If not, see <http://www.gnu.org/licenses/>
- *
- * Authored by: Jay Taoko <[e-mail]>
- *
- */
-
-
-#include "Nux.h"
-#include "AbstractComboBox.h"
-#include "HLayout.h"
-#include "StaticText.h"
-
-namespace nux
-{
-
-  Color AbstractComboBox::m_sCOMBO_COLOR = Color(0x009F9F00);
-  Color AbstractComboBox::m_sCOMBO_BUTTON_COLOR = Color(0x00FFFFFF);
-  Color AbstractComboBox::m_sCOMBO_MOUSEOVER_COLOR = Color(0x55FFFFFF);
-
-  AbstractComboBox::AbstractComboBox(NUX_FILE_LINE_DECL)
-    :   View(NUX_FILE_LINE_PARAM)
-    ,   m_MenuIsActive(false)
-  {
-    m_hlayout   = new HLayout(NUX_TRACKER_LOCATION);
-    _combo_box_area = new BasicView(NUX_TRACKER_LOCATION);
-    _combo_box_opening_area    = new BasicView(NUX_TRACKER_LOCATION);
-
-    m_hlayout->AddView(_combo_box_area, 1);
-    m_hlayout->AddView(_combo_box_opening_area, 0);
-    m_hlayout->SetHorizontalExternalMargin(0);
-    m_hlayout->SetVerticalExternalMargin(0);
-    SetLayout(m_hlayout);
-
-    _combo_box_area->mouse_enter.connect(sigc::mem_fun(this, &AbstractComboBox::RecvMouseEnter));
-    _combo_box_area->mouse_leave.connect(sigc::mem_fun(this, &AbstractComboBox::RecvMouseLeave));
-
-    _combo_box_opening_area->mouse_enter.connect(sigc::mem_fun(this, &AbstractComboBox::RecvMouseEnter));
-    _combo_box_opening_area->mouse_leave.connect(sigc::mem_fun(this, &AbstractComboBox::RecvMouseLeave));
-
-    SetTextColor(color::Black);
-
-    _pango_static_text = new StaticText("", NUX_TRACKER_LOCATION);
-  }
-
-  AbstractComboBox::~AbstractComboBox()
-  {
-    if (_pango_static_text)
-      _pango_static_text->Dispose();
-    _pango_static_text = 0;
-  }
-
-  void AbstractComboBox::Draw(GraphicsEngine &graphics_engine, bool /* force_draw */)
-  {
-    Geometry base = GetGeometry();
-    
-    graphics_engine.PushClippingRectangle(base);
-    GetPainter().PaintBackground(graphics_engine, base);
-    GetPainter().PaintShape(graphics_engine, base, m_sCOMBO_COLOR,  eSHAPE_CORNER_ROUND4);
-
-    {
-      //GetPainter().PaintTextLineStatic(graphics_engine, GetFont(), _combo_box_area->GetGeometry(), _combo_box_area->GetBaseString().c_str(), GetTextColor(), eAlignTextLeft);
-      _pango_static_text->SetGeometry(_combo_box_area->GetGeometry());
-      _pango_static_text->ProcessDraw(graphics_engine, true);
-    }
-    
-    Geometry button_geo = _combo_box_opening_area->GetGeometry();
-    button_geo.OffsetSize(-5, -2);
-    button_geo.OffsetPosition(+4, +1);
-
-    if (_combo_box_area->IsMouseInside() || _combo_box_opening_area->IsMouseInside())
-      GetPainter().PaintShape(graphics_engine, button_geo, m_sCOMBO_MOUSEOVER_COLOR,  eSHAPE_CORNER_ROUND4);
-    else
-      GetPainter().PaintShape(graphics_engine, button_geo, m_sCOMBO_BUTTON_COLOR,  eSHAPE_CORNER_ROUND4);
-
-    GeometryPositioning gp(eHACenter, eVACenter);
-    Geometry GeoPo = ComputeGeometryPositioning(button_geo, GetTheme().GetImageGeometry(eCOMBOBOX_OPEN_BUTTON), gp);
-    GetPainter().PaintShape(graphics_engine, GeoPo, Color(0xFFFFFFFF), eCOMBOBOX_OPEN_BUTTON);
-
-    Geometry popup_geometry;
-    popup_geometry.SetX(_combo_box_area->GetBaseX());
-    popup_geometry.SetY(_combo_box_area->GetBaseY() + _combo_box_area->GetBaseHeight());
-    popup_geometry.SetWidth(_combo_box_area->GetBaseWidth());
-    popup_geometry.SetHeight(_combo_box_area->GetBaseHeight());
-
-    graphics_engine.PopClippingRectangle();
-  }
-
-  void AbstractComboBox::DrawContent(GraphicsEngine & /* graphics_engine */, bool /* force_draw */)
-  {
-
-  }
-
-  void AbstractComboBox::RecvMouseEnter(int /* x */, int /* y */, unsigned long /* button_flags */, unsigned long /* key_flags */)
-  {
-    QueueDraw();
-  }
-
-  void AbstractComboBox::RecvMouseLeave(int /* x */, int /* y */, unsigned long /* button_flags */, unsigned long /* key_flags */)
-  {
-    QueueDraw();
-  }
-
-
-
-}

=== removed file 'Nux/AbstractComboBox.h'
--- Nux/AbstractComboBox.h	2012-11-05 21:31:06 +0000
+++ Nux/AbstractComboBox.h	1970-01-01 00:00:00 +0000
@@ -1,64 +0,0 @@
-/*
- * Copyright 2010 Inalogic® Inc.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License, as
- * published by the  Free Software Foundation; either version 2.1 or 3.0
- * of the License.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the applicable version of the GNU Lesser General Public
- * License for more details.
- *
- * You should have received a copy of both the GNU Lesser General Public
- * License along with this program. If not, see <http://www.gnu.org/licenses/>
- *
- * Authored by: Jay Taoko <[e-mail]>
- *
- */
-
-
-#ifndef ABSTRACTCOMBOBOX_H
-#define ABSTRACTCOMBOBOX_H
-
-namespace nux
-{
-  class StaticText;
-  class HLayout;
-
-  class AbstractComboBox: public View
-  {
-  public:
-    AbstractComboBox(NUX_FILE_LINE_PROTO);
-    virtual ~AbstractComboBox();
-
-    virtual void Draw(GraphicsEngine &graphics_engine, bool force_draw);
-    virtual void DrawContent(GraphicsEngine &graphics_engine, bool force_draw);
-
-    void RecvMouseEnter(int x, int y, unsigned long button_flags, unsigned long key_flags);
-    void RecvMouseLeave(int x, int y, unsigned long button_flags, unsigned long key_flags);
-
-    StaticText * GetStaticText()
-    {
-      return _pango_static_text;
-    }
-
-  protected:
-    HLayout    *m_hlayout;
-    BasicView   *_combo_box_area;
-    BasicView   *_combo_box_opening_area;
-    StaticText  *_pango_static_text;
-    bool        m_MenuIsActive;
-    bool        m_IsOpeningMenu;
-
-    static Color m_sCOMBO_COLOR;
-    static Color m_sCOMBO_BUTTON_COLOR;
-    static Color m_sCOMBO_MOUSEOVER_COLOR;
-  };
-
-
-}
-
-#endif // ABSTRACTCOMBOBOX_H

=== modified file 'Nux/AbstractThread.cpp'
--- Nux/AbstractThread.cpp	2011-12-29 18:06:53 +0000
+++ Nux/AbstractThread.cpp	2014-10-24 19:52:50 +0000
@@ -58,29 +58,7 @@
 
   void AbstractThread::JoinChildThreads()
   {
-#if defined(NUX_OS_WINDOWS)
-    size_t sz = children_thread_list_.size();
-
-    if (sz == 0)
-    {
-      return;
-    }
-
-    HANDLE *hdl = new HANDLE[sz];
-
-    int i = 0;
-    std::list<AbstractThread*>::iterator it;
-    for (it = children_thread_list_.begin(); it != children_thread_list_.end(); ++it, ++i)
-    {
-      hdl[i] = (*it)->GetThreadHandle();
-    }
-
-    unsigned int result = WaitForMultipleObjects(sz, hdl, FALSE, INFINITE);
-#else
-  //#error WindowThread::JoinChildThreads has not been implemented for this platform.
-  // Todo
-#endif
-
+    // Todo
     return;
   }
 

=== removed file 'Nux/ActionItem.cpp'
--- Nux/ActionItem.cpp	2012-10-10 22:46:50 +0000
+++ Nux/ActionItem.cpp	1970-01-01 00:00:00 +0000
@@ -1,160 +0,0 @@
-/*
- * Copyright 2010 Inalogic® Inc.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License, as
- * published by the  Free Software Foundation; either version 2.1 or 3.0
- * of the License.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the applicable version of the GNU Lesser General Public
- * License for more details.
- *
- * You should have received a copy of both the GNU Lesser General Public
- * License along with this program. If not, see <http://www.gnu.org/licenses/>
- *
- * Authored by: Jay Taoko <[e-mail]>
- *
- */
-
-
-#include "Nux.h"
-#include "NuxGraphics/GLTextureResourceManager.h"
-#include "ActionItem.h"
-
-namespace nux
-{
-
-  NUX_IMPLEMENT_OBJECT_TYPE(ActionItem);
-
-  ActionItem::ActionItem(const char *label, int UserValue, NUX_FILE_LINE_DECL)
-    :   Object(true, NUX_FILE_LINE_PARAM)
-    ,   m_UserValue(UserValue)
-    ,   m_Label("")
-    ,   m_IsActivated(true)
-    ,   m_Menu(0)
-    ,   m_Enable(true)
-  {
-    m_Icon = 0;
-    SetLabel(label);
-  }
-
-  ActionItem::~ActionItem()
-  {
-    if (m_Icon)
-      m_Icon->UnReference();
-  }
-
-  void ActionItem::DrawAsMenuItem(GraphicsEngine &graphics_engine, InputArea &area, bool is_highlighted, bool /* draw_icone */)
-  {
-    Geometry geo = area.GetGeometry();
-    Geometry icon_geo(0, 0, 20, 20);
-    Geometry text_geo = geo;
-
-    text_geo.OffsetPosition(24, 2);
-    text_geo.OffsetSize(2 * 24, 2 * 2);
-
-    icon_geo.SetX(geo.x + 2);
-    icon_geo.SetY(geo.y + 2);
-
-    const char *label = GetLabel();
-
-    if (is_highlighted)
-    {
-      GetPainter().Paint2DQuadColor(graphics_engine, geo, Color(COLOR_FOREGROUND_SECONDARY));
-    }
-
-    if (m_Icon)
-      GetPainter().Draw2DTextureAligned(graphics_engine, m_Icon, icon_geo, TextureAlignmentStyle(eTACenter, eTACenter));
-
-    GetPainter().PaintTextLineStatic(graphics_engine, GetSysFont(), text_geo, std::string(label), Color(0xFF000000), eAlignTextLeft);
-  }
-
-  void ActionItem::DrawAsToolButton(GraphicsEngine &graphics_engine, InputArea &area)
-  {
-    Geometry base = area.GetGeometry();
-
-    if (area.IsMouseOwner())
-    {
-      if (area.IsMouseInside())
-      {
-        GetPainter().PaintShape(graphics_engine, base, Color(COLOR_BACKGROUND_SECONDARY),  eSHAPE_CORNER_ROUND2);
-        GetPainter().PaintShape(graphics_engine, base, Color(COLOR_BLACK),  eSTROKE_CORNER_ROUND2);
-      }
-      else
-      {
-        GetPainter().PaintShape(graphics_engine, base, Color(COLOR_FOREGROUND_PRIMARY),  eSHAPE_CORNER_ROUND2);
-        GetPainter().PaintShape(graphics_engine, base, Color(COLOR_BLACK),  eSTROKE_CORNER_ROUND2);
-      }
-    }
-    else
-    {
-      if (area.IsMouseInside() /*TODO: && (!area.MouseFocusOnOtherArea())*/)
-      {
-        GetPainter().PaintShape(graphics_engine, base, Color(COLOR_FOREGROUND_PRIMARY),  eSHAPE_CORNER_ROUND2);
-        GetPainter().PaintShape(graphics_engine, base, Color(COLOR_BLACK),  eSTROKE_CORNER_ROUND2);
-      }
-      else
-      {
-        GetPainter().PaintShape(graphics_engine, base, Color(COLOR_BACKGROUND_SECONDARY),  eSHAPE_CORNER_ROUND2);
-        GetPainter().PaintShape(graphics_engine, base, Color(COLOR_BLACK),  eSTROKE_CORNER_ROUND2);
-      }
-    }
-
-    GetPainter().Draw2DTextureAligned(graphics_engine, m_Icon, base, TextureAlignmentStyle(eTACenter, eTACenter));
-  }
-
-  void ActionItem::Activate(bool b)
-  {
-    m_IsActivated = b;
-  }
-
-  void ActionItem::Trigger() const
-  {
-    sigAction.emit();
-  }
-
-  void ActionItem::Enable(bool b)
-  {
-    m_Enable = b;
-  }
-
-  bool ActionItem::isEnabled() const
-  {
-    return m_Enable;
-  }
-
-  void ActionItem::SetLabel(const char *label)
-  {
-    m_Label = label;
-  }
-
-  const char *ActionItem::GetLabel() const
-  {
-    return m_Label.c_str();
-  }
-
-  void ActionItem::SetIcon(const BaseTexture* icon)
-  {
-    if (m_Icon)
-      m_Icon->UnReference();
-    m_Icon = icon->Clone();
-  }
-
-  // NUXTODO: should return the bitmap data instead or a const pointer?.
-  const BaseTexture* ActionItem::GetIcon()
-  {
-    return m_Icon;
-  }
-
-//void ActionItem::SetMenu(Menu* menu)
-//{
-//    m_Menu = menu;
-//}
-//Menu* ActionItem::GetMenu() const
-//{
-//    return m_Menu;
-//}
-}

=== removed file 'Nux/ActionItem.h'
--- Nux/ActionItem.h	2012-09-21 02:14:12 +0000
+++ Nux/ActionItem.h	1970-01-01 00:00:00 +0000
@@ -1,83 +0,0 @@
-/*
- * Copyright 2010 Inalogic® Inc.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License, as
- * published by the  Free Software Foundation; either version 2.1 or 3.0
- * of the License.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the applicable version of the GNU Lesser General Public
- * License for more details.
- *
- * You should have received a copy of both the GNU Lesser General Public
- * License along with this program. If not, see <http://www.gnu.org/licenses/>
- *
- * Authored by: Jay Taoko <[e-mail]>
- *
- */
-
-
-#ifndef ACTIONITEM_H
-#define ACTIONITEM_H
-
-#include "NuxGraphics/GraphicsEngine.h"
-
-namespace nux
-{
-
-  class MenuBar;
-  class MenuPage;
-
-  class ActionItem: public Object
-  {
-  public:
-    NUX_DECLARE_OBJECT_TYPE (ActionItem, Object);
-
-    ActionItem (const TCHAR *label = 0, int UserValue = 0, NUX_FILE_LINE_PROTO);
-    ~ActionItem();
-
-    void Activate (bool b);
-    void Trigger() const;
-
-    void DrawAsMenuItem (GraphicsEngine &GfxContext, InputArea &area, bool is_highlighted, bool draw_icone);
-    void DrawAsToolButton (GraphicsEngine &GfxContext, InputArea &area);
-    void Enable (bool b);
-    bool isEnabled() const;
-
-    void SetLabel (const TCHAR *label);
-    const TCHAR *GetLabel() const;
-    int GetUserValue() const
-    {
-      return m_UserValue;
-    }
-
-//    void SetMenu(MenuPage* menu);
-//    MenuPage* GetMenu() const;
-
-    void SetFont (ObjectPtr<FontTexture> font);
-    void SetIcon (const BaseTexture* icon);
-    const BaseTexture* GetIcon();
-
-    sigc::signal<void> sigAction;
-
-  private:
-    //! A value defined by the user at construction time.
-    int m_UserValue;
-    BaseTexture* m_Icon;
-    std::string m_Label;
-    bool m_IsActivated;
-    MenuPage *m_Menu;
-    bool m_Enable;
-
-    friend class MenuBar;
-    friend class MenuPage;
-  };
-
-
-
-}
-
-#endif // ACTIONITEM_H

=== removed file 'Nux/AnimatedTextureArea.cpp'
--- Nux/AnimatedTextureArea.cpp	2012-10-02 07:32:55 +0000
+++ Nux/AnimatedTextureArea.cpp	1970-01-01 00:00:00 +0000
@@ -1,132 +0,0 @@
-/*
- * Copyright 2010 Inalogic® Inc.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License, as
- * published by the  Free Software Foundation; either version 2.1 or 3.0
- * of the License.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the applicable version of the GNU Lesser General Public
- * License for more details.
- *
- * You should have received a copy of both the GNU Lesser General Public
- * License along with this program. If not, see <http://www.gnu.org/licenses/>
- *
- * Authored by: Jay Taoko <[e-mail]>
- *
- */
-
-
-#include "Nux.h"
-#include "NuxGraphics/ImageSurface.h"
-#include "AnimatedTextureArea.h"
-
-namespace nux
-{
-
-  AnimatedTextureArea::AnimatedTextureArea(NUX_FILE_LINE_DECL)
-    :   View(NUX_FILE_LINE_PARAM)
-    ,   m_UserTexture(0)
-  {
-    SetMinMaxSize(32, 32);
-
-    mouse_down.connect(sigc::mem_fun(this, &AnimatedTextureArea::RecvMouseDown));
-    mouse_drag.connect(sigc::mem_fun(this, &AnimatedTextureArea::RecvMouseDrag));
-
-    m_TimerFunctor = new TimerFunctor();
-    m_TimerFunctor->tick.connect(sigc::mem_fun(this, &AnimatedTextureArea::TimerNextFrame));
-  }
-
-  AnimatedTextureArea::~AnimatedTextureArea()
-  {
-    GetTimer().RemoveTimerHandler(m_TimerHandler);
-    m_TimerHandler = 0;
-    delete m_TimerFunctor;
-    m_TimerFunctor = 0;
-  }
-
-  void AnimatedTextureArea::Draw(GraphicsEngine &graphics_engine, bool /* force_draw */)
-  {
-    if (m_UserTexture)
-    {
-      GetPainter().PaintBackground(graphics_engine, GetGeometry());
-      graphics_engine.GetRenderStates().SetBlend(true, GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-      nux::Geometry base = GetGeometry();
-      nux::TexCoordXForm texxform;
-      graphics_engine.QRP_1Tex(base.x, base.y, base.width, base.height, m_UserTexture->GetDeviceTexture(), texxform, nux::color::White);
-
-      graphics_engine.GetRenderStates().SetBlend(false);
-    }
-  }
-  void AnimatedTextureArea::DrawContent(GraphicsEngine & /* graphics_engine */, bool /* force_draw */)
-  {
-
-  }
-
-  void AnimatedTextureArea::SetTexture(TextureFrameAnimation *t)
-  {
-    m_UserTexture = t;
-
-    if (m_UserTexture)
-    {
-      ObjectPtr< CachedTextureFrameAnimation > Texture = GetGraphicsDisplay()->GetGraphicsEngine()->CacheResource(m_UserTexture);
-      ObjectPtr<IOpenGLAnimatedTexture> AnimatedTexture = Texture->m_Texture; //Texture->m_Texture.CastRef<IOpenGLAnimatedTexture>();
-      ObjectPtr<IOpenGLBaseTexture> Texture2D = Texture->m_Texture; //Texture->m_Texture.CastRef<IOpenGLAnimatedTexture>();
-
-      AnimatedTexture->SetFiltering(GL_LINEAR, GL_LINEAR);
-      AnimatedTexture->SetWrap(GL_CLAMP, GL_CLAMP, GL_CLAMP);
-    }
-
-    QueueDraw();
-  }
-
-  void AnimatedTextureArea::RecvMouseDown(int x, int y, long /* button_flags */, long /* key_flags */)
-  {
-    sigMouseDown.emit(x, y);
-  }
-
-  void AnimatedTextureArea::RecvMouseDrag(int x, int y, int /* dx */, int /* dy */, unsigned long /* button_flags */, unsigned long /* key_flags */)
-  {
-    sigMouseDrag.emit(x, y);
-  }
-
-  void AnimatedTextureArea::StartAnimation()
-  {
-    if (m_TimerHandler.IsValid())
-    {
-      GetTimer().RemoveTimerHandler(m_TimerHandler);
-      m_TimerHandler = 0;
-    }
-
-    m_TimerHandler = GetTimer().AddOneShotTimer(41, m_TimerFunctor, 0);
-    QueueDraw();
-  }
-
-  void AnimatedTextureArea::StopAnimation()
-  {
-    if (m_TimerHandler.IsValid())
-    {
-      GetTimer().RemoveTimerHandler(m_TimerHandler);
-      m_TimerHandler = 0;
-    }
-  }
-
-  void AnimatedTextureArea::TimerNextFrame(void * /* v */)
-  {
-    if (m_UserTexture)
-    {
-      ObjectPtr< CachedTextureFrameAnimation > Texture = GetGraphicsDisplay()->GetGraphicsEngine()->CacheResource(m_UserTexture);
-      ObjectPtr<IOpenGLAnimatedTexture> AnimatedTexture = Texture->m_Texture; //Texture->m_Texture.CastRef<IOpenGLAnimatedTexture>();
-      ObjectPtr<IOpenGLBaseTexture> Texture2D = Texture->m_Texture; //Texture->m_Texture.CastRef<IOpenGLAnimatedTexture>();
-
-      AnimatedTexture->PresentNextFrame();
-      m_TimerHandler = GetTimer().AddOneShotTimer(41, m_TimerFunctor, 0);
-    }
-
-    QueueDraw();
-  }
-
-}

=== removed file 'Nux/AnimatedTextureArea.h'
--- Nux/AnimatedTextureArea.h	2012-10-02 07:32:55 +0000
+++ Nux/AnimatedTextureArea.h	1970-01-01 00:00:00 +0000
@@ -1,60 +0,0 @@
-/*
- * Copyright 2010 Inalogic® Inc.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License, as
- * published by the  Free Software Foundation; either version 2.1 or 3.0
- * of the License.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the applicable version of the GNU Lesser General Public
- * License for more details.
- *
- * You should have received a copy of both the GNU Lesser General Public
- * License along with this program. If not, see <http://www.gnu.org/licenses/>
- *
- * Authored by: Jay Taoko <[e-mail]>
- *
- */
-
-
-#ifndef ANIMATEDTEXTUREAREA_H
-#define ANIMATEDTEXTUREAREA_H
-
-#include "NuxGraphics/GraphicsEngine.h"
-#include "TimerProc.h"
-
-namespace nux
-{
-
-  class AnimatedTextureArea : public View
-  {
-  public:
-    AnimatedTextureArea(NUX_FILE_LINE_PROTO);
-    ~AnimatedTextureArea();
-    virtual void Draw(GraphicsEngine &graphics_engine, bool force_draw);
-    virtual void DrawContent(GraphicsEngine &graphics_engine, bool force_draw);
-
-    void SetTexture(TextureFrameAnimation *Texture);
-    void RecvMouseDown(int x, int y, long button_flags, long key_flags);
-    void RecvMouseDrag(int x, int y, int dx, int dy, unsigned long button_flags, unsigned long key_flags);
-
-    sigc::signal<void, int, int> sigMouseDown;
-    sigc::signal<void, int, int> sigMouseDrag;
-
-    void StartAnimation();
-    void StopAnimation();
-
-
-  private:
-    void TimerNextFrame(void *v);
-    TimerFunctor *m_TimerFunctor;
-    TimerHandle m_TimerHandler;
-
-    TextureFrameAnimation *m_UserTexture;
-  };
-
-}
-#endif // ANIMATEDTEXTUREAREA_H

=== modified file 'Nux/Area.cpp'
--- Nux/Area.cpp	2014-09-17 01:24:39 +0000
+++ Nux/Area.cpp	2014-10-24 19:52:50 +0000
@@ -25,11 +25,6 @@
 #include "NuxGraphics/GraphicsEngine.h"
 #include "Layout.h"
 #include "BaseWindow.h"
-#if !defined(NUX_MINIMAL)
-#  include "VSplitter.h"
-#  include "HSplitter.h"
-#  include "MenuPage.h"
-#endif
 
 #ifdef NUX_GESTURES_SUPPORT
 #include "NuxGraphics/GestureEvent.h"
@@ -522,18 +517,7 @@
 
       if (ic->CanBreakLayout())
       {
-#if !defined(NUX_MINIMAL)
-        if ((child != 0) && (ic->Type().IsObjectType(VSplitter::StaticObjectType) || ic->Type().IsObjectType(HSplitter::StaticObjectType)))
-        {
-          // If this element is a Splitter, then we submit its child to the refresh list. We don't want to submit the
-          // splitter because this will cause a redraw of all parts of the splitter(costly and unnecessary).
-          window_thread_->QueueObjectLayout(child);
-        }
-        else
-#endif
-        {
-          window_thread_->QueueObjectLayout(ic);
-        }
+        window_thread_->QueueObjectLayout(ic);
       }
       else if (ic->parent_area_)
       {
@@ -563,22 +547,7 @@
 
           if (ic->CanBreakLayout())
           {
-#if !defined(NUX_MINIMAL)
-            if ((child != 0) &&
-                (ic->Type().IsObjectType(VSplitter::StaticObjectType) ||
-                 ic->Type().IsObjectType(HSplitter::StaticObjectType)))
-            {
-              // If the parent of this element is a splitter, then we submit
-              // its child to the refresh list. We don't want to submit the
-              // splitter because this will cause a redraw of all parts of the
-              // splitter(costly and unnecessary).
-              window_thread_->QueueObjectLayout(this);
-            }
-            else
-#endif
-            {
-              window_thread_->QueueObjectLayout(ic);
-            }
+            window_thread_->QueueObjectLayout(ic);
           }
           else
           {
@@ -790,11 +759,7 @@
 
   Geometry Area::GetAbsoluteGeometry() const
   {
-    if (Type().IsDerivedFromType(BaseWindow::StaticObjectType) ||
-#if !defined(NUX_MINIMAL)
-      Type().IsDerivedFromType(MenuPage::StaticObjectType) ||
-#endif
-      (this == window_thread_->GetLayout()))
+    if (Type().IsDerivedFromType(BaseWindow::StaticObjectType) || (this == window_thread_->GetLayout()))
     {
       // Do not apply the _2D_xform matrix  to a BaseWindow or the main layout
       return geometry_;
@@ -972,18 +937,7 @@
        return false;
      }
 
-     bool mouse_pointer_inside_area = false;
-#if !defined(NUX_MINIMAL)
-     if (Type().IsDerivedFromType(MenuPage::StaticObjectType))
-     {
-       // A MenuPage geometry is already in absolute coordinates.
-       mouse_pointer_inside_area = geometry_.IsInside(mouse_position);
-     }
-     else
-#endif
-     {
-       mouse_pointer_inside_area = GetAbsoluteGeometry().IsInside(mouse_position);
-     }
+     bool mouse_pointer_inside_area = GetAbsoluteGeometry().IsInside(mouse_position);
 
      if ((event_type == NUX_MOUSE_WHEEL) && mouse_pointer_inside_area)
      {
@@ -1009,18 +963,7 @@
        return false;
      }
 
-     bool mouse_pointer_inside_area = false;
-#if !defined(NUX_MINIMAL)
-     if (Type().IsDerivedFromType(MenuPage::StaticObjectType))
-     {
-       // A MenuPage geometry is already in absolute coordinates.
-       mouse_pointer_inside_area = geometry_.IsInside(mouse_position);
-     }
-     else
-#endif
-     {
-       mouse_pointer_inside_area = GetAbsoluteGeometry().IsInside(mouse_position);
-     }
+     bool mouse_pointer_inside_area = GetAbsoluteGeometry().IsInside(mouse_position);
 
      return mouse_pointer_inside_area;
    }

=== modified file 'Nux/Area.h'
--- Nux/Area.h	2012-11-12 20:59:56 +0000
+++ Nux/Area.h	2014-10-24 19:52:50 +0000
@@ -797,10 +797,6 @@
     friend class View;
     friend class WindowCompositor;
     friend class WindowThread;
-#if !defined(NUX_MINIMAL)
-    friend class HSplitter;
-    friend class VSplitter;
-#endif
   };
 }
 #endif // BASEOBJECT_H

=== modified file 'Nux/BaseWindow.cpp'
--- Nux/BaseWindow.cpp	2013-10-30 20:50:47 +0000
+++ Nux/BaseWindow.cpp	2014-10-24 19:52:50 +0000
@@ -240,7 +240,6 @@
 
   }
 
-#if defined(NUX_OS_LINUX)
   void BaseWindow::EnableInputWindow(bool        b,
                                       const char* title,
                                       bool        take_focus,
@@ -328,8 +327,6 @@
 #endif
   }
 
-#endif
-
   void BaseWindow::SetGeometry(const Geometry &geo)
   {
     Area::SetGeometry(geo);

=== modified file 'Nux/BaseWindow.h'
--- Nux/BaseWindow.h	2013-10-30 20:50:47 +0000
+++ Nux/BaseWindow.h	2014-10-24 19:52:50 +0000
@@ -42,7 +42,6 @@
   typedef BaseWindow ViewWindow;
 
   class HLayout;
-  class PopUpWindow;
 
 #ifdef NUX_GESTURES_SUPPORT
     class GestureEvent;
@@ -150,7 +149,6 @@
     void  SetOpacity(float opacity);
     float GetOpacity();
 
-    #if defined(NUX_OS_LINUX)
     void EnableInputWindow(bool        b,
                             const char* title = "nux input window",
                             bool        take_focus = False,
@@ -165,7 +163,6 @@
 
     void SetInputFocus();
     Window GetInputWindowId();
-    #endif
 
     //! Set an InputArea to receive the keyboard focus when the BaseWIndow receives the NUX_WINDOW_ENTER_FOCUS event.
     /*!

=== removed file 'Nux/Canvas.cpp'
--- Nux/Canvas.cpp	2012-09-26 06:44:12 +0000
+++ Nux/Canvas.cpp	1970-01-01 00:00:00 +0000
@@ -1,208 +0,0 @@
-/*
- * Copyright (C) 2011 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * 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/>.
- *
- * Authored by: Mirco Müller <[e-mail]
- */
-
-
-#include "Canvas.h"
-
-namespace nux
-{
-  Canvas::Canvas (NUX_FILE_LINE_DECL) : View (NUX_FILE_LINE_PARAM)
-  {
-    _surface     = NULL;
-    _cr          = NULL;
-    _last_width  = 0;
-    _last_height = 0;
-    _invalid     = true;
-    _texture     = NULL;
-  }
-
-  Canvas::~Canvas ()
-  {
-    cairo_surface_destroy (_surface);
-    cairo_destroy (_cr);
-    _texture->UnReference ();
-  }
-
-  void Canvas::Recreate ()
-  {
-    if (_surface)
-      cairo_surface_destroy (_surface);
-
-    if (_cr)
-      cairo_destroy (_cr);
-
-    if (_last_width < 1 || _last_height < 1) {
-      g_debug ("Width or height of view invalid!");
-      return;
-    }
-
-    _surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
-                                           _last_width,
-                                           _last_height);
-
-    if (cairo_surface_status (_surface) != CAIRO_STATUS_SUCCESS) {
-      g_debug ("Could not create image-surface!");
-      return;
-    }
-
-    _cr = cairo_create (_surface);
-    if (cairo_status (_cr) != CAIRO_STATUS_SUCCESS) {
-      cairo_surface_destroy (_surface);
-      g_debug ("Could not create cairo-context!");
-      return;
-    }
-
-    cairo_set_operator (_cr, CAIRO_OPERATOR_CLEAR);
-    cairo_paint (_cr);
-    _invalid = false;
-  }
-
-  NBitmapData* Canvas::GetBitmap ()
-  {
-    if (_last_width < 1 || _last_height < 1) {
-      g_debug ("Width or height invalid!");
-      return NULL;
-    }
-
-    BitmapFormat  bitmap_format = BITFMT_B8G8R8A8;
-    NTextureData* bitmap_data   = new NTextureData (bitmap_format,
-                                                    _last_width,
-                                                    _last_height,
-                                                    1);
-    unsigned char*  ptr           = cairo_image_surface_get_data (_surface);
-    int             stride        = cairo_image_surface_get_stride (_surface);
-
-    if (ptr == NULL || stride == 0) {
-      g_debug ("Invalid surface!");
-
-      delete bitmap_data;
-      return NULL;
-    }
-
-    for (int j = 0; j < _last_height; j++) {
-      Memcpy (bitmap_data->GetSurface (0).GetPtrRawData() + j * bitmap_data->GetSurface (0).GetPitch(),
-                (const void *) (&ptr[j * stride]),
-                _last_width * GPixelFormats[bitmap_format].NumComponents);
-    }
-
-    return bitmap_data;
-  }
-
-  cairo_surface_t* Canvas::GetCairoSurface ()
-  {
-    return _surface;
-  }
-
-  cairo_t* Canvas::GetCairoContext ()
-  {
-    return _cr;
-  }
-
-  int Canvas::GetLastWidth ()
-  {
-    return _last_width;
-  }
-
-  int Canvas::GetLastHeight ()
-  {
-    return _last_height;
-  }
-
-  // this is really just a stub... Canvas::Paint() being declared as virtual is
-  // meant to be overwritten by a derived class anyway in real-world scenario
-  // whatever needs to be drawn (and adapt to size) happens here in Paint()
-  void Canvas::Paint ()
-  {
-    cairo_t* cr = GetCairoContext ();
-
-    if (cairo_status (cr) != CAIRO_STATUS_SUCCESS)
-      return;
-
-    cairo_scale (cr, 1.0, 1.0);
-    cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
-    cairo_rectangle (cr,
-                     0.0f,
-                     0.0f,
-                     (double) GetLastWidth (),
-                     (double) GetLastHeight ());
-    cairo_set_source_rgba (cr, 1.0f, 0.0f, 0.0f, 1.0f);
-    cairo_fill_preserve (cr);
-    cairo_set_source_rgba (cr, 1.0f, 1.0f, 1.0f, 1.0f);
-    cairo_stroke (cr);
-    //cairo_surface_write_to_png (GetCairoSurface (), "/tmp/surf-debug.png");      
-  }
-
-  void Canvas::Draw (GraphicsEngine& graphics_engine, bool /* forceDraw */)
-  {
-    Geometry geom = GetGeometry ();
-
-    // see if the (cairo-drawn) texture needs to be updated
-    if (_invalid || _last_width != geom.width || _last_height != geom.height) {
-      _last_width = geom.width;
-      _last_height = geom.height;
-      Recreate ();
-      Paint ();
-      NBitmapData* bitmap = GetBitmap ();
-      if (_texture)
-        _texture->UnReference ();
-      _texture = GetGraphicsDisplay()->GetGpuDevice()->CreateSystemCapableTexture ();
-      _texture->Update (bitmap);
-      delete bitmap;
-    }
-
-    // draw the texture on screen
-    graphics_engine.PushClippingRectangle (geom);
-
-    GetWindowThread()->GetGraphicsEngine().GetRenderStates().SetBlend (false);
-
-    TexCoordXForm texxform;
-    texxform.SetWrap(TEXWRAP_CLAMP, TEXWRAP_CLAMP);
-    texxform.SetTexCoordType(TexCoordXForm::OFFSET_COORD);
-
-    graphics_engine.QRP_1Tex(geom.x,
-                         geom.y,
-                         geom.width,
-                         geom.height,
-                         _texture->GetDeviceTexture (),
-                         texxform,
-                         Color (1.0f, 1.0f, 1.0f, 1.0f));
-
-    graphics_engine.PopClippingRectangle();
-  }
-
-  void Canvas::DrawContent(GraphicsEngine& /* graphics_engine */, bool /* forceDraw */)
-  {
-  }
-
-  void Canvas::Invalidate()
-  {
-    _invalid = true;
-  }
-
-  void Canvas::PreLayoutManagement()
-  {
-    View::PreLayoutManagement();
-  }
-
-  long Canvas::PostLayoutManagement(long layoutResult)
-  {
-    long result = View::PostLayoutManagement(layoutResult);
-
-    return result;
-  }
-}

=== removed file 'Nux/Canvas.h'
--- Nux/Canvas.h	2011-10-19 22:12:33 +0000
+++ Nux/Canvas.h	1970-01-01 00:00:00 +0000
@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2011 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * 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/>.
- *
- * Authored by: Mirco Müller <[e-mail]
- */
-
-#ifndef CANVAS_H
-#define CANVAS_H
-
-#include <cairo.h>
-
-#include "Nux/Nux.h"
-#include "Nux/View.h"
-
-namespace nux
-{
-  class Canvas : public View
-  {
-    public:
-      Canvas (NUX_FILE_LINE_DECL);
-      ~Canvas ();
-
-    protected:
-      void Draw (GraphicsEngine& graphics_engine, bool forceDraw);
-      void DrawContent (GraphicsEngine& graphics_engine, bool forceDraw);
-      virtual void Paint ();
-      void Invalidate ();
-
-      cairo_surface_t* GetCairoSurface ();
-      cairo_t*         GetCairoContext ();
-      int              GetLastWidth ();
-      int              GetLastHeight ();
-
-    private:
-      void             PreLayoutManagement ();
-      long             PostLayoutManagement (long layoutResult);
-      void             Recreate ();
-      NBitmapData*     GetBitmap ();
-
-    private:
-      cairo_t*         _cr;
-      cairo_surface_t* _surface;
-      int              _last_width;
-      int              _last_height;
-      bool             _invalid;
-      BaseTexture*     _texture;
-  };
-}
-
-#endif // CANVAS_H

=== removed file 'Nux/CheckBox.cpp'
--- Nux/CheckBox.cpp	2012-11-05 21:31:06 +0000
+++ Nux/CheckBox.cpp	1970-01-01 00:00:00 +0000
@@ -1,110 +0,0 @@
-/*
- * Copyright 2010 Inalogic® Inc.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License, as
- * published by the  Free Software Foundation; either version 2.1 or 3.0
- * of the License.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the applicable version of the GNU Lesser General Public
- * License for more details.
- *
- * You should have received a copy of both the GNU Lesser General Public
- * License along with this program. If not, see <http://www.gnu.org/licenses/>
- *
- * Authored by: Jay Taoko <[e-mail]>
- *
- */
-
-
-#include "Nux.h"
-#include "HLayout.h"
-#include "CheckBox.h"
-#include "StaticText.h"
-
-namespace nux
-{
-  NUX_IMPLEMENT_OBJECT_TYPE(CheckBox);
-  
-  CheckBox::CheckBox(const std::string &str, bool state, NUX_FILE_LINE_DECL)
-    : AbstractCheckedButton(str, state, NUX_FILE_LINE_PARAM)
-  {
-  }
-
-  CheckBox::~CheckBox()
-  {
-  }
-
-  void CheckBox::Draw(GraphicsEngine &graphics_engine, bool /* force_draw */)
-  {
-    Geometry base = GetGeometry();
-    graphics_engine.PushClippingRectangle(base);
-
-    InteractState is;
-    is.is_on = active_;
-
-    if (visual_state_ == VISUAL_STATE_PRESSED)
-    {
-      is.is_focus = true;
-    }
-    else if (visual_state_ == VISUAL_STATE_PRELIGHT)
-    {
-      is.is_prelight = true;
-    }
-    else
-    {
-      is.is_focus = false;
-      is.is_prelight = false;
-    }
-
-    GetPainter().PushPaintLayerStack();
-    {
-      GetPainter().PaintCheckBox(graphics_engine, check_area_->GetGeometry(), is, Color(0xff000000));
-      static_text_->ProcessDraw(graphics_engine, true);
-    }
-    GetPainter().PopPaintLayerStack();
-
-    graphics_engine.PopClippingRectangle();
-  }
-
-  void CheckBox::RecvClick(int /* x */, int /* y */, unsigned long /* button_flags */, unsigned long /* key_flags */)
-  {
-    active_ = !active_;
-
-    click.emit(this);
-    state_change.emit(this);
-    QueueDraw();
-  }
-
-  void CheckBox::Activate()
-  {
-    if (active_ == true)
-    {
-      // already active
-      return;
-    }
-
-    active_ = true;
-    state_change.emit(this);
-    QueueDraw();
-  }
-
-  void CheckBox::Deactivate()
-  {
-    if (active_ == false)
-      return;
-
-    if (active_ == false)
-    {
-      // already deactivated
-      return;
-    }
-
-    active_ = false;
-    state_change.emit(this);
-    QueueDraw();
-  }
-}

=== removed file 'Nux/CheckBox.h'
--- Nux/CheckBox.h	2013-11-04 14:15:32 +0000
+++ Nux/CheckBox.h	1970-01-01 00:00:00 +0000
@@ -1,89 +0,0 @@
-/*
- * Copyright 2010 Inalogic® Inc.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License, as
- * published by the  Free Software Foundation; either version 2.1 or 3.0
- * of the License.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the applicable version of the GNU Lesser General Public
- * License for more details.
- *
- * You should have received a copy of both the GNU Lesser General Public
- * License along with this program. If not, see <http://www.gnu.org/licenses/>
- *
- * Authored by: Jay Taoko <[e-mail]>
- *
- */
-
-
-#ifndef CHECKBOX_H
-#define CHECKBOX_H
-
-#include "AbstractCheckedButton.h"
-
-namespace nux
-{
-  class HLayout;
-  class InputArea;
-  class StaticText;
-
-  //! CheckBox class
-  /*!
-      A CheckBox class.\n
-      The CheckBox class cannot be vertically resized. It can only be resized horizontally.
-      The vertical size is always match the size of the content (check area + label).
-  */
-  class CheckBox: public AbstractCheckedButton
-  {
-    NUX_DECLARE_OBJECT_TYPE(CheckBox, AbstractCheckedButton);
-  public:
-    CheckBox(const std::string &str, bool state = false, NUX_FILE_LINE_PROTO);
-    virtual ~CheckBox();
-
-    //! Emitted when the button is clicked.
-    sigc::signal<void, CheckBox*> click;
-
-    //! Emitted when the active state changes.
-    /*!
-        Emitted when the active state changes, as a result of a mouse click or an API call.\n
-        \sa Activate, Deactivate.
-    */
-    sigc::signal<void, CheckBox*> state_change;
-
-    //! Activate the check box.
-    /*!
-         Activate the check box.
-    */
-    virtual void Activate();
-
-    //! Deactivate the check box.
-    /*!
-         Deactivate the check box.
-    */
-    virtual void Deactivate();
-
-  protected:
-    virtual void Draw(GraphicsEngine &graphics_engine, bool force_draw);
-    virtual void RecvClick(int x, int y, unsigned long button_flags, unsigned long key_flags);
-
-  private:
-    //! Override of Area::SetMinimumHeight and made private.
-    /*!
-        Prevent changing the minimum height of the StaticText view.
-    */
-    virtual void SetMinimumHeight(int h){};
-
-    //! Override of Area::SetMaximumHeight and made private.
-    /*!
-        Prevent changing the maximum height of the StaticText view.
-    */
-    virtual void SetMaximumHeight(int h){};
-  };
-
-}
-
-#endif // CHECKBOX_H

=== removed file 'Nux/ClientArea.cpp'
--- Nux/ClientArea.cpp	2012-11-16 18:52:32 +0000
+++ Nux/ClientArea.cpp	1970-01-01 00:00:00 +0000
@@ -1,231 +0,0 @@
-/*
- * Copyright 2010 Inalogic® Inc.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License, as
- * published by the  Free Software Foundation; either version 2.1 or 3.0
- * of the License.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the applicable version of the GNU Lesser General Public
- * License for more details.
- *
- * You should have received a copy of both the GNU Lesser General Public
- * License along with this program. If not, see <http://www.gnu.org/licenses/>
- *
- * Authored by: Jay Taoko <[e-mail]>
- *
- */
-
-
-#include "Nux.h"
-
-#if defined(NUX_OS_WINDOWS)
-  #include "NuxGraphics/GraphicsDisplay.h"
-#elif defined(NUX_OS_LINUX)
-  #include "NuxGraphics/GraphicsDisplay.h"
-#endif
-
-#include "NuxGraphics/GraphicsEngine.h"
-#include "TimerProc.h"
-#include "ClientArea.h"
-
-namespace nux
-{
-
-  ClientArea::ClientArea(NUX_FILE_LINE_DECL)
-    :   View(NUX_FILE_LINE_PARAM)
-  {
-    m_IsClientAreaEnabled = false;
-    SetMinimumSize(DEFAULT_WIDGET_WIDTH, 4 * PRACTICAL_WIDGET_HEIGHT);
-
-    mouse_down.connect(sigc::mem_fun(this, &ClientArea::RecvMouseDown));
-    mouse_up.connect(sigc::mem_fun(this, &ClientArea::RecvMouseUp));
-    mouse_drag.connect(sigc::mem_fun(this, &ClientArea::RecvMouseDrag));
-    mouse_move.connect(sigc::mem_fun(this, &ClientArea::RecvMouseMove));
-    key_down.connect(sigc::mem_fun(this, &ClientArea::RecvKeyEvent));
-  }
-
-  ClientArea::~ClientArea()
-  {
-  }
-
-  void ClientArea::BeginDraw(GraphicsEngine& graphics_engine, bool force_draw)
-  {
-    // if ((IsRedrawNeeded() == false) && (force_draw == false))
-    //   return;
-
-    // Save blend states
-    unsigned int current_alpha_blend;
-    unsigned int current_src_blend_factor;
-    unsigned int current_dest_blend_factor;
-    graphics_engine.GetRenderStates().GetBlend(current_alpha_blend, current_src_blend_factor, current_dest_blend_factor);
-
-    ObjectPtr<IOpenGLFrameBufferObject> prev_fbo_ = GetGraphicsDisplay()->GetGpuDevice()->GetCurrentFrameBufferObject();
-    Geometry prev_viewport_ = graphics_engine.GetViewportRect();
-
-    if (GetWindowThread()->GetGraphicsDisplay().HasFrameBufferSupport())
-    {
-      int width = GetWidth();
-      int height = GetHeight();
-
-      m_ctx.x = GetX();
-      m_ctx.y = GetY();
-      m_ctx.width  = width;
-      m_ctx.height = height;
-
-      // A is obtained from graphics_engine. So A dimension's are in relative window coordinates.
-      Rect A = graphics_engine.GetClippingRegion();
-      Rect B = Rect(m_ctx.x, m_ctx.y, m_ctx.width, m_ctx.height);
-      Rect C = A.Intersect(B);
-
-      m_ctx.x_clipregion = C.x;
-      m_ctx.y_clipregion = C.y;
-      m_ctx.width_clipregion  = C.GetWidth();
-      m_ctx.height_clipregion = C.GetHeight();
-
-      //ObjectPtr<IOpenGLFrameBufferObject> prevFBO = GetGraphicsDisplay()->GetGpuDevice()->GetCurrentFrameBufferObject();
-
-      if (m_FrameBufferObject.IsNull())
-      {
-        // Create the fbo before using it for the first time.
-        m_FrameBufferObject = GetGraphicsDisplay()->GetGpuDevice()->CreateFrameBufferObject();
-      }
-
-      if (!m_MainColorRT.IsValid() || (m_MainColorRT->GetWidth() != width) || (m_MainColorRT->GetHeight() != height))
-      {
-        // Create or resize the color and depth textures before using them.
-        m_MainColorRT = GetGraphicsDisplay()->GetGpuDevice()->CreateSystemCapableDeviceTexture(width, height, 1, BITFMT_R8G8B8A8, NUX_TRACKER_LOCATION);
-        m_MainDepthRT = GetGraphicsDisplay()->GetGpuDevice()->CreateSystemCapableDeviceTexture(width, height, 1, BITFMT_D24S8, NUX_TRACKER_LOCATION);
-      }
-
-      m_FrameBufferObject->FormatFrameBufferObject(width, height, BITFMT_R8G8B8A8);
-      m_FrameBufferObject->EmptyClippingRegion();
-      m_FrameBufferObject->SetTextureAttachment(0, m_MainColorRT, 0);
-      m_FrameBufferObject->SetDepthTextureAttachment(m_MainDepthRT, 0);
-      m_FrameBufferObject->Activate();
-
-      graphics_engine.SetViewport(0, 0, width, height);
-
-
-      ClientDraw(graphics_engine, m_ctx, force_draw);
-    }
-
-    if (prev_fbo_.IsValid())
-    {
-      // Restore the previous fbo
-      prev_fbo_->Activate();
-
-      prev_fbo_->ApplyClippingRegion();
-    }
-
-    // Restore the matrices and the view port.
-    graphics_engine.ApplyModelViewMatrix();
-    graphics_engine.SetOrthographicProjectionMatrix(prev_viewport_.width, prev_viewport_.height);
-    graphics_engine.SetViewport(prev_viewport_.x, prev_viewport_.y, prev_viewport_.width, prev_viewport_.height);    
-
-    {
-      unsigned int w, h;
-      w = m_MainColorRT->GetWidth();
-      h = m_MainColorRT->GetHeight();
-      int x = m_ctx.x;
-      int y = m_ctx.y;
-
-      TexCoordXForm texxform0;
-      texxform0.uwrap = TEXWRAP_CLAMP;
-      texxform0.vwrap = TEXWRAP_CLAMP;
-      texxform0.FlipVCoord(true);
-      GetGraphicsDisplay()->GetGraphicsEngine()->QRP_1Tex(x, y, w, h, m_MainColorRT, texxform0, Color(color::White));
-    }
-
-    // restore blend states
-    graphics_engine.GetRenderStates().SetBlend(current_alpha_blend, current_src_blend_factor, current_dest_blend_factor);
-  }
-
-  void ClientArea::Draw(GraphicsEngine & /* graphics_engine */, bool /* force_draw */)
-  {
-    // don't draw here or we risk drawing more than one time.
-    //BeginDraw(graphics_engine, force_draw);
-  }
-
-  void ClientArea::DrawContent(GraphicsEngine &graphics_engine, bool force_draw)
-  {
-    BeginDraw(graphics_engine, force_draw);
-
-  }
-
-  void ClientArea::ClientDraw(GraphicsEngine & /* graphics_engine */, DrawAreaContext & /* ctx */, bool /* force_draw */)
-  {
-    glClearColor(0, 0, 0, 1);
-    glClear(GL_COLOR_BUFFER_BIT);
-  }
-
-  void ClientArea::SetClientViewport(GraphicsEngine &graphics_engine)
-  {
-    if (GetWindowThread()->GetGraphicsDisplay().HasFrameBufferSupport())
-    {
-      graphics_engine.SetViewport(0, 0, m_FrameBufferObject->GetWidth(), m_FrameBufferObject->GetHeight());
-      m_FrameBufferObject->EmptyClippingRegion();
-    }
-    else
-    {
-      int window_height = graphics_engine.GetViewportHeight();
-
-      graphics_engine.SetViewport(
-        m_ctx.x, window_height - m_ctx.y - m_ctx.height, m_ctx.width, m_ctx.height);
-
-      graphics_engine.SetOpenGLClippingRectangle(
-        m_ctx.x_clipregion,
-        window_height - m_ctx.y_clipregion - m_ctx.height_clipregion,
-        m_ctx.width_clipregion,
-        m_ctx.height_clipregion);
-    }
-  }
-
-  void ClientArea::Setup2DMode(GraphicsEngine &graphics_engine)
-  {
-    //Restore 2D ViewPort
-    graphics_engine.SetViewport(0, 0, GetBaseWidth(), GetBaseHeight());
-    graphics_engine.Push2DWindow(GetBaseWidth(), GetBaseHeight());
-
-  }
-
-
-  void ClientArea::RecvMouseDown(int /* x */, int /* y */, unsigned long /* button_flags */, unsigned long /* key_flags */)
-  {
-
-  }
-
-  void ClientArea::RecvMouseUp(int /* x */, int /* y */, unsigned long /* button_flags */, unsigned long /* key_flags */)
-  {
-
-  }
-
-  void ClientArea::RecvMouseDrag(int /* x */, int /* y */, int /* dx */, int /* dy */, unsigned long /* button_flags */, unsigned long /* key_flags */)
-  {
-
-  }
-
-  void ClientArea::RecvMouseMove(int /* x */, int /* y */, int /* dx */, int /* dy */, unsigned long /* button_flags */, unsigned long /* key_flags */)
-  {
-
-  }
-
-  void ClientArea::RecvKeyEvent(
-    unsigned long     /* event_type */,    /*event type*/
-    unsigned long     /* GetKeySym */,    /*event keysym*/
-    unsigned long     /* event_state */,    /*event state*/
-    const char*      /* event_char */,    /*character*/
-    unsigned short    /* repeat_count */     /*key repeat count*/
-  )
-  {
-
-  }
-
-  bool ClientArea::AcceptKeyNavFocus()
-  {
-    return false;
-  }
-}

=== removed file 'Nux/ClientArea.h'
--- Nux/ClientArea.h	2012-11-05 21:31:06 +0000
+++ Nux/ClientArea.h	1970-01-01 00:00:00 +0000
@@ -1,104 +0,0 @@
-/*
- * Copyright 2010 Inalogic® Inc.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License, as
- * published by the  Free Software Foundation; either version 2.1 or 3.0
- * of the License.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the applicable version of the GNU Lesser General Public
- * License for more details.
- *
- * You should have received a copy of both the GNU Lesser General Public
- * License along with this program. If not, see <http://www.gnu.org/licenses/>
- *
- * Authored by: Jay Taoko <[e-mail]>
- *
- */
-
-
-#ifndef CLIENTAREA_H
-#define CLIENTAREA_H
-
-#include "InputArea.h"
-#include "Painter.h"
-#include "View.h"
-#include "TimerProc.h"
-
-namespace nux
-{
-
-  class ClientArea;
-
-  struct ClientAreaDraw
-  {
-    ClientArea *clientarea;
-    Geometry clipgeometry;
-  };
-
-  class ClientArea: public View
-  {
-  public:
-    ClientArea(NUX_FILE_LINE_PROTO);
-    ~ClientArea();
-
-    virtual void BeginDraw(GraphicsEngine &graphics_engine, bool force_draw);
-    virtual void Draw(GraphicsEngine &graphics_engine, bool force_draw);
-    virtual void DrawContent(GraphicsEngine &graphics_engine, bool force_draw);
-
-    void EnableClientDraw(bool b)
-    {
-      m_IsClientAreaEnabled = b;
-    };
-    bool IsClientDrawEnabled() const
-    {
-      return m_IsClientAreaEnabled;
-    };
-
-    virtual void ClientDraw(GraphicsEngine &graphics_engine, DrawAreaContext &ctx, bool force_draw);
-    virtual void RecvMouseDown(int x, int y, unsigned long button_flags, unsigned long key_flags);
-    virtual void RecvMouseUp(int x, int y, unsigned long button_flags, unsigned long key_flags);
-    virtual void RecvMouseDrag(int x, int y, int dx, int dy, unsigned long button_flags, unsigned long key_flags);
-    virtual void RecvMouseMove(int x, int y, int dx, int dy, unsigned long button_flags, unsigned long key_flags);
-    virtual void RecvKeyEvent(
-      unsigned long       ,   /*event type*/
-      unsigned long       ,   /*event keysym*/
-      unsigned long       ,   /*event state*/
-      const char*        ,   /*character*/
-      unsigned short          /*key repeat count*/
-    );
-
-    sigc::signal<void, DrawAreaContext, bool> sigClientDraw;
-    void SetClientViewport(GraphicsEngine &graphics_engine);
-    void Setup2DMode(GraphicsEngine &graphics_engine);
-
-    // Before the client start drawing we set up a framebuffer object. We don't want the client to start messing
-    // up the whole rendering by. If we setup a framebuffer instead, the client can never know the framebuffer
-    // we use fror the whole rendering. all we have to do is to copy the client framebuffer into the main framebuffer
-    // after the client as finished with the draw.
-    ObjectPtr<IOpenGLFrameBufferObject>& GetWindowFrameBufferObject()
-    {
-      return m_FrameBufferObject;
-    }
-    ObjectPtr<IOpenGLFrameBufferObject> m_FrameBufferObject;
-
-  protected:
-    virtual bool AcceptKeyNavFocus();
-
-  private:
-    // We use Rectangle texture to attach to the framebuffer because some GPU like the Geforce FX 5600 do not
-    // have support for ARB_texture_non_power_of_two. However it does support ARB_texture_recatangle.
-    ObjectPtr<IOpenGLBaseTexture> m_MainColorRT;
-    ObjectPtr<IOpenGLBaseTexture> m_MainDepthRT;
-
-    DrawAreaContext m_ctx;
-    bool m_IsClientAreaEnabled;
-  };
-
-
-}
-
-#endif // CLIENTAREA_H

=== removed file 'Nux/ColorEditor.cpp'
--- Nux/ColorEditor.cpp	2013-04-08 14:02:32 +0000
+++ Nux/ColorEditor.cpp	1970-01-01 00:00:00 +0000
@@ -1,1042 +0,0 @@
-/*
- * Copyright 2010 Inalogic® Inc.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License, as
- * published by the  Free Software Foundation; either version 2.1 or 3.0
- * of the License.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the applicable version of the GNU Lesser General Public
- * License for more details.
- *
- * You should have received a copy of both the GNU Lesser General Public
- * License along with this program. If not, see <http://www.gnu.org/licenses/>
- *
- * Authored by: Jay Taoko <[e-mail]>
- *
- */
-
-
-#include "Nux.h"
-
-#include "NuxGraphics/GLSh_ColorPicker.h"
-#include "VLayout.h"
-#include "HLayout.h"
-#include "CheckBox.h"
-#include "EditTextBox.h"
-#include "RadioButton.h"
-#include "RadioButtonGroup.h"
-#include "ToggleButton.h"
-#include "Layout.h"
-#include "ColorEditor.h"
-
-namespace nux
-{
-  Size ColorEditor::picker_area_size = Size(200, 200);
-  int ColorEditor::channel_area_width = 12;
-
-  static void ThreadColorEditorDialog(NThread *thread, void *InitData)
-  {
-    VLayout *MainLayout(new VLayout(NUX_TRACKER_LOCATION));
-    ColorEditor *coloreditor(new ColorEditor());
-    coloreditor->ComputeContentSize(); // necessary so all element of the widget get their rightful size.
-    ColorDialogProxy *coloreditorproxy = static_cast<ColorDialogProxy *> (InitData);
-
-    if (coloreditorproxy)
-    {
-      coloreditor->SetRGB(coloreditorproxy->GetColor());
-      coloreditor->SetColorModel(coloreditorproxy->GetColorModel(), coloreditorproxy->GetColorChannel());
-      coloreditor->sigChange.connect(sigc::mem_fun(coloreditorproxy, &ColorDialogProxy::RecvDialogChange));
-    }
-
-    HLayout *ButtonLayout(new HLayout("Dialog Buttons", NUX_TRACKER_LOCATION));
-
-    ToggleButton *OkButton(new ToggleButton("OK", NUX_TRACKER_LOCATION));
-    OkButton->SetMinimumWidth(60);
-    OkButton->SetMinimumHeight(20);
-
-    ToggleButton *CancelButton(new ToggleButton("Cancel", NUX_TRACKER_LOCATION));
-    CancelButton->SetMinimumWidth(60);
-    CancelButton->SetMinimumHeight(20);
-
-    //FIXME - OkButton->sigClick.connect(sigc::mem_fun(static_cast<WindowThread *> (thread), &WindowThread::TerminateThread));
-    //FIXME - OkButton->sigClick.connect(sigc::bind(sigc::mem_fun(coloreditorproxy, &ColorDialogProxy::RecvDialogOk), coloreditor));
-    //FIXME - CancelButton->sigClick.connect(sigc::bind(sigc::mem_fun(coloreditorproxy, &ColorDialogProxy::RecvDialogCancel), coloreditor));
-    //FIXME - CancelButton->sigClick.connect(sigc::mem_fun(static_cast<WindowThread *> (thread), &WindowThread::TerminateThread));
-
-    ButtonLayout->SetHorizontalInternalMargin(6);
-    ButtonLayout->SetVerticalExternalMargin(2);
-    ButtonLayout->AddView(OkButton, 0);
-    ButtonLayout->AddView(CancelButton, 0);
-
-    MainLayout->AddView(coloreditor);
-    MainLayout->AddLayout(ButtonLayout, 0);
-    static_cast<WindowThread *> (thread)->SetLayout(MainLayout);
-
-    MainLayout->SetBaseWidth(1);
-    MainLayout->SetBaseHeight(1);
-    MainLayout->ComputeContentSize();
-    static_cast<WindowThread *> (thread)->SetWindowSize(MainLayout->GetBaseWidth(), MainLayout->GetBaseHeight());
-
-    // Call StopThreadMonitoring in case the dialog was close by clicking the window close button.
-    //coloreditorproxy->StopThreadMonitoring();
-  }
-
-  ColorDialogProxy::ColorDialogProxy(bool ModalWindow)
-  {
-    m_bDialogChange     = false;
-    m_bDialogRunning    = false;
-    m_ModalWindow       = ModalWindow;
-    m_RGBColor          = Color(1.0f, 1.0f, 1.0f, 1.0f);
-    m_ColorModel        = color::RGB;
-    color_channel_      = color::RED;
-  }
-
-  ColorDialogProxy::~ColorDialogProxy()
-  {
-  }
-
-  void ColorDialogProxy::Start()
-  {
-    m_PreviousRGBColor = m_RGBColor;
-
-    int Width = 290;
-    int Height = 230;
-    m_Thread = CreateModalWindowThread(WINDOWSTYLE_TOOL, "Color Editor", Width, Height, GetWindowThread(),
-                                        ThreadColorEditorDialog,
-                                        this);
-
-    if (m_Thread)
-    {
-      //todo(jaytaoko): m_DialogThreadID = m_Thread->GetThreadId();
-      m_Thread->Start(0);
-    }
-
-    m_bDialogRunning = true;
-  }
-
-  bool ColorDialogProxy::IsActive()
-  {
-    return (m_Thread && (m_Thread->GetThreadState() != THREADSTOP) && m_bDialogRunning);
-  }
-
-  void ColorDialogProxy::RecvDialogOk(ColorEditor *coloreditor)
-  {
-    m_RGBColor = coloreditor->GetRGBColor();
-    m_PreviousRGBColor = m_RGBColor;
-    m_bDialogChange = true;
-    m_bDialogRunning = false;
-  }
-
-  void ColorDialogProxy::RecvDialogCancel(ColorEditor* /* coloreditor */)
-  {
-    m_RGBColor = m_PreviousRGBColor;
-    m_bDialogChange = true;
-    m_bDialogRunning = false;
-  }
-
-  void ColorDialogProxy::RecvDialogChange(ColorEditor *coloreditor)
-  {
-    m_RGBColor = coloreditor->GetRGBColor();
-    m_bDialogChange = true;
-  }
-
-  void ColorDialogProxy::StopThreadMonitoring()
-  {
-    m_RGBColor = m_PreviousRGBColor;
-    m_bDialogChange = true;
-    m_bDialogRunning = false;
-    m_Thread = 0;
-    m_DialogThreadID = 0;
-  }
-
-  void ColorDialogProxy::SetColor(Color color)
-  {
-    m_RGBColor = color;
-  }
-
-  Color ColorDialogProxy::GetColor()
-  {
-    return m_RGBColor;
-  }
-
-  void ColorDialogProxy::SetPreviousColor(Color color)
-  {
-    m_PreviousRGBColor = color;
-  }
-
-  Color ColorDialogProxy::GetPreviousColor()
-  {
-    return m_PreviousRGBColor;
-  }
-
-  void ColorDialogProxy::SetColorModel(color::Model color_model)
-  {
-    m_ColorModel = color_model;
-  }
-
-  color::Model ColorDialogProxy::GetColorModel()
-  {
-    return m_ColorModel;
-  }
-
-  void ColorDialogProxy::SetColorChannel(color::Channel color_channel)
-  {
-    color_channel_ = color_channel;
-  }
-
-  color::Channel ColorDialogProxy::GetColorChannel()
-  {
-    return color_channel_;
-  }
-
-  ColorEditor::ColorEditor(NUX_FILE_LINE_DECL)
-    : View(NUX_FILE_LINE_PARAM)
-    , rgb_(1.0f, 1.0f, 0.0f)
-    , hsv_(rgb_)
-  {
-    m_ColorModel = color::RGB;
-    color_channel_ = color::RED;
-    m_MarkerPosition = Point(0, 0);
-    m_VertMarkerPosition = Point(0, 0);
-
-    m_Validator.SetMinimum(0.0);
-    m_Validator.SetMaximum(1.0);
-    m_Validator.SetDecimals(2);
-
-    picker_area_        = new BasicView(NUX_TRACKER_LOCATION);
-    channel_area_   = new BasicView(NUX_TRACKER_LOCATION);
-    selected_color_area_       = new BasicView(NUX_TRACKER_LOCATION);
-    m_hlayout           = new HLayout(NUX_TRACKER_LOCATION);
-
-    channel_area_->mouse_down.connect(sigc::mem_fun(this, &ColorEditor::RecvMouseDown));
-    channel_area_->mouse_up.connect(sigc::mem_fun(this, &ColorEditor::RecvMouseUp));
-    channel_area_->mouse_drag.connect(sigc::mem_fun(this, &ColorEditor::RecvMouseDrag));
-
-    picker_area_->mouse_down.connect(sigc::mem_fun(this, &ColorEditor::RecvPickerMouseDown));
-    picker_area_->mouse_up.connect(sigc::mem_fun(this, &ColorEditor::RecvPickerMouseUp));
-    picker_area_->mouse_drag.connect(sigc::mem_fun(this, &ColorEditor::RecvPickerMouseDrag));
-
-    selected_color_area_->SetMinMaxSize(62, 32);
-    picker_area_->SetMinMaxSize(picker_area_size.width, picker_area_size.height);
-    channel_area_->SetMaximumHeight(picker_area_size.height);
-    channel_area_->SetMinimumWidth(channel_area_width);
-    channel_area_->SetMaximumWidth(channel_area_width);
-
-    m_hlayout->AddView(picker_area_, 1);
-    m_hlayout->AddLayout(new SpaceLayout(5, 5, 20, 20), 0);
-    m_hlayout->AddView(channel_area_, 0, eAbove, eFull);
-    SetCompositionLayout(m_hlayout);
-
-    // RGB
-    {
-      redlayout = new HLayout(NUX_TRACKER_LOCATION);
-      {
-        //FIXME - change to radio button
-        redcheck = new RadioButton("R");
-        redcheck->SetMinimumWidth(32);
-        redtext = new EditTextBox("", NUX_TRACKER_LOCATION);
-        redtext->SetMinimumWidth(36);
-        redlayout->AddView(redcheck, 0);
-        redlayout->AddView(redtext, 0);
-        redcheck->click.connect(sigc::bind(sigc::bind(sigc::mem_fun(this, &ColorEditor::RecvCheckColorModel0), color::RED), color::RGB));
-      }
-      greenlayout = new HLayout(NUX_TRACKER_LOCATION);
-      {
-        //FIXME - Change to radio button
-        greencheck = new RadioButton("G");
-        greencheck->SetMinimumWidth(32);
-        greentext = new EditTextBox("", NUX_TRACKER_LOCATION);
-        greentext->SetMinimumWidth(36);
-        greenlayout->AddView(greencheck, 0);
-        greenlayout->AddView(greentext, 0);
-        greencheck->click.connect(sigc::bind(sigc::bind(sigc::mem_fun(this, &ColorEditor::RecvCheckColorModel0), color::GREEN), color::RGB));
-
-      }
-      bluelayout = new HLayout(NUX_TRACKER_LOCATION);
-      {
-        //FIXME - change to radio button
-        bluecheck = new RadioButton("B");
-        bluecheck->SetMinimumWidth(32);
-        bluetext = new EditTextBox("", NUX_TRACKER_LOCATION);
-        bluetext->SetMinimumWidth(36);
-        bluelayout->AddView(bluecheck, 0);
-        bluelayout->AddView(bluetext, 0);
-        bluecheck->click.connect(sigc::bind(sigc::bind(sigc::mem_fun(this, &ColorEditor::RecvCheckColorModel0), color::BLUE), color::RGB));
-      }
-    }
-
-    // HSV
-    {
-      huelayout = new HLayout(NUX_TRACKER_LOCATION);
-      {
-        huecheck = new RadioButton("H");
-        huecheck->SetMinimumWidth(32);
-        hue_text_entry_ = new EditTextBox("", NUX_TRACKER_LOCATION);
-        hue_text_entry_->SetMinimumWidth(36);
-        huelayout->AddView(huecheck, 0);
-        huelayout->AddView(hue_text_entry_, 0);
-        huecheck->click.connect(sigc::bind(sigc::bind(sigc::mem_fun(this, &ColorEditor::RecvCheckColorModel0), color::HUE), color::HSV ));
-      }
-      saturationlayout = new HLayout(NUX_TRACKER_LOCATION);
-      {
-        saturationcheck = new RadioButton("S");
-        saturationcheck->SetMinimumWidth(32);
-        saturation_text_entry_ = new EditTextBox("", NUX_TRACKER_LOCATION);
-        saturation_text_entry_->SetMinimumWidth(36);
-        saturationlayout->AddView(saturationcheck, 0);
-        saturationlayout->AddView(saturation_text_entry_, 0);
-        saturationcheck->click.connect(sigc::bind(sigc::bind(sigc::mem_fun(this, &ColorEditor::RecvCheckColorModel0), color::SATURATION), color::HSV ));
-      }
-      valuelayout = new HLayout(NUX_TRACKER_LOCATION);
-      {
-        valuecheck = new RadioButton("V");
-        valuecheck->SetMinimumWidth(32);
-        value_text_entry_ = new EditTextBox("", NUX_TRACKER_LOCATION);
-        value_text_entry_->SetMinimumWidth(36);
-        valuelayout->AddView(valuecheck, 0);
-        valuelayout->AddView(value_text_entry_, 0);
-        valuecheck->click.connect(sigc::bind(sigc::bind(sigc::mem_fun(this, &ColorEditor::RecvCheckColorModel0), color::VALUE), color::HSV ));
-      }
-    }
-
-    ctrllayout = new VLayout(NUX_TRACKER_LOCATION);
-    ctrllayout->AddView(selected_color_area_);
-    ctrllayout->AddView(new SpaceLayout(20, 20, 10, 10), 1);
-    ctrllayout->AddLayout(redlayout, 0);
-    ctrllayout->AddLayout(greenlayout, 0);
-    ctrllayout->AddLayout(bluelayout, 0);
-    ctrllayout->AddLayout(new SpaceLayout(10, 10, 10, 10));
-    ctrllayout->AddLayout(huelayout, 0);
-    ctrllayout->AddLayout(saturationlayout, 0);
-    ctrllayout->AddLayout(valuelayout, 0);
-    ctrllayout->SetHorizontalExternalMargin(2);
-    ctrllayout->SetVerticalInternalMargin(2);
-
-    m_hlayout->AddLayout(ctrllayout, 0);
-
-    radiogroup = new RadioButtonGroup(NUX_TRACKER_LOCATION);
-    radiogroup->ConnectButton(redcheck);
-    radiogroup->ConnectButton(greencheck);
-    radiogroup->ConnectButton(bluecheck);
-    radiogroup->ConnectButton(huecheck);
-    radiogroup->ConnectButton(saturationcheck);
-    radiogroup->ConnectButton(valuecheck);
-
-    m_RedShader = new GLSh_ColorPicker(color::RED);
-    m_GreenShader = new GLSh_ColorPicker(color::GREEN);
-    m_BlueShader = new GLSh_ColorPicker(color::BLUE);
-    m_HueShader = new GLSh_ColorPicker(color::HUE);
-    m_SaturationShader = new GLSh_ColorPicker(color::SATURATION);
-    m_ValueShader = new GLSh_ColorPicker(color::VALUE);
-
-    redtext->SetText(m_Validator.ToString(255 * rgb_.red));
-    greentext->SetText(m_Validator.ToString(255 * rgb_.green));
-    bluetext->SetText(m_Validator.ToString(255 * rgb_.blue));
-    hue_text_entry_->SetText(m_Validator.ToString(360 * hsv_.hue));
-    saturation_text_entry_->SetText(m_Validator.ToString(100 * hsv_.saturation));
-    value_text_entry_->SetText(m_Validator.ToString(100 * hsv_.value));
-  }
-
-  ColorEditor::~ColorEditor()
-  {
-    delete m_RedShader;
-    delete m_GreenShader;
-    delete m_BlueShader;
-    delete m_HueShader;
-    delete m_SaturationShader;
-    delete m_ValueShader;
-    radiogroup->UnReference();
-  }
-
-  void ColorEditor::PreLayoutManagement()
-  {
-    View::PreLayoutManagement();
-    if (view_layout_)
-    {
-      // Constrain the vertical expansion of the color picker.
-      view_layout_->SetBaseWidth(1);
-      view_layout_->SetBaseHeight(1);
-    }
-  }
-
-  void ColorEditor::Draw(GraphicsEngine &graphics_engine, bool force_draw)
-  {
-    Geometry base = GetGeometry();
-
-    base.OffsetPosition(1, 1);
-    base.OffsetSize(-2, -2);
-
-    graphics_engine.PushClippingRectangle(base);
-    GetPainter().PushDrawShapeLayer(graphics_engine, base, eSHAPE_CORNER_ROUND4, Color(0xFF000000), eAllCorners, true);
-
-    if (m_ColorModel == color::RGB)
-    {
-      DrawRGB(graphics_engine, force_draw);
-    }
-    else
-    {
-      DrawHSV(graphics_engine, force_draw);
-    }
-
-    GetPainter().PopBackground();
-    graphics_engine.PopClippingRectangle();
-  }
-
-  void ColorEditor::DrawContent(GraphicsEngine &graphics_engine, bool force_draw)
-  {
-    Geometry base = GetGeometry();
-    GetPainter().PushShapeLayer(graphics_engine, base, eSHAPE_CORNER_ROUND4, Color(0xFF000000), eAllCorners, true);
-
-    bool force = force_draw || IsFullRedraw();
-    redcheck->ProcessDraw(graphics_engine, force);
-    redtext->ProcessDraw(graphics_engine, force);
-    greencheck->ProcessDraw(graphics_engine, force);
-    greentext->ProcessDraw(graphics_engine, force);
-    bluecheck->ProcessDraw(graphics_engine, force);
-    bluetext->ProcessDraw(graphics_engine, force);
-
-    huecheck->ProcessDraw(graphics_engine, force);
-    hue_text_entry_->ProcessDraw(graphics_engine, force);
-    saturationcheck->ProcessDraw(graphics_engine, force);
-    saturation_text_entry_->ProcessDraw(graphics_engine, force);
-    valuecheck->ProcessDraw(graphics_engine, force);
-    value_text_entry_->ProcessDraw(graphics_engine, force);
-
-    GetPainter().PopBackground();
-  }
-
-// Draw Marker on Base Chanel Area
-  void ColorEditor::DrawBaseChannelMarker(GraphicsEngine &graphics_engine)
-  {
-    int marker_position_x;
-    int marker_position_y;
-
-    graphics_engine.PushClippingRectangle(channel_area_->GetGeometry());
-
-    marker_position_x = channel_area_->GetBaseX();
-    marker_position_y = channel_area_->GetBaseY() + m_VertMarkerPosition.y;
-    GetPainter().Draw2DTriangleColor(graphics_engine, marker_position_x, marker_position_y - 5,
-                                  marker_position_x + 5, marker_position_y,
-                                  marker_position_x, marker_position_y + 5, Color(0.0f, 0.0f, 0.0f, 1.0f));
-
-    GetPainter().Draw2DTriangleColor(graphics_engine, marker_position_x, marker_position_y - 4,
-                                  marker_position_x + 4, marker_position_y,
-                                  marker_position_x, marker_position_y + 4, Color(0.7f, 0.7f, 0.7f, 1.0f));
-
-    marker_position_x = channel_area_->GetBaseX() + channel_area_->GetBaseWidth();
-    marker_position_y = channel_area_->GetBaseY() + m_VertMarkerPosition.y;
-    GetPainter().Draw2DTriangleColor(graphics_engine, marker_position_x, marker_position_y - 5,
-                                  marker_position_x - 5, marker_position_y,
-                                  marker_position_x, marker_position_y + 5, Color(0.0f, 0.0f, 0.0f, 1.0f));
-
-    GetPainter().Draw2DTriangleColor(graphics_engine, marker_position_x, marker_position_y - 4,
-                                  marker_position_x - 4, marker_position_y,
-                                  marker_position_x, marker_position_y + 4, Color(0.7f, 0.7f, 0.7f, 1.0f));
-    graphics_engine.PopClippingRectangle();
-  }
-
-  void ColorEditor::DrawRGB(GraphicsEngine &graphics_engine, bool /* force_draw */)
-  {
-    if (m_ColorModel == color::RGB)
-    {
-      GetPainter().Paint2DQuadColor(graphics_engine, selected_color_area_->GetGeometry(), Color(rgb_));
-      Color BaseChannelTop;
-      Color BaseChannelBottom;
-
-      if (color_channel_ == color::RED)
-      {
-        m_RedShader->SetColor(rgb_.red, rgb_.green, rgb_.blue, 1.0f);
-        m_RedShader->SetScreenPositionOffset(graphics_engine.GetViewportX(), graphics_engine.GetViewportY());
-        BaseChannelTop = Color(1.0f, rgb_.green, rgb_.blue, 1.0f);
-        BaseChannelBottom = Color(0.0f, rgb_.green, rgb_.blue, 1.0f);
-        m_RedShader->Render(
-          picker_area_->GetBaseX(),
-          picker_area_->GetBaseY(),
-          0,
-          picker_area_->GetBaseWidth(),
-          picker_area_->GetBaseHeight(),
-          graphics_engine.GetViewportWidth(), graphics_engine.GetViewportHeight()
-        );
-      }
-      else if (color_channel_ == color::GREEN)
-      {
-        m_GreenShader->SetColor(rgb_.red, rgb_.green, rgb_.blue, 1.0f);
-        m_GreenShader->SetScreenPositionOffset(graphics_engine.GetViewportX(), graphics_engine.GetViewportY());
-        BaseChannelTop = Color(rgb_.red, 1.0f, rgb_.blue, 1.0f);
-        BaseChannelBottom = Color(rgb_.red, 0.0f, rgb_.blue, 1.0f);
-        m_GreenShader->Render(
-          picker_area_->GetBaseX(),
-          picker_area_->GetBaseY(),
-          0,
-          picker_area_->GetBaseWidth(),
-          picker_area_->GetBaseHeight(),
-          graphics_engine.GetViewportWidth(), graphics_engine.GetViewportHeight()
-        );
-      }
-      else if (color_channel_ == color::BLUE)
-      {
-        m_BlueShader->SetColor(rgb_.red, rgb_.green, rgb_.blue, 1.0f);
-        m_BlueShader->SetScreenPositionOffset(graphics_engine.GetViewportX(), graphics_engine.GetViewportY());
-        BaseChannelTop = Color(rgb_.red, rgb_.green, 1.0f, 1.0f);
-        BaseChannelBottom = Color(rgb_.red, rgb_.green, 0.0f, 1.0f);
-        m_BlueShader->Render(
-          picker_area_->GetBaseX(),
-          picker_area_->GetBaseY(),
-          0,
-          picker_area_->GetBaseWidth(),
-          picker_area_->GetBaseHeight(),
-          graphics_engine.GetViewportWidth(), graphics_engine.GetViewportHeight()
-        );
-      }
-
-      Geometry pickermarker = Geometry(GetBaseX() + m_MarkerPosition.x - 2, GetBaseY() + m_MarkerPosition.y - 2, 5, 5);
-
-      Color color(rgb_.red, rgb_.green, rgb_.blue);
-      float luma = color::LumaRed * rgb_.red + color::LumaGreen * rgb_.green + color::LumaBlue * rgb_.blue;
-      Color one_minus_luma(1.0f - luma, 1.0f - luma, 1.0f - luma);
-
-      GetPainter().Paint2DQuadWireframe(graphics_engine, pickermarker, one_minus_luma);
-
-      GetPainter().Paint2DQuadColor(graphics_engine, channel_area_->GetGeometry(), BaseChannelTop, BaseChannelBottom, BaseChannelBottom, BaseChannelTop);
-      // Draw Marker on Base Chanel Area
-      DrawBaseChannelMarker(graphics_engine);
-    }
-  }
-
-  void ColorEditor::DrawHSV(GraphicsEngine &graphics_engine, bool /* force_draw */)
-  {
-    if (m_ColorModel == color::HSV)
-    {
-      color::RedGreenBlue rgb(hsv_);
-      GetPainter().Paint2DQuadColor(graphics_engine, selected_color_area_->GetGeometry(), Color(rgb));
-
-      Color BaseChannelTop;
-      Color BaseChannelBottom;
-
-      if (color_channel_ == color::HUE)
-      {
-        m_HueShader->SetColor(hsv_.hue, hsv_.saturation, hsv_.value, 1.0f);
-        m_HueShader->SetScreenPositionOffset(graphics_engine.GetViewportX(), graphics_engine.GetViewportY());
-        m_HueShader->Render(
-          picker_area_->GetBaseX(),
-          picker_area_->GetBaseY(),
-          0,
-          picker_area_->GetBaseWidth(),
-          picker_area_->GetBaseHeight(),
-          graphics_engine.GetViewportWidth(), graphics_engine.GetViewportHeight()
-        );
-
-        Geometry P = channel_area_->GetGeometry();
-
-        float s = 1.0f - 1.0f;
-        float v = 1.0f;
-        float fw = P.GetHeight() / 6;
-
-        Geometry p = Geometry(P.x, P.y, P.GetWidth(), fw);
-        GetPainter().Paint2DQuadVGradient(graphics_engine, p, Color(1.0f * v, s * v, s * v), Color(1.0f * v, s * v, 1.0f * v));
-        p.SetY(P.y + fw);
-        GetPainter().Paint2DQuadVGradient(graphics_engine, p, Color(1.0f * v, s * v, 1.0f * v), Color(s * v, s * v, 1.0f * v));
-        p.SetY(P.y + 2 * fw);
-        GetPainter().Paint2DQuadVGradient(graphics_engine, p, Color(s * v, s * v, 1.0f * v), Color(s * v, 1.0f * v, 1.0f * v));
-        p.SetY(P.y + 3 * fw);
-        GetPainter().Paint2DQuadVGradient(graphics_engine, p, Color(s * v, 1.0f * v, 1.0f * v), Color(s * v, 1.0f * v, s * v));
-        p.SetY(P.y + 4 * fw);
-        GetPainter().Paint2DQuadVGradient(graphics_engine, p, Color(s * v, 1.0f * v, s * v), Color(1.0f * v, 1.0f * v, s * v));
-        p.SetY(P.y + 5 * fw);
-        p.SetHeight(P.GetHeight() - 5 * fw); // correct rounding errors
-        GetPainter().Paint2DQuadVGradient(graphics_engine, p, Color(1.0f * v, 1.0f * v, s * v), Color(1.0f * v, s * v, s * v));
-
-        Geometry pickermarker = Geometry(GetBaseX() + m_MarkerPosition.x - 2, GetBaseY() + m_MarkerPosition.y - 2, 5, 5);
-
-        float luma = color::LumaRed * rgb_.red + color::LumaGreen * rgb_.green + color::LumaBlue * rgb_.blue;
-        Color one_minus_luma(1.0f - luma, 1.0f - luma, 1.0f - luma);
-        GetPainter().Paint2DQuadWireframe(graphics_engine, pickermarker, one_minus_luma);
-      }
-      else if (color_channel_ == color::SATURATION)
-      {
-        float value = hsv_.value;
-        if (value < 0.3f) value = 0.3f;
-
-        m_SaturationShader->SetColor(hsv_.hue, hsv_.saturation, hsv_.value, 1.0f);
-        m_SaturationShader->SetScreenPositionOffset(graphics_engine.GetViewportX(), graphics_engine.GetViewportY());
-        BaseChannelTop = Color(color::RedGreenBlue(color::HueSaturationValue(hsv_.hue, 1.0f, value)));
-        BaseChannelBottom = Color(value, value, value, 1.0f);
-        m_SaturationShader->Render(
-          picker_area_->GetBaseX(),
-          picker_area_->GetBaseY(),
-          0,
-          picker_area_->GetBaseWidth(),
-          picker_area_->GetBaseHeight(),
-          graphics_engine.GetViewportWidth(), graphics_engine.GetViewportHeight()
-        );
-
-        //Geometry pickermarker = Geometry(GetX() + x - 2, GetY() + y -2, 5, 5);
-        Geometry pickermarker = Geometry(GetBaseX() + m_MarkerPosition.x - 2, GetBaseY() + m_MarkerPosition.y - 2, 5, 5);
-
-        float luma = color::LumaRed * rgb_.red + color::LumaGreen * rgb_.green + color::LumaBlue * rgb_.blue;
-        Color one_minus_luma(1.0f - luma, 1.0f - luma, 1.0f - luma);
-
-        GetPainter().Paint2DQuadWireframe(graphics_engine, pickermarker, one_minus_luma);
-        GetPainter().Paint2DQuadColor(graphics_engine, channel_area_->GetGeometry(), BaseChannelTop, BaseChannelBottom, BaseChannelBottom, BaseChannelTop);
-      }
-      else if (color_channel_ == color::VALUE)
-      {
-        m_ValueShader->SetColor(hsv_.hue, hsv_.saturation, hsv_.value, 1.0f);
-        m_ValueShader->SetScreenPositionOffset(graphics_engine.GetViewportX(), graphics_engine.GetViewportY());
-        BaseChannelTop = Color(color::RedGreenBlue(color::HueSaturationValue(hsv_.hue, hsv_.saturation, 1.0f)));
-        BaseChannelBottom = Color(color::RedGreenBlue(color::HueSaturationValue(hsv_.hue, hsv_.saturation, 0.0f)));
-        m_ValueShader->Render(
-          picker_area_->GetBaseX(),
-          picker_area_->GetBaseY(),
-          0,
-          picker_area_->GetBaseWidth(),
-          picker_area_->GetBaseHeight(),
-          graphics_engine.GetViewportWidth(), graphics_engine.GetViewportHeight()
-        );
-
-        //Geometry pickermarker = Geometry(GetX() + x - 2, GetY() + y -2, 5, 5);
-        Geometry pickermarker = Geometry(GetBaseX() + m_MarkerPosition.x - 2, GetBaseY() + m_MarkerPosition.y - 2, 5, 5);
-
-        float luma = color::LumaRed * rgb_.red + color::LumaGreen * rgb_.green + color::LumaBlue * rgb_.blue;
-        Color one_minus_luma(1.0f - luma, 1.0f - luma, 1.0f - luma);
-
-        GetPainter().Paint2DQuadWireframe(graphics_engine, pickermarker, one_minus_luma);
-        GetPainter().Paint2DQuadColor(graphics_engine, channel_area_->GetGeometry(), BaseChannelTop, BaseChannelBottom, BaseChannelBottom, BaseChannelTop);
-      }
-
-      // Draw Marker on Base Chanel Area
-      DrawBaseChannelMarker(graphics_engine);
-    }
-  }
-
-  void ColorEditor::RecvMouseDown(int x, int y, unsigned long /* button_flags */, unsigned long /* key_flags */)
-  {
-    float BaseValue;
-
-    if (m_ColorModel == color::RGB)
-    {
-      if (y < 0)
-        BaseValue = 1.0f;
-      else if (y > channel_area_->GetBaseHeight())
-        BaseValue = 0.0f;
-      else
-        BaseValue = 1.0f - (float) y / (float) channel_area_->GetBaseHeight();
-
-      if (color_channel_ == color::RED)
-        rgb_.red = BaseValue;
-      else if (color_channel_ == color::GREEN)
-        rgb_.green = BaseValue;
-      else if (color_channel_ == color::BLUE)
-        rgb_.blue = BaseValue;
-
-      hsv_ = color::HueSaturationValue(rgb_);
-    }
-
-    if (m_ColorModel == color::HSV)
-    {
-      if (y < 0)
-        BaseValue = 1.0f;
-      else if (y > channel_area_->GetBaseHeight())
-        BaseValue = 0.0f;
-      else
-        BaseValue = 1.0f - (float) y / (float) channel_area_->GetBaseHeight();
-
-      if (color_channel_ == color::HUE)
-      {
-        hsv_.hue = BaseValue;
-
-        if (hsv_.hue >= 1.0f) hsv_.hue = 0.0f;
-      }
-      else if (color_channel_ == color::SATURATION)
-        hsv_.saturation = BaseValue;
-      else if (color_channel_ == color::VALUE)
-        hsv_.value = BaseValue;
-
-      rgb_ = color::RedGreenBlue(hsv_);
-    }
-
-    redtext->SetText(m_Validator.ToString(255 * rgb_.red));
-    greentext->SetText(m_Validator.ToString(255 * rgb_.green));
-    bluetext->SetText(m_Validator.ToString(255 * rgb_.blue));
-    hue_text_entry_->SetText(m_Validator.ToString(360 * hsv_.hue));
-    saturation_text_entry_->SetText(m_Validator.ToString(100 * hsv_.saturation));
-    value_text_entry_->SetText(m_Validator.ToString(100 * hsv_.value));
-    m_VertMarkerPosition = Point(Clamp<int> (x, 0, channel_area_->GetBaseWidth() - 1), Clamp<int> (y, 0, channel_area_->GetBaseHeight() - 1));
-
-    sigChange.emit(this);
-    QueueDraw();
-  }
-
-  void ColorEditor::RecvMouseUp(int /* x */, int /* y */, unsigned long /* button_flags */, unsigned long /* key_flags */)
-  {
-    QueueDraw();
-  }
-
-  void ColorEditor::RecvMouseDrag(int x, int y, int /* dx */, int /* dy */, unsigned long button_flags, unsigned long key_flags)
-  {
-    RecvMouseDown(x, y, button_flags, key_flags);
-  }
-
-  void ColorEditor::RecvPickerMouseDown(int x, int y, unsigned long /* button_flags */, unsigned long /* key_flags */)
-  {
-    if (m_ColorModel == color::RGB)
-    {
-      if (color_channel_ == color::RED)
-      {
-        if (y < 0)
-          rgb_.green = 1.0f;
-        else if (y > picker_area_->GetBaseHeight())
-          rgb_.green = 0.0f;
-        else
-          rgb_.green = 1.0f - (float) y / (float) picker_area_->GetBaseHeight();
-
-        if (x < 0)
-          rgb_.blue = 0.0f;
-        else if (x > picker_area_->GetBaseWidth())
-          rgb_.blue = 1.0f;
-        else
-          rgb_.blue = (float) x / (float) picker_area_->GetBaseWidth();
-
-      }
-
-      if (color_channel_ == color::GREEN)
-      {
-        if (y < 0)
-          rgb_.red = 1.0f;
-        else if (y > picker_area_->GetBaseHeight())
-          rgb_.red = 0.0f;
-        else
-          rgb_.red = 1.0f - (float) y / (float) picker_area_->GetBaseHeight();
-
-        if (x < 0)
-          rgb_.blue = 0.0f;
-        else if (x > picker_area_->GetBaseWidth())
-          rgb_.blue = 1.0f;
-        else
-          rgb_.blue = (float) x / (float) picker_area_->GetBaseWidth();
-
-      }
-
-      if (color_channel_ == color::BLUE)
-      {
-        if (x < 0)
-          rgb_.red = 0.0f;
-        else if (x > picker_area_->GetBaseWidth())
-          rgb_.red = 1.0f;
-        else
-          rgb_.red = (float) x / (float) picker_area_->GetBaseWidth();
-
-        if (y < 0)
-          rgb_.green = 1.0f;
-        else if (y > picker_area_->GetBaseHeight())
-          rgb_.green = 0.0f;
-        else
-          rgb_.green = 1.0f - (float) y / (float) picker_area_->GetBaseHeight();
-      }
-
-      hsv_ = color::HueSaturationValue(rgb_);
-      m_MarkerPosition = Point(Clamp<int> (x, 0, picker_area_->GetBaseWidth() - 1), Clamp<int> (y, 0, picker_area_->GetBaseHeight() - 1));
-    }
-
-    if (m_ColorModel == color::HSV)
-    {
-      if (color_channel_ == color::HUE)
-      {
-        if (y < 0)
-          hsv_.value = 1.0f;
-        else if (y > picker_area_->GetBaseHeight())
-          hsv_.value = 0.0f;
-        else
-          hsv_.value = 1.0f - (float) y / (float) picker_area_->GetBaseHeight();
-
-        if (x < 0)
-          hsv_.saturation = 0.0f;
-        else if (x > picker_area_->GetBaseWidth())
-          hsv_.saturation = 1.0f;
-        else
-          hsv_.saturation = (float) x / (float) picker_area_->GetBaseWidth();
-
-      }
-
-      if (color_channel_ == color::SATURATION)
-      {
-        if (y < 0)
-          hsv_.value = 1.0f;
-        else if (y > picker_area_->GetBaseHeight())
-          hsv_.value = 0.0f;
-        else
-          hsv_.value = 1.0f - (float) y / (float) picker_area_->GetBaseHeight();
-
-        if (x < 0)
-          hsv_.hue = 0.0f;
-        else if (x >= picker_area_->GetBaseWidth())
-          hsv_.hue = 0.0f;
-        else
-          hsv_.hue = (float) x / (float) picker_area_->GetBaseWidth();
-
-      }
-
-      if (color_channel_ == color::VALUE)
-      {
-        if (x < 0)
-          hsv_.hue = 0.0f;
-        else if (x >= picker_area_->GetBaseWidth())
-          hsv_.hue = 0.0f;
-        else
-          hsv_.hue = (float) x / (float) picker_area_->GetBaseWidth();
-
-        if (y < 0)
-          hsv_.saturation = 1.0f;
-        else if (y > picker_area_->GetBaseHeight())
-          hsv_.saturation = 0.0f;
-        else
-          hsv_.saturation = 1.0f - (float) y / (float) picker_area_->GetBaseHeight();
-      }
-
-      rgb_ = color::RedGreenBlue(hsv_);
-      m_MarkerPosition = Point(Clamp<int> (x, 0, picker_area_->GetBaseWidth() - 1), Clamp<int> (y, 0, picker_area_->GetBaseHeight() - 1));
-    }
-
-
-    redtext->SetText(m_Validator.ToString(255 * rgb_.red));
-    greentext->SetText(m_Validator.ToString(255 * rgb_.green));
-    bluetext->SetText(m_Validator.ToString(255 * rgb_.blue));
-    hue_text_entry_->SetText(m_Validator.ToString(360 * hsv_.hue));
-    saturation_text_entry_->SetText(m_Validator.ToString(100 * hsv_.saturation));
-    value_text_entry_->SetText(m_Validator.ToString(100 * hsv_.value));
-
-    sigChange.emit(this);
-    QueueDraw();
-  }
-
-  void ColorEditor::RecvPickerMouseUp(int /* x */, int /* y */, unsigned long /* button_flags */, unsigned long /* key_flags */)
-  {
-    QueueDraw();
-  }
-
-  void ColorEditor::RecvPickerMouseDrag(int x, int y, int /* dx */, int /* dy */, unsigned long button_flags, unsigned long key_flags)
-  {
-    RecvPickerMouseDown(x, y, button_flags, key_flags);
-  }
-
-  void ColorEditor::RecvCheckColorModel0(AbstractButton * /* button */, color::Model color_mode, color::Channel color_channel)
-  {
-    RecvCheckColorModel(true, color_mode, color_channel);
-  }
-
-  void ColorEditor::RecvCheckColorModel(bool b, color::Model color_mode, color::Channel color_channel)
-  {
-    if (b)
-    {
-      if ((color_mode == color::HSV) && (m_ColorModel == color::RGB))
-      {
-        hsv_ = color::HueSaturationValue(rgb_);
-      }
-
-      if ((color_mode == color::RGB) && (m_ColorModel == color::HSV))
-      {
-        rgb_ = color::RedGreenBlue(hsv_);
-      }
-
-      m_ColorModel = color_mode;
-      color_channel_ = color_channel;
-    }
-
-    if (b && (color_mode == color::RGB))
-    {
-      int x = 0;
-      int y = 0;
-      int z = 1;
-
-      if (color_channel_ == color::RED)
-      {
-        z = (1.0f - rgb_.red) * picker_area_->GetBaseHeight();
-        y = (1.0f - rgb_.green) * picker_area_->GetBaseHeight();
-        x = rgb_.blue * picker_area_->GetBaseWidth();
-      }
-
-      if (color_channel_ == color::GREEN)
-      {
-        z = (1.0f - rgb_.green) * picker_area_->GetBaseHeight();
-        y = (1.0f - rgb_.red) * picker_area_->GetBaseHeight();
-        x = rgb_.blue * picker_area_->GetBaseWidth();
-      }
-
-      if (color_channel_ == color::BLUE)
-      {
-        z = (1.0f - rgb_.blue) * picker_area_->GetBaseHeight();
-        y = (1.0f - rgb_.green) * picker_area_->GetBaseHeight();
-        x = rgb_.red * picker_area_->GetBaseWidth();
-      }
-
-      m_VertMarkerPosition = Point(Clamp<int> (0, 0, channel_area_->GetBaseWidth() - 1), Clamp<int> (z, 0, channel_area_->GetBaseHeight() - 1));
-      m_MarkerPosition = Point(Clamp<int> (x, 0, picker_area_->GetBaseWidth() - 1), Clamp<int> (y, 0, picker_area_->GetBaseHeight() - 1));
-
-      redtext->SetText(m_Validator.ToString(255 * rgb_.red));
-      greentext->SetText(m_Validator.ToString(255 * rgb_.green));
-      bluetext->SetText(m_Validator.ToString(255 * rgb_.blue));
-    }
-
-    if (b && (color_mode == color::HSV))
-    {
-      int x = 0;
-      int y = 0;
-      int z = 1;
-
-      if (color_channel_ == color::HUE)
-      {
-        z = (1.0f - hsv_.hue) * picker_area_->GetBaseHeight();
-        y = (1.0f - hsv_.value) * picker_area_->GetBaseHeight();
-        x = hsv_.saturation * picker_area_->GetBaseWidth();
-      }
-
-      if (color_channel_ == color::SATURATION)
-      {
-        z = (1.0f - hsv_.saturation) * picker_area_->GetBaseHeight();
-        y = (1.0f - hsv_.value) * picker_area_->GetBaseHeight();
-        x = hsv_.hue * picker_area_->GetBaseWidth();
-      }
-
-      if (color_channel_ == color::VALUE)
-      {
-        z = (1.0f - hsv_.value) * picker_area_->GetBaseHeight();
-        y = (1.0f - hsv_.saturation) * picker_area_->GetBaseHeight();
-        x = hsv_.hue * picker_area_->GetBaseWidth();
-      }
-
-      m_VertMarkerPosition = Point(Clamp<int> (0, 0, channel_area_->GetBaseWidth() - 1), Clamp<int> (z, 0, channel_area_->GetBaseHeight() - 1));
-      m_MarkerPosition = Point(Clamp<int> (x, 0, picker_area_->GetBaseWidth() - 1), Clamp<int> (y, 0, picker_area_->GetBaseHeight() - 1));
-
-      hue_text_entry_->SetText(m_Validator.ToString(360 * hsv_.hue));
-      saturation_text_entry_->SetText(m_Validator.ToString(100 * hsv_.saturation));
-      value_text_entry_->SetText(m_Validator.ToString(100 * hsv_.value));
-    }
-
-    QueueDraw();
-  }
-
-  Color ColorEditor::GetRGBColor() const
-  {
-    return Color(rgb_);
-  }
-
-  void ColorEditor::SetRGB(Color const& rgb)
-  {
-    SetRGB(rgb.red, rgb.green, rgb.blue );
-  }
-
-  void ColorEditor::SetRGB(double r, double g, double b)
-  {
-    rgb_ = color::RedGreenBlue(Clamp<double>(r, 0.0, 1.0),
-                               Clamp<double>(g, 0.0, 1.0),
-                               Clamp<double>(b, 0.0, 1.0));
-    hsv_ = color::HueSaturationValue(rgb_);
-    RecvCheckColorModel(true, m_ColorModel, color_channel_);
-    sigChange.emit(this);
-  }
-
-  void ColorEditor::SetHSV(double h, double s, double v)
-  {
-    hsv_ = color::HueSaturationValue(Clamp<double>(h, 0.0, 1.0),
-                                     Clamp<double>(s, 0.0, 1.0),
-                                     Clamp<double>(v, 0.0, 1.0));
-    rgb_ = color::RedGreenBlue(hsv_);
-    RecvCheckColorModel(true, m_ColorModel, color_channel_);
-    sigChange.emit(this);
-  }
-
-  void ColorEditor::SetRed(double red)
-  {
-    SetRGB(red, rgb_.green, rgb_.blue);
-  }
-
-  void ColorEditor::SetGreen(double green)
-  {
-    SetRGB(rgb_.red, green, rgb_.blue);
-  }
-
-  void ColorEditor::SetBlue(double blue)
-  {
-    SetRGB(rgb_.red, rgb_.green, blue);
-  }
-
-  void ColorEditor::SetHue(double hue)
-  {
-    SetHSV(hue, hsv_.saturation, hsv_.value);
-  }
-
-  void ColorEditor::SetSaturation(double saturation)
-  {
-    SetHSV(hsv_.hue, saturation, hsv_.value);
-  }
-
-  void ColorEditor::SetValue(double value)
-  {
-    SetHSV(hsv_.hue, hsv_.saturation, value);
-  }
-
-  void ColorEditor::SetColorModel(color::Model colormodel,
-                                  color::Channel colorchannel)
-  {
-    if (colormodel == color::HSV)
-    {
-      if ((colorchannel != color::HUE) &&
-           (colorchannel != color::SATURATION) &&
-           (colorchannel != color::VALUE))
-      {
-        nuxDebugMsg("[ColorEditor::SetColorModel] The color model(HSV) and the color channel don't match.");
-        return;
-      }
-    }
-
-    if (colormodel == color::RGB)
-    {
-      if ((colorchannel != color::RED) &&
-           (colorchannel != color::GREEN) &&
-           (colorchannel != color::BLUE))
-      {
-        nuxDebugMsg("[ColorEditor::SetColorModel] The color model(RGB) and the color channel don't match.");
-        return;
-      }
-    }
-
-    m_ColorModel = colormodel;
-    color_channel_ = colorchannel;
-    RecvCheckColorModel(true, m_ColorModel, color_channel_);
-
-    /*FIXME - disabled because we lost radiogroup 
-    if (color_channel_ == color::RED)
-      radiogroup->ActivateButton(redcheck);
-    else if (color_channel_ == color::GREEN)
-      radiogroup->ActivateButton(greencheck);
-    else if (color_channel_ == color::BLUE)
-      radiogroup->ActivateButton(bluecheck);
-    else if (color_channel_ == color::HUE)
-      radiogroup->ActivateButton(huecheck);
-    else if (color_channel_ == color::SATURATION)
-      radiogroup->ActivateButton(saturationcheck);
-    else if (color_channel_ == color::VALUE)
-      radiogroup->ActivateButton(valuecheck);
-    */
-
-  }
-
-  color::Model ColorEditor::GetColorModel() const
-  {
-    return m_ColorModel;
-  }
-
-  color::Channel ColorEditor::GetColorChannel() const
-  {
-    return color_channel_;
-  }
-
-  bool ColorEditor::AcceptKeyNavFocus()
-  {
-    return false;
-  }
-}

=== removed file 'Nux/ColorEditor.h'
--- Nux/ColorEditor.h	2013-11-04 15:10:08 +0000
+++ Nux/ColorEditor.h	1970-01-01 00:00:00 +0000
@@ -1,211 +0,0 @@
-/*
- * Copyright 2010 Inalogic® Inc.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License, as
- * published by the  Free Software Foundation; either version 2.1 or 3.0
- * of the License.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the applicable version of the GNU Lesser General Public
- * License for more details.
- *
- * You should have received a copy of both the GNU Lesser General Public
- * License along with this program. If not, see <http://www.gnu.org/licenses/>
- *
- * Authored by: Jay Taoko <[e-mail]>
- *
- */
-
-
-#ifndef COLOREDITOR_H
-#define COLOREDITOR_H
-
-#include "NuxGraphics/GpuDevice.h"
-#include "NuxGraphics/GLDeviceObjects.h"
-#include "NuxGraphics/GLSh_DrawFunction.h"
-#include "DoubleValidator.h"
-#include "TimerProc.h"
-
-namespace nux
-{
-
-  class GLSh_ColorPicker;
-  class HLayout;
-  class VLayout;
-  class EditTextBox;
-  class CheckBox;
-  class AbstractButton;
-  class RadioButton;
-  class RadioButtonGroup;
-  class Button;
-
-  class ColorEditor;
-  class ColorPreview;
-
-  class ColorDialogProxy
-  {
-  public:
-    ColorDialogProxy(bool ModalWindow);
-    ~ColorDialogProxy();
-
-    void RecvDialogOk(ColorEditor *coloreditor);
-    void RecvDialogCancel(ColorEditor *coloreditor);
-    void RecvDialogChange(ColorEditor *coloreditor);
-
-    void Start();
-    bool IsActive();
-    void StopThreadMonitoring();
-
-    void SetColor(Color color);
-    Color GetColor();
-    void SetPreviousColor(Color color);
-    Color GetPreviousColor();
-    void SetColorModel(color::Model color_model);
-    color::Model GetColorModel();
-    void SetColorChannel(color::Channel color_model);
-    color::Channel GetColorChannel();
-
-  private:
-    bool m_bDialogChange;
-    bool m_bDialogRunning;
-    unsigned int m_DialogThreadID;
-    Color m_RGBColor;
-    Color m_PreviousRGBColor;
-    color::Model m_ColorModel;
-    color::Channel color_channel_;
-    bool m_ModalWindow;
-    NThread *m_Thread;
-
-    friend class ColorPreview;
-  };
-
-  class ColorEditor : public View
-  {
-  public:
-    ColorEditor(NUX_FILE_LINE_PROTO);
-    ~ColorEditor();
-
-    void SetRed(double r);
-    void SetGreen(double g);
-    void SetBlue(double b);
-    void SetHue(double h);
-    void SetSaturation(double s);
-    void SetValue(double v);
-
-    void SetRGB(double r, double g, double b);
-    void SetHSV(double h, double s, double v);
-    void SetRGB(Color const& rgb);
-    Color GetRGBColor() const;
-
-    void SetColorModel(color::Model, color::Channel);
-    color::Model GetColorModel() const;
-    color::Channel GetColorChannel() const;
-
-    void RecvMouseDown(int x, int y, unsigned long button_flags, unsigned long key_flags);
-    void RecvMouseUp(int x, int y, unsigned long button_flags, unsigned long key_flags);
-    void RecvMouseDrag(int x, int y, int dx, int dy, unsigned long button_flags, unsigned long key_flags);
-
-    void RecvPickerMouseDown(int x, int y, unsigned long button_flags, unsigned long key_flags);
-    void RecvPickerMouseUp(int x, int y, unsigned long button_flags, unsigned long key_flags);
-    void RecvPickerMouseDrag(int x, int y, int dx, int dy, unsigned long button_flags, unsigned long key_flags);
-
-    void RecvCheckColorModel(bool, color::Model, color::Channel);
-    void RecvCheckColorModel0(AbstractButton *button, color::Model color_mode, color::Channel channel);
-
-    sigc::signal< void, ColorEditor * > sigChange;
-
-  protected:
-    virtual void Draw(GraphicsEngine &graphics_engine, bool force_draw);
-    virtual void DrawContent(GraphicsEngine &graphics_engine, bool force_draw);
-    virtual void PreLayoutManagement();
-    virtual bool AcceptKeyNavFocus();
-  private:
-
-    //! Override of Area::SetMinimumHeight and made private.
-    /*!
-        Prevent changing the minimum height of the ColorEditor view.
-    */
-    virtual void SetMinimumHeight(int h){};
-
-    //! Override of Area::SetMaximumHeight and made private.
-    /*!
-        Prevent changing the maximum height of the ColorEditor view.
-    */
-    virtual void SetMaximumHeight(int h){};
-
-    //! Override of Area::SetMinimumWidth and made private.
-    /*!
-        Prevent changing the minimum width of the ColorEditor view.
-    */
-    virtual void SetMinimumWidth(int w){};
-
-    //! Override of Area::SetMaximumWidth and made private.
-    /*!
-        Prevent changing the maximum width of the ColorEditor view.
-    */
-    virtual void SetMaximumWidth(int w){};
-
-    void DrawBaseChannelMarker(GraphicsEngine &graphics_engine);
-    void DrawRGB(GraphicsEngine &graphics_engine, bool force_draw);
-    void DrawHSV(GraphicsEngine &graphics_engine, bool force_draw);
-
-    color::Channel   color_channel_;
-    color::Model     m_ColorModel;
-    InputArea       *picker_area_;
-    InputArea       *channel_area_;
-    InputArea       *selected_color_area_;
-    HLayout        *m_hlayout;
-    VLayout        *ctrllayout;
-
-    GLSh_ColorPicker *m_RedShader;
-    GLSh_ColorPicker *m_GreenShader;
-    GLSh_ColorPicker *m_BlueShader;
-
-    GLSh_ColorPicker *m_HueShader;
-    GLSh_ColorPicker *m_SaturationShader;
-    GLSh_ColorPicker *m_ValueShader;
-
-    Point m_MarkerPosition;
-    Point m_VertMarkerPosition;
-
-    color::RedGreenBlue rgb_;
-    color::HueSaturationValue hsv_;
-
-    HLayout *redlayout;
-    HLayout *greenlayout;
-    HLayout *bluelayout;
-
-    RadioButton *redcheck;
-    EditTextBox *redtext;
-    RadioButton *greencheck;
-    EditTextBox *greentext;
-    RadioButton *bluecheck;
-    EditTextBox *bluetext;
-
-    HLayout *huelayout;
-    HLayout *saturationlayout;
-    HLayout *valuelayout;
-
-    RadioButton *huecheck;
-    EditTextBox *hue_text_entry_;
-    RadioButton *saturationcheck;
-    EditTextBox *saturation_text_entry_;
-    RadioButton *valuecheck;
-    EditTextBox *value_text_entry_;
-
-    RadioButtonGroup *radiogroup;
-
-    DoubleValidator m_Validator;
-
-    static Size picker_area_size;
-    static int channel_area_width;
-  };
-
-
-}
-
-#endif // COLOREDITOR_H
-

=== removed file 'Nux/ColorPickerDialog.cpp'
--- Nux/ColorPickerDialog.cpp	2012-09-26 06:44:12 +0000
+++ Nux/ColorPickerDialog.cpp	1970-01-01 00:00:00 +0000
@@ -1,73 +0,0 @@
-/*
- * Copyright 2010 Inalogic® Inc.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License, as
- * published by the  Free Software Foundation; either version 2.1 or 3.0
- * of the License.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the applicable version of the GNU Lesser General Public
- * License for more details.
- *
- * You should have received a copy of both the GNU Lesser General Public
- * License along with this program. If not, see <http://www.gnu.org/licenses/>
- *
- * Authored by: Jay Taoko <[e-mail]>
- *
- */
-
-
-#include "Nux.h"
-#include "Button.h"
-#include "ColorPickerDialog.h"
-
-namespace nux
-{
-
-  static Color DummyColor;
-
-  ColorPickerDialog::ColorPickerDialog()
-    :   m_Color(DummyColor)
-  {
-    SetWindowTitle("Color Picker");
-    SetWindowSizeMatchLayout(true);
-    m_Vlayout = new VLayout("Color Picker");
-    m_ColorEditor = new ColorEditor();
-
-    m_Vlayout->AddView(m_ColorEditor);
-    m_Vlayout->AddLayout(m_ButtonLayout);
-
-    m_Vlayout->SetScaleFactor(0);
-    // Set layout for the window
-    SetLayout(m_Vlayout);
-  }
-
-  ColorPickerDialog::~ColorPickerDialog()
-  {
-
-  }
-
-  void ColorPickerDialog::StartDialog(Color &color, color::Model /* ColorModel */, bool StartModal)
-  {
-    Dialog::Start(StartModal);
-    m_Color = color;
-  }
-
-  void ColorPickerDialog::RecvOk()
-  {
-    m_Color = m_ColorEditor->GetRGBColor();
-    m_Color = color::Black;
-    ShowWindow(FALSE);
-  }
-
-  void ColorPickerDialog::RecvCancel()
-  {
-    m_Color = DummyColor;
-    ShowWindow(FALSE);
-  }
-
-
-}

=== removed file 'Nux/ColorPickerDialog.h'
--- Nux/ColorPickerDialog.h	2011-10-10 01:52:00 +0000
+++ Nux/ColorPickerDialog.h	1970-01-01 00:00:00 +0000
@@ -1,55 +0,0 @@
-/*
- * Copyright 2010 Inalogic® Inc.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License, as
- * published by the  Free Software Foundation; either version 2.1 or 3.0
- * of the License.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the applicable version of the GNU Lesser General Public
- * License for more details.
- *
- * You should have received a copy of both the GNU Lesser General Public
- * License along with this program. If not, see <http://www.gnu.org/licenses/>
- *
- * Authored by: Jay Taoko <[e-mail]>
- *
- */
-
-
-#ifndef COLORPICKERDIALOG_H
-#define COLORPICKERDIALOG_H
-
-#include "Dialog.h"
-#include "ColorEditor.h"
-
-namespace nux
-{
-
-  class HLayout;
-  class VLayout;
-
-  class ColorPickerDialog : public Dialog
-  {
-  public:
-    ColorPickerDialog();
-    ~ColorPickerDialog();
-
-    virtual void RecvOk();
-    virtual void RecvCancel();
-
-    void StartDialog(Color &color, color::Model ColorModel = color::RGB, bool StartModal = false);
-
-  private:
-
-    VLayout        *m_Vlayout;
-    ColorEditor    *m_ColorEditor;
-    Color &m_Color;
-  };
-
-}
-
-#endif // COLORPICKERDIALOG_H

=== removed file 'Nux/ColorPreview.cpp'
--- Nux/ColorPreview.cpp	2012-11-05 21:31:06 +0000
+++ Nux/ColorPreview.cpp	1970-01-01 00:00:00 +0000
@@ -1,142 +0,0 @@
-/*
- * Copyright 2010 Inalogic® Inc.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License, as
- * published by the  Free Software Foundation; either version 2.1 or 3.0
- * of the License.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the applicable version of the GNU Lesser General Public
- * License for more details.
- *
- * You should have received a copy of both the GNU Lesser General Public
- * License along with this program. If not, see <http://www.gnu.org/licenses/>
- *
- * Authored by: Jay Taoko <[e-mail]>
- *
- */
-
-
-#include "Nux.h"
-#include "ColorPreview.h"
-#include "ColorEditor.h"
-#include "HLayout.h"
-#include "TimerProc.h"
-#include "StaticTextBox.h"
-
-#include <sstream>
-#include <iomanip>
-
-namespace nux
-{
-
-  static const int GRAPH_MARGIN = 1;
-
-  ColorPreview::ColorPreview(Color const& c, NUX_FILE_LINE_DECL)
-    : View(NUX_FILE_LINE_PARAM)
-    , m_Color(c)
-  {
-    //setSize(200, 100);
-    m_hlayout           = new HLayout(NUX_TRACKER_LOCATION);
-    m_ColorArea         = new BasicView(NUX_TRACKER_LOCATION);
-    m_ColorValue        = new StaticTextBox("", NUX_TRACKER_LOCATION);
-    m_DialogThreadProxy = new ColorDialogProxy(true);
-
-    SetMaximumHeight(18);
-    m_ColorArea->SetMaximumHeight(18);
-    m_ColorArea->SetMinimumWidth(32);
-    m_ColorArea->SetMaximumWidth(32);
-    m_ColorValue->SetTextColor(Color(0xFFFFFFFF));
-    m_ColorValue->SetFont(GetSysBoldFont());
-    m_ColorValue->SetMinimumWidth(128);
-
-    std::stringstream s;
-    s << "[ R:" << (int)(m_Color.red * 255)
-      << ", G:" << (int)(m_Color.green * 255)
-      << ", B:" << (int)(m_Color.blue * 255)
-      << " ]";
-    m_ColorValue->SetText(s.str());
-
-    m_ColorArea->mouse_click.connect(sigc::mem_fun(this, &ColorPreview::RecvClick));
-
-    m_hlayout->AddView(m_ColorArea, 0);
-    m_hlayout->AddView(m_ColorValue, 1);
-    m_hlayout->SetHorizontalInternalMargin(4);
-    SetCompositionLayout(m_hlayout);
-
-    m_ChangeDetectionTimer = new TimerFunctor();
-    m_ChangeDetectionTimer->tick.connect(sigc::mem_fun(this, &ColorPreview::RecvTimer));
-    m_ChangeTimerHandler = 0;
-  }
-
-  ColorPreview::~ColorPreview()
-  {
-    delete m_ChangeDetectionTimer;
-
-    if (m_ChangeTimerHandler.IsValid())
-      GetTimer().RemoveTimerHandler(m_ChangeTimerHandler);
-
-    delete m_DialogThreadProxy;
-  }
-
-  void ColorPreview::Draw(GraphicsEngine &graphics_engine, bool /* force_draw */)
-  {
-    Geometry base = GetGeometry();
-
-    GetPainter().PaintBackground(graphics_engine, base);
-    GetPainter().PaintShape(graphics_engine, m_ColorArea->GetGeometry(), m_Color, eSHAPE_CORNER_ROUND4, false);
-    //GetPainter().Paint2DQuadWireFrameColor(graphics_engine, base, Color(COLOR_BACKGROUND_SECONDARY));
-    m_ColorValue->QueueDraw();
-  }
-
-  void ColorPreview::DrawContent(GraphicsEngine &graphics_engine, bool force_draw)
-  {
-    m_ColorValue->ProcessDraw(graphics_engine, force_draw);
-  }
-
-  void ColorPreview::RecvClick(int /* x */, int /* y */, unsigned long /* button_flags */, unsigned long /* key_flags */)
-  {
-    m_DialogThreadProxy->SetColor(m_Color);
-    m_DialogThreadProxy->Start();
-
-    m_ChangeTimerHandler = GetTimer().AddOneShotTimer(33, m_ChangeDetectionTimer, this);
-  }
-
-  void ColorPreview::RecvTimer(void * /* v */)
-  {
-    if (m_DialogThreadProxy->m_bDialogChange && m_DialogThreadProxy->m_bDialogRunning)
-    {
-      m_DialogThreadProxy->m_bDialogChange = false;
-      m_Color = m_DialogThreadProxy->GetColor();
-      QueueDraw();
-    }
-
-    if (m_DialogThreadProxy->IsActive())
-    {
-      m_ChangeTimerHandler = GetTimer().AddOneShotTimer(33, m_ChangeDetectionTimer, this);
-    }
-    else
-    {
-      if (m_ChangeTimerHandler.IsValid())
-        GetTimer().RemoveTimerHandler(m_ChangeTimerHandler);
-
-      m_ChangeTimerHandler = 0;
-      m_Color = m_DialogThreadProxy->GetColor();
-      QueueDraw();
-    }
-  }
-
-  Color const& ColorPreview::GetRGBColor() const
-  {
-    return m_Color;
-  }
-
-  void ColorPreview::SetColor(Color const& color)
-  {
-    m_Color = color;
-  }
-
-}

=== removed file 'Nux/ColorPreview.h'
--- Nux/ColorPreview.h	2012-10-02 07:32:55 +0000
+++ Nux/ColorPreview.h	1970-01-01 00:00:00 +0000
@@ -1,70 +0,0 @@
-/*
- * Copyright 2010 Inalogic® Inc.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License, as
- * published by the  Free Software Foundation; either version 2.1 or 3.0
- * of the License.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the applicable version of the GNU Lesser General Public
- * License for more details.
- *
- * You should have received a copy of both the GNU Lesser General Public
- * License along with this program. If not, see <http://www.gnu.org/licenses/>
- *
- * Authored by: Jay Taoko <[e-mail]>
- *
- */
-
-
-#ifndef COLORPREVIEW_H
-#define COLORPREVIEW_H
-
-#include "NuxCore/Color.h"
-#include "NuxGraphics/GpuDevice.h"
-#include "NuxGraphics/GLDeviceObjects.h"
-#include "TimerProc.h"
-
-namespace nux
-{
-
-  class HLayout;
-  class StaticTextBox;
-  class ColorEditor;
-  class TimerHandle;
-  class ColorDialogProxy;
-
-  class ColorPreview : public View
-  {
-  public:
-    ColorPreview(Color const& c = nux::color::Transparent, NUX_FILE_LINE_PROTO);
-    ~ColorPreview();
-    virtual void Draw(GraphicsEngine &graphics_engine, bool force_draw);
-    virtual void DrawContent(GraphicsEngine &graphics_engine, bool force_draw);
-
-    sigc::signal< void, ColorEditor * > sigColorChanged;
-
-    void SetColor(Color const& rgb);
-    Color const& GetRGBColor() const;
-
-  private:
-    void RecvTimer(void *v);
-    void RecvClick(int x, int y, unsigned long button_flags, unsigned long key_flags);
-
-    TimerFunctor       *m_ChangeDetectionTimer;
-    TimerHandle         m_ChangeTimerHandler;
-
-    Color               m_Color;
-    HLayout            *m_hlayout;
-    InputArea           *m_ColorArea;
-    StaticTextBox      *m_ColorValue;
-    ColorDialogProxy   *m_DialogThreadProxy;
-  };
-
-
-}
-
-#endif // COLORPREVIEW_H

=== removed file 'Nux/ComboBoxSimple.cpp'
--- Nux/ComboBoxSimple.cpp	2012-07-24 05:39:41 +0000
+++ Nux/ComboBoxSimple.cpp	1970-01-01 00:00:00 +0000
@@ -1,316 +0,0 @@
-/*
- * Copyright 2010 Inalogic® Inc.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License, as
- * published by the  Free Software Foundation; either version 2.1 or 3.0
- * of the License.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the applicable version of the GNU Lesser General Public
- * License for more details.
- *
- * You should have received a copy of both the GNU Lesser General Public
- * License along with this program. If not, see <http://www.gnu.org/licenses/>
- *
- * Authored by: Jay Taoko <[e-mail]>
- *
- */
-
-
-#include "Nux.h"
-#include "ComboBoxSimple.h"
-#include "MenuPage.h"
-#include "ActionItem.h"
-#include "StaticText.h"
-
-
-namespace nux
-{
-  ComboBoxSimple::ComboBoxSimple(NUX_FILE_LINE_DECL)
-    :   AbstractComboBox(NUX_FILE_LINE_PARAM)
-  {
-    m_SelectedAction    = 0;
-    m_CurrentMenu       = 0;
-
-    m_CurrentMenu = new MenuPage("", NUX_TRACKER_LOCATION);
-    m_CurrentMenu->SinkReference();
-    m_CurrentMenu->SetParentObject(this);
-    
-    // Set Signals
-    _combo_box_opening_area->mouse_down.connect(sigc::mem_fun(this, &ComboBoxSimple::RecvMouseDown));
-    _combo_box_opening_area->mouse_up.connect(sigc::mem_fun(this, &ComboBoxSimple::RecvMouseUp));
-    _combo_box_area->mouse_down.connect(sigc::mem_fun(this, &ComboBoxSimple::RecvMouseDown));
-    _combo_box_area->mouse_up.connect(sigc::mem_fun(this, &ComboBoxSimple::RecvMouseUp));
-
-    //m_Popup.sigPopupStop.connect(sigc::mem_fun(this, &ComboBox::OnPopupStop));
-
-    // Set Geometry
-    _combo_box_opening_area->SetGeometry(Geometry(0, 0, 20, DEFAULT_WIDGET_HEIGHT));
-    //_combo_box_opening_area->SetMaximumSize(20, DEFAULT_WIDGET_HEIGHT);
-    _combo_box_opening_area->SetMinimumSize(20, DEFAULT_WIDGET_HEIGHT);
-
-    _combo_box_area->SetMinimumSize(2 * DEFAULT_WIDGET_WIDTH, PRACTICAL_WIDGET_HEIGHT);
-    _combo_box_area->SetGeometry(Geometry(0, 0, 3 * DEFAULT_WIDGET_WIDTH, PRACTICAL_WIDGET_HEIGHT));
-    //_pango_static_text->SetClipping(_combo_box_area->GetBaseWidth());
-    _combo_box_area->geometry_changed.connect(sigc::mem_fun(this, &ComboBoxSimple::RecvGeometryChanged));
-
-    //m_CurrentMenu = new MenuPage;
-    m_CurrentMenu->SetParentMenu(0);
-    m_CurrentMenu->sigActionTriggered.connect(sigc::mem_fun(this, &ComboBoxSimple::RecvSigActionTriggered));
-    m_CurrentMenu->sigTerminateMenuCascade.connect(sigc::mem_fun(this, &ComboBoxSimple::RecvSigTerminateMenuCascade));
-    m_CurrentMenu->sigClosingMenu.connect(sigc::mem_fun(this, &ComboBoxSimple::RecvClosingMenuSignal));
-  }
-
-  ComboBoxSimple::~ComboBoxSimple()
-  {
-    m_CurrentMenu->UnParentObject();
-    m_CurrentMenu->UnReference();
-  }
-
-  Area* ComboBoxSimple::FindAreaUnderMouse(const Point& mouse_position, NuxEventType event_type)
-  {
-    bool mouse_inside = TestMousePointerInclusionFilterMouseWheel(mouse_position, event_type);
-
-    if (mouse_inside == false)
-      return NULL;
-
-    NUX_RETURN_VALUE_IF_TRUE(_combo_box_opening_area->TestMousePointerInclusion(mouse_position, event_type), _combo_box_opening_area);
-    NUX_RETURN_VALUE_IF_TRUE(_combo_box_area->TestMousePointerInclusion(mouse_position, event_type), _combo_box_area);
-
-    if ((event_type == NUX_MOUSE_WHEEL) && (!AcceptMouseWheelEvent()))
-      return NULL;
-    return this;
-  }
-
-  void ComboBoxSimple::MoveSelectionUp()
-  {
-    int current_index = GetSelectionIndex();
-    SetSelectionIndex(current_index - 1);
-  }
-
-  void ComboBoxSimple::MoveSelectionDown()
-  {
-    int current_index = GetSelectionIndex();
-    SetSelectionIndex(current_index + 1);
-  }
-
-  ActionItem *ComboBoxSimple::AddItem(const char *label, int Uservalue)
-  {
-    if (m_CurrentMenu->GetNumItem() == 0)
-    {
-      // The first element added is the element featured on the combo box when it is closed.
-      m_SelectedAction = m_CurrentMenu->AddAction(label, Uservalue);
-      _combo_box_area->SetBaseString(m_SelectedAction->GetLabel());
-
-      _pango_static_text->SetText(m_SelectedAction->GetLabel());
-
-      return m_SelectedAction;
-    }
-    else
-    {
-      return m_CurrentMenu->AddAction(label, Uservalue);
-    }
-  }
-
-  void ComboBoxSimple::RemoveItem(ActionItem *item)
-  {
-
-  }
-
-  void ComboBoxSimple::RemoveAllItem()
-  {
-    m_CurrentMenu->RemoveAllItem();
-  }
-
-  void ComboBoxSimple::RecvMouseDown(int x, int y, unsigned long button_flags, unsigned long key_flags)
-  {
-    if (m_MenuIsActive == false)
-    {
-      // Open the MenuPage
-      m_MenuIsActive = true;
-      m_IsOpeningMenu = true;
-
-      Geometry geo = m_CurrentMenu->GetGeometry();
-      geo.SetX(_combo_box_area->GetAbsoluteX());
-      geo.SetY(_combo_box_area->GetAbsoluteY() + _combo_box_area->GetBaseHeight());
-      geo.SetWidth(_combo_box_area->GetBaseWidth());
-      //m_CurrentMenu->SetMinimumWidth(geo.width);
-      //m_CurrentMenu->SetMaximumWidth(geo.width);
-      m_CurrentMenu->SetGeometry(geo);
-      m_CurrentMenu->ComputeContentSize();
-      m_CurrentMenu->StartMenu(_combo_box_area->GetAbsoluteX(),
-                                _combo_box_area->GetAbsoluteY() + _combo_box_area->GetBaseHeight(),
-                                0, 0);
-    }
-    else
-    {
-      // If the mouse up that follows happen inside the area, then it is going to close the menu.
-      m_IsOpeningMenu = false;
-    }
-
-    QueueDraw();
-  }
-
-  void ComboBoxSimple::RecvMouseUp(int x, int y, unsigned long button_flags, unsigned long key_flags)
-  {
-    if (m_MenuIsActive)
-    {
-      if (_combo_box_area->IsMouseInside() || _combo_box_opening_area->IsMouseInside())
-      {
-        if (m_IsOpeningMenu == false)
-        {
-          // close the MenuPage that is Open
-          m_CurrentMenu->StopMenu(0, 0);
-          m_MenuIsActive = false;
-        }
-        else
-        {
-          // The MousePress before this MouseRelease, caused the MenuPage to open.
-          // Set m_IsOpeningMenu so the next mouse release will close the menu.
-          m_IsOpeningMenu = false;
-          m_MenuIsActive = true;
-        }
-      }
-      else
-      {
-        bool hit_inside_a_menu = false;
-        bool b = m_CurrentMenu->TestMouseUp(x, y, button_flags, key_flags, hit_inside_a_menu);
-
-        if (b || (hit_inside_a_menu == false))
-        {
-          RecvSigTerminateMenuCascade();
-          m_MenuIsActive = false;
-        }
-      }
-    }
-
-    QueueDraw();
-  }
-
-  void ComboBoxSimple::RecvSigActionTriggered(MenuPage *menu, ActionItem *action)
-  {
-    m_MenuIsActive = false;
-    m_CurrentMenu->StopMenu();
-
-    m_SelectedAction = action;
-    _combo_box_area->SetBaseString(m_SelectedAction->GetLabel());
-    m_IsOpeningMenu = false;
-
-    _pango_static_text->SetText(m_SelectedAction->GetLabel());
-
-    sigTriggered.emit(this);
-    sigActionTriggered.emit(m_SelectedAction);
-
-    QueueDraw();
-    // You can do something if you want with the menu* and the action*
-  }
-
-  void ComboBoxSimple::RecvSigActionTriggered2(TableCtrl *table, TableItem *item, unsigned int row, unsigned int column)
-  {
-    m_MenuIsActive = false;
-    m_CurrentMenu->StopMenu();
-    m_IsOpeningMenu = false;
-    QueueDraw();
-    // You can do something if you want with the menu* and the action*
-  }
-
-  void ComboBoxSimple::RecvSigTerminateMenuCascade()
-  {
-    //m_MenuIsActive = false;
-    m_CurrentMenu->StopMenu();
-    m_IsOpeningMenu = false;
-  }
-
-  void ComboBoxSimple::RecvClosingMenuSignal(MenuPage* menu_page)
-  {
-    nuxAssert(menu_page == m_CurrentMenu);
-    m_IsOpeningMenu = false;
-    m_MenuIsActive = false;
-
-    // When the menu is closing check if the mouse is still inside the combo box surface 
-    // and set the _current_mouse_in flag accordingly.  
-    if (!_combo_box_area->TestMousePointerInclusion(GetWindowThread()->GetWindowCompositor().GetMousePosition(), NUX_NO_EVENT))
-    {
-      _combo_box_area->mouse_in_ = false;
-    }
-
-    if (!_combo_box_opening_area->TestMousePointerInclusion(GetWindowThread()->GetWindowCompositor().GetMousePosition(), NUX_NO_EVENT))
-    {
-      _combo_box_opening_area->mouse_in_ = false;
-    }
-
-    QueueDraw();
-  }
-
-  void ComboBoxSimple::RecvGeometryChanged(Area *area, Geometry &geo)
-  {
-    //_pango_static_text->SetClipping(geo.width);
-  }
-
-
-  const char *ComboBoxSimple::GetSelectionLabel() const
-  {
-    if (m_SelectedAction)
-      return m_SelectedAction->GetLabel();
-
-    return 0;
-  }
-
-  int ComboBoxSimple::GetSelectionUserValue() const
-  {
-    if (m_SelectedAction)
-      return m_SelectedAction->GetUserValue();
-
-    return 0;
-  }
-
-  int ComboBoxSimple::GetNumItem() const
-  {
-    return m_CurrentMenu->GetNumItem();
-  }
-
-  ActionItem *ComboBoxSimple::GetItem(int index) const
-  {
-    return m_CurrentMenu->GetActionItem(index);
-  }
-
-  int ComboBoxSimple::GetSelectionIndex() const
-  {
-    if (m_SelectedAction)
-      return m_CurrentMenu->GetActionItemIndex(m_SelectedAction);
-
-    return -1;
-  }
-
-  void ComboBoxSimple::SetSelectionIndex(int index)
-  {
-    if ((index >= 0) && (index < m_CurrentMenu->GetNumItem()))
-    {
-      m_SelectedAction = m_CurrentMenu->GetActionItem(index);
-      _combo_box_area->SetBaseString(m_SelectedAction->GetLabel());
-
-      _pango_static_text->SetText(m_SelectedAction->GetLabel());
-
-      QueueDraw();
-    }
-    else if (m_CurrentMenu->GetNumItem() > 0)
-    {
-      // index is negative
-      m_SelectedAction = m_CurrentMenu->GetActionItem(0);
-      _combo_box_area->SetBaseString(m_SelectedAction->GetLabel());
-
-      _pango_static_text->SetText(m_SelectedAction->GetLabel());
-
-      QueueDraw();
-    }
-    else
-    {
-      m_SelectedAction = 0;
-    }
-  }
-
-
-}

=== removed file 'Nux/ComboBoxSimple.h'
--- Nux/ComboBoxSimple.h	2012-10-02 07:32:55 +0000
+++ Nux/ComboBoxSimple.h	1970-01-01 00:00:00 +0000
@@ -1,96 +0,0 @@
-/*
- * Copyright 2010 Inalogic® Inc.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License, as
- * published by the  Free Software Foundation; either version 2.1 or 3.0
- * of the License.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the applicable version of the GNU Lesser General Public
- * License for more details.
- *
- * You should have received a copy of both the GNU Lesser General Public
- * License along with this program. If not, see <http://www.gnu.org/licenses/>
- *
- * Authored by: Jay Taoko <[e-mail]>
- *
- */
-
-
-#ifndef COMBOBOX_LOGIC_H
-#define COMBOBOX_LOGIC_H
-
-#include "AbstractComboBox.h"
-#include "ActionItem.h"
-
-namespace nux
-{
-
-  class MenuPage;
-  class ActionItem;
-  class TableItem;
-  class TableCtrl;
-
-  class ComboBoxSimple : public AbstractComboBox
-  {
-  public:
-    ComboBoxSimple(NUX_FILE_LINE_PROTO);
-    ~ComboBoxSimple();
-
-    // make the class abstract
-//    virtual void Draw(GraphicsEngine& graphics_engine, bool force_draw);
-//    virtual void DrawContent(GraphicsEngine& graphics_engine, bool force_draw);
-
-  public:
-    ActionItem *AddItem(const char *label, int Uservalue = 0);
-    void RemoveItem(ActionItem *item);
-    void RemoveAllItem();
-
-    // emitters
-    void OnMouseDown(int x, int y, unsigned long button_flags, unsigned long key_flags);
-    void OnMouseUp(int x, int y, unsigned long button_flags, unsigned long key_flags);
-    void OnPopupStop();
-
-    // signals
-    void RecvMouseDown(int x, int y, unsigned long button_flags, unsigned long key_flags);
-    void RecvMouseUp(int x, int y, unsigned long button_flags, unsigned long key_flags);
-    void RecvSigActionTriggered(MenuPage *, ActionItem *);
-    void RecvSigActionTriggered2(TableCtrl *table, TableItem *item, unsigned int row, unsigned int column);
-    void RecvSigTerminateMenuCascade();
-    void RecvGeometryChanged(Area *area, Geometry &geo);
-
-    const char *GetSelectionLabel() const;
-    int GetSelectionUserValue() const;
-    int GetNumItem() const;
-    ActionItem *GetItem(int index) const;
-    int GetSelectionIndex() const;
-    void SetSelectionIndex(int index);
-
-    // moves the currently selected item up/down - just shorthand for SetSelectionIndex
-    void MoveSelectionUp();
-    void MoveSelectionDown();
-
-    MenuPage * GetMenuPage()
-    {
-      return m_CurrentMenu;
-    }
-
-    sigc::signal<void, ComboBoxSimple *> sigTriggered;
-    sigc::signal<void, ActionItem *> sigActionTriggered;
-
-  protected:
-
-    virtual Area* FindAreaUnderMouse(const Point& mouse_position, NuxEventType event_type);
-
-    void RecvClosingMenuSignal(MenuPage* menu_page);
-
-    MenuPage   *m_CurrentMenu;
-    ActionItem *m_SelectedAction;
-  };
-
-}
-
-#endif // COMBOBOX_LOGIC_H

=== removed file 'Nux/Coverflow.cpp'
--- Nux/Coverflow.cpp	2012-11-05 21:31:06 +0000
+++ Nux/Coverflow.cpp	1970-01-01 00:00:00 +0000
@@ -1,1154 +0,0 @@
-// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
-/*
- * Copyright (C) 2012 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * 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/>.
- *
- * Authored by: Jason Smith <[e-mail]>
- *              Jay Taoko <[e-mail]>
- */
-
-#include "Nux.h"
-#include "HLayout.h"
-#include "StaticText.h"
-#include "TextLoader.h"
-
-#include "NuxGraphics/GraphicsDisplay.h"
-#include "NuxGraphics/GLShader.h"
-#include "NuxGraphics/GpuDevice.h"
-#include "NuxGraphics/GLDeviceObjects.h"
-#include "NuxGraphics/GLShader.h"
-#include "NuxGraphics/GraphicsEngine.h"
-
-#include "NuxGraphics/IOpenGLBaseTexture.h"
-
-
-#include <glib.h>
-
-#include "Coverflow.h"
-
-
-namespace nux
-{
-namespace
-{
-  float EaseSin(float x)
-  {
-    return sin(x * nux::constants::pi / 2.0f);
-  }
-
-  float RoundFloor(float x)
-  {
-    return std::floor(x + 0.5f);
-  }
-
-  std::string texture_vertex_code = "attribute vec4 iVertex;                                  \n\
-                                    attribute vec4 iTextureCoord0;                            \n\
-                                    attribute vec4 iVertexColor;                              \n\
-                                    uniform mat4 ViewProjectionMatrix;                        \n\
-                                    varying vec4 varyTexCoord0;                               \n\
-                                    varying vec4 varyVertexColor;                             \n\
-                                    void main()                                               \n\
-                                    {                                                         \n\
-                                    gl_Position =  ViewProjectionMatrix * (iVertex);          \n\
-                                    varyTexCoord0 = iTextureCoord0;                           \n\
-                                    varyVertexColor = iVertexColor;                           \n\
-                                    }";
-
-  std::string texture_fragment_code = "varying vec4 varyTexCoord0;                            \n\
-                                      varying vec4 varyVertexColor;                           \n\
-                                      uniform sampler2D TextureObject0;                       \n\
-                                      void main()                                             \n\
-                                      {                                                       \n\
-                                        vec4 v = texture2D(TextureObject0, varyTexCoord0.xy);    \n\
-                                        gl_FragColor = v*varyVertexColor;                     \n\
-                                      }";
-
-  std::string single_color_fragment_code = "varying vec4 varyTexCoord0;                       \n\
-                                      varying vec4 varyVertexColor;                           \n\
-                                      uniform sampler2D TextureObject0;                       \n\
-                                      void main()                                             \n\
-                                      {                                                       \n\
-                                        gl_FragColor = varyVertexColor;                       \n\
-                                      }";
-  struct Vec4_
-  {
-    float x;
-    float y;
-    float z;
-    float rot;
-  };
-
-  struct VelocityEvent
-  {
-    float velocity;
-    gint64 time;
-  };
-
-  struct Cover
-  {
-    Vec4_ position;
-    float opacity;
-    bool selected;
-    bool mouse_over;
-    CoverflowItem::Ptr item;
-  };
-
-  typedef std::vector<Cover> CoverList;
-}
-}
-
-namespace nux
-{
-  struct Coverflow::Impl : public sigc::trackable
-  {
-    Impl(Coverflow* parent);
-    ~Impl();
-
-    void HandleKeyDown(unsigned long eventType,
-                     unsigned long keysym,
-                     unsigned long state,
-                     const char* character,
-                     unsigned short keyCount);
-    void HandleKeyUp(unsigned int keysym,
-                   unsigned long x11_key_code,
-                   unsigned long special_keys_state);
-
-    void HandleMouseDown(int x, int y, unsigned long button_flags, unsigned long key_flags);
-    void HandleMouseUp(int x, int y, unsigned long button_flags, unsigned long key_flags);
-    void HandleMouseLeave(int x, int y, unsigned long button_flags, unsigned long key_flags);
-    void HandleMouseEnter(int x, int y, unsigned long button_flags, unsigned long key_flags);
-    void HandleMouseDrag(int x, int y, int dx, int dy, unsigned long button_flags, unsigned long key_flags);
-    void HandleMouseMove(int x, int y, int dx, int dy, unsigned long button_flags, unsigned long key_flags);
-    void HandleMouseClick(int x, int y, unsigned long button_flags, unsigned long key_flags);
-    void HandleMouseWheel(int x, int y, int wheel_delta, unsigned long button_flags, unsigned long key_flags);
-    void HandleGeometryChange(Area* area, Geometry geo);
-
-    void DrawCover(nux::GraphicsEngine& graphics_engine, nux::DrawAreaContext &ctx, Cover const& cover);
-    void RenderCover(nux::GraphicsEngine& graphics_engine, Cover const& cover, int width, int height, nux::Matrix4 combined_matrix);
-    void LoadVertexBuffer(int VertexLocation, int TextureCoord0Location, int VertexColorLocation, float* VtxBuffer);
-
-    CoverList GetCoverList(float animation_progress, gint64 timestep);
-
-    void OnItemAdded(CoverflowModel* owner, CoverflowItem::Ptr new_item);
-    void OnItemRemoved(CoverflowModel* owner, CoverflowItem::Ptr old_item);
-    void OnSelectionChanged(CoverflowModel* owner, CoverflowItem::Ptr selection);
-
-    void SetPosition(float position, bool animate);
-
-    void UpdateModelSelection();
-
-    float GetCurrentVelocity(int ms);
-
-    void MaybeQueueDraw();
-
-    bool CoverAtPoint(int x, int y, Cover& out_cover);
-    void Get3DBoundingBox(float distance_from_camera, nux::Point2& top_left_corner, nux::Point2& bottom_right_corner);
-    void GetCoverScreenCoord(Cover const& cover, nux::Vector4& P0, nux::Vector4& P1, nux::Vector4& P2, nux::Vector4& P3);
-
-    bool TestMouseOverCover(int x, int y, Cover const& cover);
-    bool TestCoverVisible(Cover const& cover);
-
-    static gboolean OnAnimationTimeout(gpointer data);
-    static gboolean OnVelocityTimeout(gpointer data);
-
-    nux::Vector3 camera_position_;
-    nux::Vector3 camera_rotation_;
-
-    nux::ObjectPtr<nux::IOpenGLShaderProgram> cover_shader_program_;
-    nux::ObjectPtr<nux::IOpenGLShaderProgram> highlight_shader_program_;
-    
-    nux::Matrix4 perspective_;
-    nux::Matrix4 modelview_;
-
-    std::vector<VelocityEvent> velocity_events_;
-
-    Coverflow* parent_;
-    guint animation_handle_;
-    float camera_drift_factor_;
-    gint64 last_draw_time_;
-    float last_position_;
-    bool mouse_inside_view_;
-    float position_;
-    gint64 position_set_time_;
-    float saved_position_;
-    float velocity_;
-    guint velocity_handle_;
-    nux::Point2 mouse_down_position_;
-    nux::Point2 mouse_position_;
-    CoverList last_covers_;
-    float cover_width_in_3d_space_;
-    float near_clip_plan_;
-    float far_clip_plan_;
-    TextLoader text_loader_;
-    ObjectPtr<IOpenGLBaseTexture> drop_shadow_texture_;
-
-    sigc::connection model_selection_connection_;
-  };
-
-  Coverflow::Impl::Impl(Coverflow* parent)
-   : parent_(parent)
-   , animation_handle_(0)
-   , camera_drift_factor_(0)
-   , last_draw_time_(0)
-   , last_position_(0)
-   , mouse_inside_view_(false)
-   , position_(0)
-   , position_set_time_(0)
-   , saved_position_(0)
-   , velocity_(0)
-   , velocity_handle_(0)
-   , cover_width_in_3d_space_(1.0f)
-   , near_clip_plan_(1.0f)
-   , far_clip_plan_(200.0f)
-  {
-    mouse_position_ = nux::Point2(0, 0);
-
-    parent_->key_down.connect(sigc::mem_fun(this, &Impl::HandleKeyDown));
-    parent_->key_up.connect(sigc::mem_fun(this, &Impl::HandleKeyUp));
-    parent_->mouse_move.connect(sigc::mem_fun(this, &Impl::HandleMouseMove));
-    parent_->mouse_enter.connect(sigc::mem_fun(this, &Impl::HandleMouseEnter));
-    parent_->mouse_leave.connect(sigc::mem_fun(this, &Impl::HandleMouseLeave));
-    parent_->mouse_click.connect(sigc::mem_fun(this, &Impl::HandleMouseClick));
-    parent_->mouse_drag.connect(sigc::mem_fun(this, &Impl::HandleMouseDrag));
-    parent_->mouse_up.connect(sigc::mem_fun(this, &Impl::HandleMouseUp));
-    parent_->mouse_down.connect(sigc::mem_fun(this, &Impl::HandleMouseDown));
-    parent_->mouse_wheel.connect(sigc::mem_fun(this, &Impl::HandleMouseWheel));
-    parent_->geometry_changed.connect(sigc::mem_fun(this, &Impl::HandleGeometryChange));
-
-
-    camera_position_.x = 0.0f;
-    camera_position_.y = 0.0f;
-    camera_position_.z = 5.0f;
-    camera_rotation_.x = 0.0f;
-    camera_rotation_.y = 0.0f;
-    camera_rotation_.z = 0.0f;
-
-    // Create a shader to render a textured quad.
-    {
-      // Create the GLSL shader objects: Vertex, Fragment and the Program.
-      // The Program object act as a container for the Vertex and Fragment object.
-      nux::ObjectPtr<nux::IOpenGLPixelShader>  fragment_shader_prog_ = nux::GetGraphicsDisplay()->GetGpuDevice()->CreatePixelShader();
-      nux::ObjectPtr<nux::IOpenGLVertexShader> vertex_shader_prog_ = nux::GetGraphicsDisplay()->GetGpuDevice()->CreateVertexShader();
-      cover_shader_program_ = nux::GetGraphicsDisplay()->GetGpuDevice()->CreateShaderProgram();
-
-      // Set the actual shader code into the Vertex and Fragment objects.
-      vertex_shader_prog_->SetShaderCode(texture_vertex_code.c_str());
-      fragment_shader_prog_->SetShaderCode(texture_fragment_code.c_str());
-
-      // Remove all Vertex and Fragment objects from the Program (Not necessary here but do it anyway).
-      cover_shader_program_->ClearShaderObjects();
-      // Add the Vertex and Fragment objects to the Program object.
-      cover_shader_program_->AddShaderObject(vertex_shader_prog_);
-      cover_shader_program_->AddShaderObject(fragment_shader_prog_);
-      // Link
-      cover_shader_program_->Link();
-
-      // The shaders have been loaded into the program. They can be discarded.
-      vertex_shader_prog_.Release();
-      fragment_shader_prog_.Release();
-    }
-
-    // Create a shader to render a the cover highlight.
-    {
-      // Create the GLSL shader objects: Vertex, Fragment and the Program.
-      // The Program object act as a container for the Vertex and Fragment object.
-      nux::ObjectPtr<nux::IOpenGLPixelShader>  fragment_shader_prog_ = nux::GetGraphicsDisplay()->GetGpuDevice()->CreatePixelShader();
-      nux::ObjectPtr<nux::IOpenGLVertexShader> vertex_shader_prog_ = nux::GetGraphicsDisplay()->GetGpuDevice()->CreateVertexShader();
-      highlight_shader_program_ = nux::GetGraphicsDisplay()->GetGpuDevice()->CreateShaderProgram();
-
-      // Set the actual shader code into the Vertex and Fragment objects.
-      vertex_shader_prog_->SetShaderCode(texture_vertex_code.c_str());
-      fragment_shader_prog_->SetShaderCode(single_color_fragment_code.c_str());
-
-      // Remove all Vertex and Fragment objects from the Program (Not necessary here but do it anyway).
-      highlight_shader_program_->ClearShaderObjects();
-      // Add the Vertex and Fragment objects to the Program object.
-      highlight_shader_program_->AddShaderObject(vertex_shader_prog_);
-      highlight_shader_program_->AddShaderObject(fragment_shader_prog_);
-      // Link
-      highlight_shader_program_->Link();
-
-      // The shaders have been loaded into the program. They can be discarded.
-      vertex_shader_prog_.Release();
-      fragment_shader_prog_.Release();
-    }
-
-    text_loader_.font_size = 10;
-
-    std::string resource_path = NUX_FIND_RESOURCE_LOCATION_NOFAIL("UITextures/coverflow.oval-shadow.png");
-    BaseTexture* texture = LoadTextureFromFile(resource_path.c_str());
-    drop_shadow_texture_ = texture->GetDeviceTexture();
-    texture->UnReference();
-
-    text_loader_.lines = 2;
-  }
-
-  Coverflow::Impl::~Impl()
-  {
-    if (animation_handle_)
-    {
-      g_source_remove(animation_handle_);
-      animation_handle_ = 0;
-    }
-  }
-
-  void Coverflow::Impl::UpdateModelSelection()
-  {
-    model_selection_connection_.disconnect();
-    parent_->model()->SetSelection((size_t)RoundFloor(position_));
-    model_selection_connection_ = parent_->model()->selection_changed.connect(sigc::mem_fun(this, &Coverflow::Impl::OnSelectionChanged));
-  }
-
-  void Coverflow::Impl::Get3DBoundingBox(float distance_from_camera, nux::Point2& top_left_corner, nux::Point2& bottom_right_corner)
-  {
-    int width = parent_->GetBaseWidth();
-    int height = parent_->GetBaseHeight();
-
-    top_left_corner.y = std::tan(DEGTORAD(parent_->fov() * 0.5f)) * distance_from_camera;
-    top_left_corner.x = -top_left_corner.y * (width / (float)height);
-
-    bottom_right_corner.x = -top_left_corner.x;
-    bottom_right_corner.y = -top_left_corner.y;
-  }
-
-  void Coverflow::Impl::GetCoverScreenCoord(Cover const& cover, nux::Vector4& out_p0, nux::Vector4& out_p1, nux::Vector4& out_p2, nux::Vector4& out_p3)
-  {
-    if (cover.item->GetTexture().IsNull())
-      return;
-
-    int width = parent_->GetBaseWidth();
-    int height = parent_->GetBaseHeight();
-
-    ObjectPtr<IOpenGLBaseTexture> texture = cover.item->GetTexture()->GetDeviceTexture();
-    float ratio = texture->GetWidth()/(float)texture->GetHeight();
-    
-    float fx = cover_width_in_3d_space_/2.0f;
-    float fy_top = cover.position.y + (cover_width_in_3d_space_) * (1.0f/ratio);
-    float fy_bot = cover.position.y;
-
-    if (parent_->true_perspective)
-    {
-      modelview_ = nux::Matrix4::TRANSLATE(-camera_position_.x, -camera_position_.y, -camera_position_.z) *
-        nux::Matrix4::ROTATEX(DEGTORAD(-camera_rotation_.x)) *
-        nux::Matrix4::ROTATEY(DEGTORAD(-camera_rotation_.y)) *
-        nux::Matrix4::ROTATEZ(DEGTORAD(-camera_rotation_.z)) *
-        nux::Matrix4::TRANSLATE(cover.position.x, 0.0f, cover.position.z);
-    }
-    else
-    {
-      modelview_ = nux::Matrix4::TRANSLATE(-camera_position_.x, -camera_position_.y, -camera_position_.z) *
-        nux::Matrix4::ROTATEX(DEGTORAD(-camera_rotation_.x)) *
-        nux::Matrix4::ROTATEY(DEGTORAD(-camera_rotation_.y)) *
-        nux::Matrix4::ROTATEZ(DEGTORAD(-camera_rotation_.z)) *
-        nux::Matrix4::TRANSLATE(0.0f, 0.0f, cover.position.z);
-    }
-
-    nux::Matrix4 m = nux::Matrix4::ROTATEY(DEGTORAD(cover.position.rot));
-    nux::Matrix4 combined_matrix = perspective_ * modelview_ * m;
-
-    nux::Vector4 p0(-fx, fy_top, 0.0f, 1.0f);
-    nux::Vector4 p1(-fx, fy_bot, 0.0f, 1.0f);
-    nux::Vector4 p2(fx, fy_bot, 0.0f, 1.0f);
-    nux::Vector4 p3(fx, fy_top, 0.0f, 1.0f);
-
-    nux::Vector4 p0_proj = combined_matrix * p0;
-    nux::Vector4 p1_proj = combined_matrix * p1;
-    nux::Vector4 p2_proj = combined_matrix * p2;
-    nux::Vector4 p3_proj = combined_matrix * p3;
-
-    p0_proj.x = p0_proj.x/p0_proj.w; p0_proj.y = p0_proj.y/p0_proj.w; p0_proj.z = p0_proj.z/p0_proj.w;
-    p1_proj.x = p1_proj.x/p1_proj.w; p1_proj.y = p1_proj.y/p1_proj.w; p1_proj.z = p1_proj.z/p1_proj.w;
-    p2_proj.x = p2_proj.x/p2_proj.w; p2_proj.y = p2_proj.y/p2_proj.w; p2_proj.z = p2_proj.z/p2_proj.w;
-    p3_proj.x = p3_proj.x/p3_proj.w; p3_proj.y = p3_proj.y/p3_proj.w; p3_proj.z = p3_proj.z/p3_proj.w;
-
-    p0_proj.x = width * (p0_proj.x + 1.0f)/2.0f;
-    p1_proj.x = width * (p1_proj.x + 1.0f)/2.0f;
-    p2_proj.x = width * (p2_proj.x + 1.0f)/2.0f;
-    p3_proj.x = width * (p3_proj.x + 1.0f)/2.0f;
-
-    p0_proj.y = -height * (p0_proj.y - 1.0f)/2.0f;
-    p1_proj.y = -height * (p1_proj.y - 1.0f)/2.0f;
-    p2_proj.y = -height * (p2_proj.y - 1.0f)/2.0f;
-    p3_proj.y = -height * (p3_proj.y - 1.0f)/2.0f;
-
-    float scalar = 0.0f;
-
-    if (!parent_->true_perspective)
-    {
-      nux::Point2 top_left, bottom_right;
-      Get3DBoundingBox(camera_position_.z, top_left, bottom_right);
-      scalar = parent_->GetGeometry().width / (bottom_right.x - top_left.x);
-    }
-
-    out_p0.x = p0_proj.x + cover.position.x * scalar; out_p0.y = p0_proj.y;
-    out_p1.x = p1_proj.x + cover.position.x * scalar; out_p1.y = p1_proj.y;
-    out_p2.x = p2_proj.x + cover.position.x * scalar; out_p2.y = p2_proj.y;
-    out_p3.x = p3_proj.x + cover.position.x * scalar; out_p3.y = p3_proj.y;
-  }
-
-  bool Coverflow::Impl::TestMouseOverCover(int x, int y, Cover const& cover)
-  {
-    nux::Vector4 P0;
-    nux::Vector4 P1;
-    nux::Vector4 P2;
-    nux::Vector4 P3;
-
-    GetCoverScreenCoord(cover, P0, P1, P2, P3);
-    // The polygon is convex and P0->P1->P2->P3 follows the right hand rule
-    bool test01 = ((y - P0.y) * (P1.x - P0.x) - (x - P0.x) * (P1.y - P0.y)) <= 0.0f;
-    bool test12 = ((y - P1.y) * (P2.x - P1.x) - (x - P1.x) * (P2.y - P1.y)) <= 0.0f;
-    bool test23 = ((y - P2.y) * (P3.x - P2.x) - (x - P2.x) * (P3.y - P2.y)) <= 0.0f;
-    bool test30 = ((y - P3.y) * (P0.x - P3.x) - (x - P3.x) * (P0.y - P3.y)) <= 0.0f;
-
-    if (test01 && test12 && test23 && test30)
-    {
-      return true;
-    }
-
-    return false;
-  }
-
-  bool Coverflow::Impl::TestCoverVisible(Cover const& cover)
-  {
-    int width = parent_->GetBaseWidth();
-    int height = parent_->GetBaseHeight();
-
-    nux::Vector4 P0;
-    nux::Vector4 P1;
-    nux::Vector4 P2;
-    nux::Vector4 P3;
-
-    GetCoverScreenCoord(cover, P0, P1, P2, P3);
-    bool test0 = ((P0.x >= 0) && (P0.x < width)) && ((P0.y >= 0) && (P0.y < height));
-    bool test1 = ((P1.x >= 0) && (P1.x < width)) && ((P1.y >= 0) && (P1.y < height));
-    bool test2 = ((P2.x >= 0) && (P2.x < width)) && ((P2.y >= 0) && (P2.y < height));
-    bool test3 = ((P3.x >= 0) && (P3.x < width)) && ((P3.y >= 0) && (P3.y < height));
-
-    if (test0 || test1 || test2 || test3)
-    {
-      // The quad is convex. If any of its vertices is inside the view, then the quad is visible.
-      return true;
-    }
-
-    return false;
-  }
-
-  bool Coverflow::Impl::CoverAtPoint(int /* x */, int /* y */, Cover& out_cover)
-  {
-    Cover best;
-
-    CoverList::iterator it;
-    for (it = last_covers_.begin(); it != last_covers_.end(); ++it)
-    {
-      Cover cover = *it;
-      if (cover.item->GetTexture().IsNull())
-        continue;
-      if (cover.position.rot > 0 && TestMouseOverCover(mouse_position_.x, mouse_position_.y, cover))
-      {
-        best = cover;
-      }
-    }
-
-    CoverList::reverse_iterator rit;
-    for (rit = last_covers_.rbegin(); rit != last_covers_.rend(); ++rit)
-    {
-      Cover cover = *rit;
-      if (cover.item->GetTexture().IsNull())
-        continue;
-      if (cover.position.rot <= 0 && TestMouseOverCover(mouse_position_.x, mouse_position_.y, cover))
-      {
-        best = cover;
-      }
-    }
-
-    if (best.item)
-    {
-      out_cover = best;
-      return true;
-    }
-
-    return false;
-  }
-
-  void Coverflow::Impl::HandleKeyDown(unsigned long   /* eventType */  , /*event type*/
-                                  unsigned long   keysym     , /*event keysym*/
-                                  unsigned long   /* state */      , /*event state*/
-                                  const char*     /* character */  , /*character*/
-                                  unsigned short  /* keyCount */     /*key repeat count*/)
-  {
-    switch (keysym)
-    {
-      case NUX_VK_LEFT:
-        parent_->model()->SelectPrev();
-        break;
-      case NUX_VK_RIGHT:
-        parent_->model()->SelectNext();
-        break;
-
-    }
-  }
-
-  void Coverflow::Impl::HandleMouseClick(int x, int y, unsigned long button_flags, unsigned long /* key_flags */)
-  {
-    if (std::abs(mouse_down_position_.x - x) > 10 || std::abs(mouse_down_position_.y - y) > 10)
-      return;
-
-    Cover best;
-    if (CoverAtPoint(x, y, best))
-    {
-      if (abs(best.position.rot) <= .001)
-      {
-        best.item->Activate(nux::GetEventButton(button_flags));
-      }
-      else
-      {
-        SetPosition((float)parent_->model()->IndexOf(best.item), true);
-        UpdateModelSelection();
-      }
-    }
-  }
-
-  void Coverflow::Impl::HandleKeyUp(unsigned int keysym,
-                                  unsigned long /* x11_key_code */,
-                                  unsigned long /* special_keys_state */)
-  {
-    switch (keysym)
-    {
-      case NUX_VK_ENTER:
-      case NUX_KP_ENTER:
-      {
-        Cover best;
-        if (CoverAtPoint(0, 0, best))
-          best.item->Activate(1);
-        break;
-      }
-      default:
-        break;
-    }
-  }
-
-  void Coverflow::Impl::HandleMouseMove(int x, int y, int /* dx */, int /* dy */, unsigned long /* button_flags */, unsigned long /* key_flags */)
-  {
-    mouse_position_.x = x;
-    mouse_position_.y = y;
-    MaybeQueueDraw();
-  }
-
-  void Coverflow::Impl::HandleMouseEnter(int x, int y, unsigned long /* button_flags */, unsigned long /* key_flags */)
-  {
-    mouse_position_.x = x;
-    mouse_position_.y = y;
-    mouse_inside_view_ = true;
-    MaybeQueueDraw();
-  }
-
-  void Coverflow::Impl::HandleMouseLeave(int /* x */, int /* y */, unsigned long /* button_flags */, unsigned long /* key_flags */)
-  {
-    mouse_position_.x = 0xFFFFFFFF;
-    mouse_position_.y = 0xFFFFFFFF;
-    mouse_inside_view_ = false;
-    MaybeQueueDraw();
-  }
-
-  void Coverflow::Impl::HandleMouseDown(int x, int y, unsigned long /* button_flags */, unsigned long /* key_flags */)
-  {
-    velocity_ = 0; // stop an current velocity based animations
-    mouse_down_position_.x = x;
-    mouse_down_position_.y = y;
-    MaybeQueueDraw();
-  }
-
-  bool TooOld (VelocityEvent event)
-  {
-    gint64 current_time = g_get_monotonic_time();
-    int ms = (current_time - event.time) / 1000;
-    return ms > 1000;
-  }
-
-  float Coverflow::Impl::GetCurrentVelocity(int cutoff_ms)
-  {
-    gint64 current_time = g_get_monotonic_time();
-    float result = 0.0f;
-
-    std::vector<VelocityEvent>::iterator it;
-    for (it = velocity_events_.begin(); it != velocity_events_.end(); ++it)
-    {
-      VelocityEvent event = *it;
-      int ms = (current_time - event.time) / 1000;
-      if (ms > cutoff_ms)
-        continue;
-      
-      result += event.velocity;
-    }
-    result = result / (cutoff_ms / 16); // 16ms timestep
-
-    velocity_events_.erase(std::remove_if(velocity_events_.begin(), velocity_events_.end(), &TooOld), velocity_events_.end());
-
-    return result;
-  }
-
-  void Coverflow::Impl::HandleMouseUp(int /* x */, int /* y */, unsigned long /* button_flags */, unsigned long /* key_flags */)
-  {
-    MaybeQueueDraw();
-    velocity_ = GetCurrentVelocity(32);
-
-    if (velocity_ != 0 && !velocity_handle_)
-    {
-      velocity_handle_ = g_timeout_add(16, &Coverflow::Impl::OnVelocityTimeout, this);
-    } 
-    else if (!velocity_handle_)
-    {
-      SetPosition(RoundFloor(position_), true);
-      UpdateModelSelection();
-    }
-  }
-
-  void Coverflow::Impl::HandleMouseDrag(int /* x */, int /* y */, int dx, int /* dy */, unsigned long /* button_flags */, unsigned long /* key_flags */)
-  {
-    nux::Point2 top_left, bottom_right;
-    Get3DBoundingBox(camera_position_.z, top_left, bottom_right);
-    nux::Geometry geo = parent_->GetGeometry();
-
-    float scalar = (((float)bottom_right.x - (float)top_left.x) / (float)geo.width) / parent_->space_between_icons;
-    SetPosition(position_ - (dx * scalar * parent_->mouse_drag_rate), false);
-  }
-
-  void Coverflow::Impl::HandleMouseWheel(int /* x */, int /* y */, int /* wheel_delta */, unsigned long /* button_flags */, unsigned long /* key_flags */)
-  {
-    // do nothing yet
-  }
-
-  void Coverflow::Impl::HandleGeometryChange(Area* /* area */, Geometry /* geo */)
-  {
-  }
-
-  CoverList Coverflow::Impl::GetCoverList(float animation_progress, gint64 /* timestep */)
-  {
-    CoverList results;
-
-    animation_progress = std::min<float>(1.0f, animation_progress);
-
-    float coverflow_position = position_ - ((position_ - saved_position_) * (1.0f - animation_progress));
-
-    size_t i = 0;
-    float flat_right = parent_->space_between_icons * (parent_->flat_icons) + .1;
-    float flat_left = -flat_right;
-
-    CoverflowModel::CoverflowItemList::const_iterator it;
-    for (it = parent_->model()->Items().begin(); it != parent_->model()->Items().end(); ++it)
-    {
-      CoverflowItem::Ptr item = *it;
-      float item_position = (float)i - coverflow_position;
-
-      Cover cover;
-      cover.opacity = 1.0f;
-      cover.selected = item == parent_->model()->Selection();
-      cover.item = item;
-
-      // This position refers to the bottom center of the cover.
-      cover.position.x    = 0;
-      cover.position.y    = -0.5f + parent_->y_offset;
-      cover.position.z    = 0;
-      cover.position.rot  = 0;
-
-      float x = item_position * parent_->space_between_icons;
-      cover.position.x = x;
-
-      float neg_pinch = 1.0f - parent_->pinching;
-
-      if (x < flat_left)
-      {
-        cover.position.rot = (atan((x - flat_left) * parent_->folding_rate) / (nux::constants::pi / 2)) * -parent_->folding_angle;
-        float scale_in_factor = neg_pinch + (1.0f - (std::abs(cover.position.rot) / parent_->folding_angle)) * parent_->pinching;
-        cover.position.x = flat_left - ((flat_left - x) * scale_in_factor);
-      }
-      else if (x > flat_right)
-      {
-        cover.position.rot = (atan((x - flat_right) * parent_->folding_rate) / (nux::constants::pi / 2)) * -parent_->folding_angle;
-        float scale_in_factor = neg_pinch+ (1.0f - (std::abs(cover.position.rot) / parent_->folding_angle)) * parent_->pinching;
-        cover.position.x = flat_right + ((x - flat_right) * scale_in_factor);
-      }
-
-      if (cover.selected && parent_->pop_out_selected)
-        cover.position.z = 0.3f;
-      
-      float fold_progress = std::abs(cover.position.rot / parent_->folding_angle());
-      cover.position.z -= parent_->folding_depth() * fold_progress;
-
-      nux::Point2 top_left, bottom_right;
-      Get3DBoundingBox(camera_position_.z, top_left, bottom_right);
-
-      float window_width = bottom_right.x - top_left.x;
-      float distance_from_edge = std::max<float>(0.0f, std::abs(bottom_right.x) - std::abs(cover.position.x));
-      cover.opacity = std::min<float>(1.0f, distance_from_edge / (window_width * parent_->edge_fade));
-
-      results.push_back(cover);
-      ++i;
-    }
-
-    last_position_ = coverflow_position;
-    return results;
-  }
-
-  void Coverflow::Impl::SetPosition(float position, bool animate)
-  {
-    float min = std::min<float>((float)parent_->flat_icons,(float)parent_->model()->Items().size() - 1.0f);
-    float max = std::max<float>(0.0f, (float)parent_->model()->Items().size() - 1.0f - (float)parent_->flat_icons);
-    position = std::max<float>(min, std::min<float>(max, position));
-    if (position == position_)
-      return;
-
-    if (animate)
-    {
-      position_set_time_ = g_get_monotonic_time();
-      saved_position_ = last_position_;
-    }
-    else
-    {
-      position_set_time_ = 0;
-    }
-
-    position_ = position;
-    
-    VelocityEvent ve;
-    ve.velocity = position_ - last_position_;
-    ve.time = g_get_monotonic_time();
-    velocity_events_.push_back(ve);
-  
-    MaybeQueueDraw();
-  }
-
-  void Coverflow::Impl::OnItemAdded(CoverflowModel* /* owner */, CoverflowItem::Ptr /* new_item */)
-  {
-    SetPosition(position_, true);
-    MaybeQueueDraw();
-  }
-
-  void Coverflow::Impl::OnItemRemoved(CoverflowModel* /* owner */, CoverflowItem::Ptr /* old_item */)
-  {
-    SetPosition(position_, true);
-    MaybeQueueDraw();
-  }
-
-  void Coverflow::Impl::OnSelectionChanged(CoverflowModel* /* owner */, CoverflowItem::Ptr /* selection */)
-  {
-    size_t selection_index = parent_->model()->SelectionIndex();
-
-    if (selection_index > (position_ + parent_->flat_icons))
-      SetPosition(selection_index - parent_->flat_icons, true);
-    else if (selection_index < (position_ - parent_->flat_icons))
-      SetPosition(selection_index + parent_->flat_icons, true);
-    MaybeQueueDraw();
-  }
-
-  void Coverflow::Impl::MaybeQueueDraw()
-  {
-    if (!animation_handle_)
-      animation_handle_ = g_timeout_add(0, &Coverflow::Impl::OnAnimationTimeout, this);
-  }
-
-  void Coverflow::Impl::LoadVertexBuffer(int VertexLocation, int TextureCoord0Location, int VertexColorLocation, float* VtxBuffer)
-  {
-    CHECKGL(glEnableVertexAttribArrayARB(VertexLocation));
-    CHECKGL(glVertexAttribPointerARB((GLuint) VertexLocation, 4, GL_FLOAT, GL_FALSE, 48, VtxBuffer));
-
-    if (TextureCoord0Location != -1)
-    {
-      CHECKGL(glEnableVertexAttribArrayARB(TextureCoord0Location));
-      CHECKGL(glVertexAttribPointerARB((GLuint) TextureCoord0Location, 4, GL_FLOAT, GL_FALSE, 48, VtxBuffer + 4));
-    }
-
-    if (VertexColorLocation != -1)
-    {
-      CHECKGL(glEnableVertexAttribArrayARB(VertexColorLocation));
-      CHECKGL(glVertexAttribPointerARB((GLuint) VertexColorLocation, 4, GL_FLOAT, GL_FALSE, 48, VtxBuffer + 8));
-    }
-  }
-
-  void Coverflow::Impl::RenderCover(nux::GraphicsEngine& graphics_engine, Cover const& cover, int width, int height, nux::Matrix4 combined_matrix)
-  {
-    ObjectPtr<IOpenGLBaseTexture> texture = cover.item->GetTexture()->GetDeviceTexture();
-    nux::TexCoordXForm texxform;
-    nux::Color ref_color = nux::color::White;
-
-    QRP_Compute_Texture_Coord(width, height, texture, texxform);
-
-    float ratio = texture->GetWidth()/(float)texture->GetHeight();
-    float drop_shadow_ratio = drop_shadow_texture_->GetWidth()/(float)drop_shadow_texture_->GetHeight();
-
-    float fx = cover_width_in_3d_space_/2.0f;
-
-    float fy_top = cover.position.y + (cover_width_in_3d_space_) * (1.0f/ratio);
-    float fy_bot = cover.position.y;
-    float fy_bot_reflec = cover.position.y - (cover_width_in_3d_space_) * (1.0f/ratio) * parent_->reflection_size;
-
-    float fx_shadow = 0.5 * (1.1 * cover_width_in_3d_space_);
-    float fy_top_shadow = fy_bot + 0.5 * (1.4 * cover_width_in_3d_space_) * (1.0f/drop_shadow_ratio);
-    float fy_bot_shadow = fy_bot - 0.5 * (1.4 * cover_width_in_3d_space_) * (1.0f/drop_shadow_ratio);
-    
-
-    cover_shader_program_->Begin();
-
-    int TextureObjectLocation = cover_shader_program_->GetUniformLocationARB("TextureObject0");
-    int VertexLocation = cover_shader_program_->GetAttributeLocation("iVertex");
-    int TextureCoord0Location = cover_shader_program_->GetAttributeLocation("iTextureCoord0");
-    int VertexColorLocation = cover_shader_program_->GetAttributeLocation("iVertexColor");
-    int VPMatrixLocation = cover_shader_program_->GetUniformLocationARB("ViewProjectionMatrix");
-
-    nux::Matrix4 MVPMatrix = perspective_ * combined_matrix;
-
-    cover_shader_program_->SetUniformLocMatrix4fv((GLint) VPMatrixLocation, 1, true, (GLfloat*) &(MVPMatrix.m));
-
-    // *** Compute the opacities ***
-    float angular_opacity = 1.0f;
-    if (parent_->folding_angle == 0)
-    {
-      angular_opacity = 1.0f;
-    }
-    else
-    {
-      float rotation_ratio = std::abs(cover.position.rot / parent_->folding_angle);
-      angular_opacity = 1.0f - rotation_ratio;
-    }
-
-    float opacity = 1.0f - std::abs(cover.position.x) / (parent_->reflection_fadeout_distance);
-    if (opacity < 0.0f)
-    {
-      opacity = 0.0f;
-    }
-
-    opacity *= angular_opacity;
-
-    drop_shadow_texture_->SetFiltering (GL_LINEAR, GL_LINEAR);
-    graphics_engine.SetTexture(GL_TEXTURE0, drop_shadow_texture_);
-    CHECKGL(glUniform1iARB(TextureObjectLocation, 0));
-
-    // **** Render the cover drop shadow ****
-    if (parent_->show_drop_shadow)
-    {
-      Color color = ref_color * cover.opacity * angular_opacity;
-      float VtxBuffer[] =
-      {
-        -fx_shadow, fy_top_shadow,  0.0f, 1.0f, texxform.u0, texxform.v0, 0, 0, color.red, color.green, color.blue, color.alpha,
-        -fx_shadow, fy_bot_shadow,  0.0f, 1.0f, texxform.u0, texxform.v1, 0, 0, color.red, color.green, color.blue, color.alpha,
-        fx_shadow,  fy_bot_shadow,  0.0f, 1.0f, texxform.u1, texxform.v1, 0, 0, color.red, color.green, color.blue, color.alpha,
-        fx_shadow,  fy_top_shadow,  0.0f, 1.0f, texxform.u1, texxform.v0, 0, 0, color.red, color.green, color.blue, color.alpha,
-      };
-
-      LoadVertexBuffer(VertexLocation, TextureCoord0Location, VertexColorLocation, VtxBuffer);
-      CHECKGL(glDrawArrays(GL_TRIANGLE_FAN, 0, 4));
-    }
-    
-
-    texture->SetFiltering (GL_LINEAR, GL_LINEAR);
-    graphics_engine.SetTexture(GL_TEXTURE0, texture);
-    CHECKGL(glUniform1iARB(TextureObjectLocation, 0));
-
-    // **** Render the cover ****
-    {
-      Color color = ref_color * cover.opacity;
-      float VtxBuffer[] =
-      {
-        -fx, fy_top,  0.0f, 1.0f, texxform.u0, texxform.v0, 0, 0, color.red, color.green, color.blue, color.alpha,
-        -fx, fy_bot,  0.0f, 1.0f, texxform.u0, texxform.v1, 0, 0, color.red, color.green, color.blue, color.alpha,
-        fx,  fy_bot,  0.0f, 1.0f, texxform.u1, texxform.v1, 0, 0, color.red, color.green, color.blue, color.alpha,
-        fx,  fy_top,  0.0f, 1.0f, texxform.u1, texxform.v0, 0, 0, color.red, color.green, color.blue, color.alpha,
-      };
-
-      LoadVertexBuffer(VertexLocation, TextureCoord0Location, VertexColorLocation, VtxBuffer);
-      CHECKGL(glDrawArrays(GL_TRIANGLE_FAN, 0, 4));
-    }
-
-    // **** Reflection opacity ****
-    if (parent_->show_reflection)
-    {
-      texxform.flip_v_coord = true;
-      QRP_Compute_Texture_Coord(width, height, texture, texxform);
-
-      // texture offset use to prevent the texture from scaling when the reflection size changes.
-      float toff = 1.0f - parent_->reflection_size;
-
-      float opacity_start = opacity*parent_->reflection_strength * cover.opacity;
-      float opacity_end   = 0.0f;
-      float VtxBuffer[] =
-      {
-        -fx, fy_bot,        0.0f, 1.0f, texxform.u0, texxform.v0,         0, 0, opacity_start, opacity_start, opacity_start, opacity_start,
-        -fx, fy_bot_reflec, 0.0f, 1.0f, texxform.u0, texxform.v1 + toff,  0, 0, opacity_end,   opacity_end,   opacity_end,   opacity_end,
-        fx,  fy_bot_reflec, 0.0f, 1.0f, texxform.u1, texxform.v1 + toff,  0, 0, opacity_end,   opacity_end,   opacity_end,   opacity_end,
-        fx,  fy_bot,        0.0f, 1.0f, texxform.u1, texxform.v0,         0, 0, opacity_start, opacity_start, opacity_start, opacity_start,
-      };
-
-      LoadVertexBuffer(VertexLocation, TextureCoord0Location, VertexColorLocation, VtxBuffer);
-      CHECKGL(glDrawArrays(GL_TRIANGLE_FAN, 0, 4));
-    }
-
-    // **** Render Cover label ****
-    if (parent_->show_labels())
-    {
-      if (!cover.item->text_texture().IsValid())