new wxProgressDialog(_T("Adding file(s)"),
_T(""),
1000,
- this,
+// this,
+ NULL,
wxPD_ELAPSED_TIME |
// wxPD_ESTIMATED_TIME |
// wxPD_REMAINING_TIME |
mProgressDialog->Pulse(_T("Updating view..."));
UpdateTreeViewLevel(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),1);
- delete mProgressDialog;
+ killProgress();
DisplayAddSummary();
}
mProgressDialog->Pulse(_T("Updating view..."));
UpdateTreeViewLevel(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),1);
- delete mProgressDialog;
+ killProgress();
DisplayAddSummary();
}
mViewer->StartPlayer();
#else
void WxGimmickView::UpdateWindowUI(long flags)
{
- //if(mViewer)
- // {
- // mViewer->RefreshIfNecessary();
- // }
+ if(mViewer)
+ {
+ mViewer->RefreshIfNecessary();
+ }
}
#endif
//==================================================
mProgressDialog->Pulse(_T("Updating view..."));
UpdateTreeViewLevel(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),1);
- delete mProgressDialog;
+ killProgress();
DisplayAddSummary();
}
std::cout <<"after mProgressDialog->Pulse" << std::endl;
UpdateTreeViewLevel(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),1);
std::cout <<"after UpdateTreeViewLevel" << std::endl;
- delete mProgressDialog;
+ killProgress();
std::cout <<"after delete mProgressDialog" << std::endl;
DisplayAddSummary();
std::cout <<"after dDisplayAddSummary" << std::endl;
mProgressDialog->Pulse(_T("Updating view..."));
UpdateTreeViewLevel(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),1);
- delete mProgressDialog;
+ killProgress();
DisplayAddSummary();
mViewer->StartPlayer();
}
mGimmick->AddFiles(storage,i_filenames);
mProgressDialog->Pulse(_T("Updating view..."));
UpdateTreeViewLevel(storage,1);
- delete mProgressDialog;
+ killProgress();
DisplayAddSummary();
}
}
// std::cout << "OnAddProgress "<<mess<<std::endl;
wxString s(wxString::From8BitData(mess));
// std::cout << "Pulse"<<std::endl;
- if (!mProgressDialog->Pulse(s))
- {
- p.SetStop();
- }
+
+ if(mProgressDialog != 0)
+ {
+ if (!mProgressDialog->Pulse(s))
+ {
+ p.SetStop();
+ }
+ }
// std::cout << "OnAddProgress ok"<<std::endl;
}
//=================================================
}
}
+ void WxGimmickView::killProgress()
+ {
+ mProgressDialog->Resume();
+ mProgressDialog->Destroy();
+ mProgressDialog = 0;
+ }
+
//=================================================
//=================================================