--- a/src/kaigo/horori/searcher/include/searcher.h	Thu Apr 16 20:59:35 2020 +0900
+++ b/src/kaigo/horori/searcher/include/searcher.h	Sat Apr 18 21:10:29 2020 +0900
@@ -1,5 +1,5 @@
 // Filename   : searcher.h
-// Last Change: 2020-04-16 木 16:10:37.
+// Last Change: 2020-04-17 金 16:09:33.
 //
 #pragma once
 
@@ -34,6 +34,8 @@
 #include <wx/scrolwin.h>
 #include <wx/gbsizer.h>
 
+class SearchFrame;
+
 class MyStaticBitmap : public wxStaticBitmap
 {
 	private:
@@ -41,6 +43,8 @@
 		int cx, cy;             // for mouse-gesture
 		//bool with_stl = false;
 		wxScrolledWindow* m_parent;
+		wxNotebook*       m_parent1;
+		SearchFrame*      m_parent2;
 
 	public:
 		int zoom = 0;
@@ -57,10 +61,9 @@
 		void OnEndRGesture(wxMouseEvent& event);
         void OnMotion(wxMouseEvent& event);
         void OnWheel(wxMouseEvent& event);
-		/*
-		void ChangeBook( int i );
-		void WithSatellite( bool sw ) { with_stl = sw; };
-		*/
+
+		void ChangeBook(int i);
+		void SetParentWidows(SearchFrame *sf, wxNotebook *nb) {m_parent2 = sf; m_parent1 = nb;};
 		void ParentWinGetSize(int *ww, int *wh) {m_parent->GetSize(ww, wh);};
 		void ParentWinScroll(int x, int y) {m_parent->Scroll(x, y);};
 		void ParentWinSetScrollbars(int x, int y, int s, int t) {m_parent->SetScrollbars(x, y, s, t);};
@@ -109,22 +112,27 @@
 		wxStaticText* m_staticTextDrive;
 		wxStaticText* m_staticTextYear;
 		wxStaticText* m_staticTextDate;
+		wxStaticText* m_staticTextCcn;
 		wxStaticText* m_staticTextData;
 
-		wxStaticText* m_staticTextDB;
+		wxStaticText*       m_staticTextDB;
 		wxChoice*           m_choiceIdxYear;
 		wxDataViewListCtrl* m_dataViewListCtrlIdxDate;
 		wxDataViewColumn*   m_dataViewListColumnIdxDateNo;
 		wxDataViewColumn*   m_dataViewListColumnIdxDate;
+		wxStaticText*       m_staticTextIdxCcn;
 		wxDataViewListCtrl* m_dataViewListCtrlIdx;
 		wxDataViewColumn*   m_dataViewListColumnIdxNo;
 		wxDataViewColumn*   m_dataViewListColumnIdxHno;
 		wxDataViewColumn*   m_dataViewListColumnIdxName;
-
+		// -
+		wxChoice*           m_choiceDrv;
 		wxChoice*           m_choiceDrvYear;
 		wxDataViewListCtrl* m_dataViewListCtrlDrvDate;
 		wxDataViewColumn*   m_dataViewListColumnDrvDateNo;
 		wxDataViewColumn*   m_dataViewListColumnDrvDate;
+		wxDataViewListCtrl* m_dataViewListCtrlDrvCcn;
+		wxDataViewColumn*   m_dataViewListColumnDrvCcn;
 		wxDataViewListCtrl* m_dataViewListCtrlDrv;
 		wxDataViewColumn*   m_dataViewListColumnDrvNo;
 		wxDataViewColumn*   m_dataViewListColumnDrvHno;
@@ -161,17 +169,21 @@
 
 		// Virtual event handlers, overide them in your derived class
 		virtual void OnChar(wxKeyEvent& event);
+		virtual void OnPageChanged(wxNotebookEvent& event);
 		virtual void OnFile(wxFileDirPickerEvent& event);
 		virtual void OnRead(wxCommandEvent& event);
 		virtual void OnHist(wxCommandEvent& event);
-		virtual void OnSelectBatchListItem(wxDataViewEvent& event);
+		virtual void OnSelectBatchListCtrlA(wxKeyEvent& event);
+		virtual void OnSelectBatchDClick(wxDataViewEvent& event);
 		virtual void OnSelectListAnyItem(wxDataViewEvent& event);
 		virtual void OnPrint(wxCommandEvent& event);
 		virtual void OnIdxYearChoice(wxCommandEvent& event);
 		virtual void OnIdxDateSelected(wxDataViewEvent& event);
 		virtual void OnDrvYearChoice(wxCommandEvent& event);
+		virtual void OnDrvDateSelected(wxDataViewEvent& event);
 		virtual void OnDrvDateDClicked(wxDataViewEvent& event);
-		virtual void OnDrvDateSelected(wxDataViewEvent& event);
+		virtual void OnDrvCcnSelected(wxDataViewEvent& event);
+		virtual void OnDrvCcnDClicked(wxDataViewEvent& event);
 		virtual void OnDrvDClicked(wxDataViewEvent& event);
 		virtual void OnUploadHhsDB(wxCommandEvent& event);
 		virtual void OnUploadImage(wxCommandEvent& event);