mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-11 06:34:36 +00:00
update bullet so it actually works
Moved the addSourceDirectory for physics/Bullet into the Engine/Source/CMakeLists.txt file that way it can actually appear where we expect it to in the solution explorer.
This commit is contained in:
parent
c7be48130a
commit
13fa178cf6
5986 changed files with 1811270 additions and 453803 deletions
|
|
@ -5,54 +5,48 @@ using namespace Gwen;
|
|||
|
||||
class ComboBox : public GUnit
|
||||
{
|
||||
public:
|
||||
|
||||
GWEN_CONTROL_INLINE( ComboBox, GUnit )
|
||||
public:
|
||||
GWEN_CONTROL_INLINE(ComboBox, GUnit)
|
||||
{
|
||||
|
||||
{
|
||||
Gwen::Controls::ComboBox* combo = new Gwen::Controls::ComboBox( this );
|
||||
Gwen::Controls::ComboBox* combo = new Gwen::Controls::ComboBox(this);
|
||||
combo->SetKeyboardInputEnabled(true);
|
||||
combo->SetPos( 50, 50 );
|
||||
combo->SetWidth( 200 );
|
||||
combo->SetPos(50, 50);
|
||||
combo->SetWidth(200);
|
||||
|
||||
combo->AddItem(L"Option One", "one");
|
||||
combo->AddItem(L"Number Two", "two");
|
||||
combo->AddItem(L"Door Three", "three");
|
||||
combo->AddItem(L"Four Legs", "four");
|
||||
combo->AddItem(L"Five Birds", "five");
|
||||
|
||||
combo->AddItem( L"Option One", "one" );
|
||||
combo->AddItem( L"Number Two", "two" );
|
||||
combo->AddItem( L"Door Three", "three" );
|
||||
combo->AddItem( L"Four Legs", "four" );
|
||||
combo->AddItem( L"Five Birds", "five" );
|
||||
|
||||
combo->onSelection.Add( this, &ComboBox::OnComboSelect );
|
||||
combo->onSelection.Add(this, &ComboBox::OnComboSelect);
|
||||
}
|
||||
|
||||
{
|
||||
// Empty..
|
||||
Gwen::Controls::ComboBox* combo = new Gwen::Controls::ComboBox( this );
|
||||
combo->SetPos( 50, 80 );
|
||||
combo->SetWidth( 200 );
|
||||
Gwen::Controls::ComboBox* combo = new Gwen::Controls::ComboBox(this);
|
||||
combo->SetPos(50, 80);
|
||||
combo->SetWidth(200);
|
||||
}
|
||||
|
||||
{
|
||||
// Empty..
|
||||
Gwen::Controls::ComboBox* combo = new Gwen::Controls::ComboBox( this );
|
||||
combo->SetPos( 50, 110 );
|
||||
combo->SetWidth( 200 );
|
||||
Gwen::Controls::ComboBox* combo = new Gwen::Controls::ComboBox(this);
|
||||
combo->SetPos(50, 110);
|
||||
combo->SetWidth(200);
|
||||
|
||||
for (int i=0; i<500; i++ )
|
||||
combo->AddItem( L"Lots Of Options" );
|
||||
for (int i = 0; i < 500; i++)
|
||||
combo->AddItem(L"Lots Of Options");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
void OnComboSelect( Gwen::Controls::Base* pControl )
|
||||
void OnComboSelect(Gwen::Controls::Base* pControl)
|
||||
{
|
||||
Gwen::Controls::ComboBox* combo = (Gwen::Controls::ComboBox*)pControl;
|
||||
|
||||
UnitPrint( Utility::Format( L"Combo Changed: %s", combo->GetSelectedItem()->GetText().c_str() ) );
|
||||
UnitPrint(Utility::Format(L"Combo Changed: %s", combo->GetSelectedItem()->GetText().c_str()));
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
|
||||
DEFINE_UNIT_TEST( ComboBox, L"ComboBox" );
|
||||
DEFINE_UNIT_TEST(ComboBox, L"ComboBox");
|
||||
Loading…
Add table
Add a link
Reference in a new issue