Changeset 8619 in orxonox.OLD for trunk/src/story_entities

Timestamp:

Jun 20, 2006, 1:24:11 PM (18 years ago)

Author:

bensch

Message:

trunk: merged the gui-branche back.
merged with command:
svn merge -r8520:HEAD ​https://svn.orxonox.net/orxonox/branches/gui
no conflicts

File:

• trunk/src/story_entities/simple_game_menu.cc (modified) (1 diff)

trunk/src/story_entities/simple_game_menu.cc

@@ -120 +120 @@
     OrxGui::GLGuiSlider* slider = new OrxGui::GLGuiSlider();
     slider->connect(SIGNAL(slider, valueChanged), this, SLOT(SimpleGameMenu, TEST));
-    slider->connect(SIGNAL(slider, valueChanged), box, SLOT(OrxGui::GLGuiWidget, setBackgroundColor));
     slider->setRange(0, 1);
     slider->setValue(slider->min());
     box->pack(slider);
+
+
+    OrxGui::GLGuiTable* table = new OrxGui::GLGuiTable(3, 3);
+    std::vector<std::string> headers;
+    headers.push_back("1");
+    headers.push_back("2");
+    headers.push_back("3");
+    table->setHeader(headers);
+
+
+    box->pack(table);
   }
   box->setAbsCoor2D(50, 200);