Merge branch 'rr1-maint'
This commit is contained in:
commit
cb4d4738b8
1 changed files with 5 additions and 5 deletions
|
@ -962,11 +962,10 @@ wxwin_project::~wxwin_project()
|
||||||
void wxwin_project::on_tab_select(wxNotebookEvent& e)
|
void wxwin_project::on_tab_select(wxNotebookEvent& e)
|
||||||
{
|
{
|
||||||
int p = e.GetSelection();
|
int p = e.GetSelection();
|
||||||
if(p == -1) {
|
if(p < 0) {
|
||||||
notebook->SetSelection(0);
|
load->Disable();
|
||||||
p = 0;
|
return;
|
||||||
}
|
} else if(p == 0) {
|
||||||
if(p == 0) {
|
|
||||||
load_file = true;
|
load_file = true;
|
||||||
load->SetLabel(wxT("Load"));
|
load->SetLabel(wxT("Load"));
|
||||||
} else if(p == 1) {
|
} else if(p == 1) {
|
||||||
|
@ -975,6 +974,7 @@ void wxwin_project::on_tab_select(wxNotebookEvent& e)
|
||||||
}
|
}
|
||||||
wxCommandEvent e2;
|
wxCommandEvent e2;
|
||||||
on_filename_change(e2);
|
on_filename_change(e2);
|
||||||
|
e.Skip();
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxwin_project::on_ask_filename(wxCommandEvent& e)
|
void wxwin_project::on_ask_filename(wxCommandEvent& e)
|
||||||
|
|
Loading…
Add table
Reference in a new issue