diff options
Diffstat (limited to 'src/gui.cpp')
| -rw-r--r-- | src/gui.cpp | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/src/gui.cpp b/src/gui.cpp index abad5b2..de87bcc 100644 --- a/src/gui.cpp +++ b/src/gui.cpp @@ -443,41 +443,45 @@ TabGameRightPanel::TabGameRightPanel( wxWindow* parent, wxWindowID id, const wxP comment_input = new wxTextCtrl( editor_page, COMMENT_INPUT_BOX, wxEmptyString, wxDefaultPosition, wxSize( -1,200 ), wxTE_MULTILINE ); editor_page_sizer->Add( comment_input, 0, wxALL|wxEXPAND, 5 ); + nag_panel = new wxPanel( editor_page, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxGridSizer* nag_sizer; nag_sizer = new wxGridSizer( 2, 8, 0, 0 ); - nag_1 = new wxButton( editor_page, wxID_ANY, wxT("!"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT ); + nag_1 = new wxButton( nag_panel, wxID__ANY, wxT("!"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT ); nag_sizer->Add( nag_1, 0, wxALL|wxEXPAND, 5 ); - nag_2 = new wxButton( editor_page, wxID_ANY, wxT("?"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT ); + nag_2 = new wxButton( nag_panel, wxID_ANY, wxT("?"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT ); nag_sizer->Add( nag_2, 0, wxALL|wxEXPAND, 5 ); - nag_3 = new wxButton( editor_page, wxID_ANY, wxT("!!"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT ); + nag_3 = new wxButton( nag_panel, wxID_ANY, wxT("!!"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT ); nag_sizer->Add( nag_3, 0, wxALL|wxEXPAND, 5 ); - nag_4 = new wxButton( editor_page, wxID_ANY, wxT("??"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT ); + nag_4 = new wxButton( nag_panel, wxID_ANY, wxT("??"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT ); nag_sizer->Add( nag_4, 0, wxALL|wxEXPAND, 5 ); - nag_5 = new wxButton( editor_page, wxID_ANY, wxT("!?"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT ); + nag_5 = new wxButton( nag_panel, wxID_ANY, wxT("!?"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT ); nag_sizer->Add( nag_5, 0, wxALL|wxEXPAND, 5 ); - nag_6 = new wxButton( editor_page, wxID_ANY, wxT("?!"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT ); + nag_6 = new wxButton( nag_panel, wxID_ANY, wxT("?!"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT ); nag_sizer->Add( nag_6, 0, wxALL|wxEXPAND, 5 ); - nag_10 = new wxButton( editor_page, wxID_ANY, wxT("="), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT ); + nag_10 = new wxButton( nag_panel, wxID_ANY, wxT("="), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT ); nag_sizer->Add( nag_10, 0, wxALL|wxEXPAND, 5 ); - nag_18 = new wxButton( editor_page, wxID_ANY, wxT("+-"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT ); + nag_18 = new wxButton( nag_panel, wxID_ANY, wxT("+-"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT ); nag_sizer->Add( nag_18, 0, wxALL|wxEXPAND, 5 ); - nag_19 = new wxButton( editor_page, wxID_ANY, wxT("-+"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT ); + nag_19 = new wxButton( nag_panel, wxID_ANY, wxT("-+"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT ); nag_sizer->Add( nag_19, 0, wxALL|wxEXPAND, 5 ); - nag_del = new wxButton( editor_page, wxID_ANY, wxT("DEL"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT ); + nag_del = new wxButton( nag_panel, wxID_ANY, wxT("DEL"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT ); nag_sizer->Add( nag_del, 0, wxALL|wxEXPAND, 5 ); - editor_page_sizer->Add( nag_sizer, 1, wxEXPAND, 5 ); + nag_panel->SetSizer( nag_sizer ); + nag_panel->Layout(); + nag_sizer->Fit( nag_panel ); + editor_page_sizer->Add( nag_panel, 1, wxEXPAND | wxALL, 5 ); editor_page->SetSizer( editor_page_sizer ); |