mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-19 07:21:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix the rest of the tooltips for linux.

Browse source 
Also remove some unneeded linkage since the merge.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7026 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice 2011-01-31 22:19:30 +00:00
parent d6e784121f
commit d932bdf480
4 changed files with 32 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Source/Core/DolphinWX/Src/InputConfigDiag.cpp
View file

@ -687,10 +687,9 @@ ControlGroupBox::~ControlGroupBox()
}
ControlGroupBox::ControlGroupBox(ControllerEmu::ControlGroup* const group, wxWindow* const parent, wxWindow* const eventsink)
: wxStaticBoxSizer(wxVERTICAL, parent, WXTSTR_FROM_CSTR(group->name))
: wxBoxSizer(wxVERTICAL)
, control_group(group)
{
static_bitmap = NULL;
wxFont m_SmallFont(7, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL);
@ -877,7 +876,10 @@ ControlGroupsSizer::ControlGroupsSizer(ControllerEmu* const controller, wxWindow
wxBoxSizer* stacked_groups = NULL;
for (unsigned int i = 0; i < controller->groups.size(); ++i)
{
ControlGroupBox* control_group = new ControlGroupBox(controller->groups[i], parent, eventsink);
ControlGroupBox* control_group_box = new ControlGroupBox(controller->groups[i], parent, eventsink);
wxStaticBoxSizer *control_group =
new wxStaticBoxSizer(wxVERTICAL, parent, WXTSTR_FROM_CSTR(controller->groups[i]->name));
control_group->Add(control_group_box);
const size_t grp_size = controller->groups[i]->controls.size() + controller->groups[i]->settings.size();
col_size += grp_size;
@ -895,7 +897,7 @@ ControlGroupsSizer::ControlGroupsSizer(ControllerEmu* const controller, wxWindow
stacked_groups->Add(control_group, 0, wxEXPAND);
if (groups)
groups->push_back(control_group);
groups->push_back(control_group_box);
}
if (stacked_groups)