--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libgui/graphics/PopupMenuControl.cc	Thu Feb 20 14:05:45 2014 -0500
@@ -0,0 +1,143 @@
+/*
+
+Copyright (C) 2011 Michael Goffioul.
+
+This file is part of QtHandles.
+
+Foobar is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+QtHandles 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 Foobar.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <QComboBox>
+
+#include "Container.h"
+#include "PopupMenuControl.h"
+#include "Utils.h"
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace QtHandles
+{
+
+//////////////////////////////////////////////////////////////////////////////
+
+PopupMenuControl* PopupMenuControl::create (const graphics_object& go)
+{
+  Object* parent = Object::parentObject (go);
+
+  if (parent)
+    {
+      Container* container = parent->innerContainer ();
+
+      if (container)
+	return new PopupMenuControl (go, new QComboBox (container));
+    }
+
+  return 0;
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+PopupMenuControl::PopupMenuControl (const graphics_object& go, QComboBox *box)
+     : BaseControl (go, box), m_blockUpdate (false)
+{
+  uicontrol::properties& up = properties<uicontrol> ();
+
+  box->addItems (Utils::fromStdString (up.get_string_string ()).split ('|'));
+
+  connect (box, SIGNAL (currentIndexChanged (int)),
+	   SLOT (currentIndexChanged (int)));
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+PopupMenuControl::~PopupMenuControl (void)
+{
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+void PopupMenuControl::update (int pId)
+{
+  uicontrol::properties& up = properties<uicontrol> ();
+  QComboBox* box = qWidget<QComboBox> ();
+
+  switch (pId)
+    {
+    case uicontrol::properties::ID_STRING:
+      m_blockUpdate = true;
+	{
+	  int oldCurrent = box->currentIndex ();
+
+	  box->clear ();
+	  box->addItems (Utils::fromStdString
+			 (up.get_string_string ()).split ('|'));
+	  if (box->count() > 0
+	      && oldCurrent >= 0
+	      && oldCurrent < box->count ())
+	    {
+	      box->setCurrentIndex (oldCurrent);
+	    }
+	  else
+	    {
+	      gh_manager::post_set (m_handle, "value",
+				    octave_value (box->count () > 0
+						  ? 1.0 : 0.0),
+				    false);
+	    }
+	}
+      m_blockUpdate = false;
+      break;
+    case uicontrol::properties::ID_VALUE:
+	{
+	  Matrix value = up.get_value ().matrix_value ();
+
+	  if (value.numel () > 0)
+	    {
+	      int newIndex = int (value(0)) - 1;
+
+	      if (newIndex >= 0 && newIndex < box->count ()
+		  && newIndex != box->currentIndex ())
+		{
+		  box->setCurrentIndex (newIndex);
+		}
+	    }
+	}
+      break;
+    default:
+      BaseControl::update (pId);
+      break;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+void PopupMenuControl::currentIndexChanged (int index)
+{
+  if (! m_blockUpdate)
+    {
+      gh_manager::post_set (m_handle, "value",
+			    octave_value (double (index + 1)),
+			    false);
+      gh_manager::post_callback (m_handle, "callback");
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+}; // namespace QtHandles