Mercurial > mercurial > hgweb_iklist.hg.cgi
changeset 3:d3e201c48ff8 draft default tip
bug fix.
| author | pyon |
|---|---|
| date | Wed, 29 Sep 2021 22:04:51 +0900 |
| parents | c0f76f8e67fa |
| children | |
| files | app.conf src/iklist.cpp |
| diffstat | 2 files changed, 6 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/app.conf Sat Aug 28 09:56:40 2021 +0900 +++ b/app.conf Wed Sep 29 22:04:51 2021 +0900 @@ -1,2 +1,2 @@ [Misc] -version=0.9.0 +version=1.0.1
--- a/src/iklist.cpp Sat Aug 28 09:56:40 2021 +0900 +++ b/src/iklist.cpp Wed Sep 29 22:04:51 2021 +0900 @@ -1,11 +1,12 @@ // Filename : iklist.cpp -// Last Change: 2021-08-27 金 14:20:56. +// Last Change: 2021-09-29 水 16:56:26. // #include <wx/textfile.h> #include <wx/utils.h> #include <wx/dir.h> #include <wx/filefn.h> #include <wx/wfstream.h> +#include <wx/sstream.h> #include <wx/txtstrm.h> #include <wx/fs_zip.h> #include <wx/filesys.h> @@ -39,8 +40,6 @@ m_searchCtrl->Connect(wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler(MainFrame::OnSearch), NULL, this); m_textCtrl->Connect(wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler(MainFrame::OnTextEnter), NULL, this); m_button->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(MainFrame::OnClick), NULL, this); - m_choiceCity->Connect(wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler(MainFrame::OnCityChoice), NULL, this); - m_choiceKind->Connect(wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler(MainFrame::OnKindChoice), NULL, this); m_dataViewListCtrl->Connect(wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED, wxDataViewEventHandler(MainFrame::OnListItemActivated), NULL, this); } @@ -153,7 +152,7 @@ m_dataViewListCtrl->Scroll(0, 0); m_statusBar->SetStatusText(wxString::Format(wxT(" %d found."), n), 0); } -#include <wx/sstream.h> + wxString MainFrame::MakePDF(wxString index) { wxString tmpdir; @@ -301,6 +300,8 @@ m_textCtrl->Destroy(); m_button->Destroy(); m_searchCtrl->Show(); + m_choiceCity->Connect(wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler(MainFrame::OnCityChoice), NULL, this); + m_choiceKind->Connect(wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler(MainFrame::OnKindChoice), NULL, this); this->Layout(); SetList();