# HG changeset patch
# User pyon@macmini
# Date 1319024212 -32400
# Node ID 550c143ab1942177e05c7288a687c0e53b056817
# Parent  a43adb9537b2938e0dcda3a43b99be93200840f9
implement NextThursday button.

diff -r a43adb9537b2 -r 550c143ab194 include/common.h
--- a/include/common.h	Wed Oct 19 07:49:32 2011 +0900
+++ b/include/common.h	Wed Oct 19 20:36:52 2011 +0900
@@ -1,5 +1,5 @@
 // Filename   : common.h
-// Last Change: 18-Oct-2011.
+// Last Change: 19-Oct-2011.
 //
 #ifndef __COMMON__
 #define __COMMON__
@@ -44,6 +44,7 @@
     ID_MENUITEMAPPDIR,
     ID_MENUITEMQUIT,
 
+    ID_BUTTONNEXTTHU,
     ID_BUTTONMKDIR,
     ID_TEXTCTRLDIST,
     ID_TEXTCTRLGUESS,
diff -r a43adb9537b2 -r 550c143ab194 include/main.h
--- a/include/main.h	Wed Oct 19 07:49:32 2011 +0900
+++ b/include/main.h	Wed Oct 19 20:36:52 2011 +0900
@@ -1,11 +1,17 @@
 // Filename   : main.h
-// Last Change: 17-Oct-2011.
+// Last Change: 19-Oct-2011.
 //
 #include "wx/wx.h"
 #include "wx/config.h"
 #include "wx/fileconf.h"
 
-#include "symbol.h"
+//#include "symbol.h"
+#define MYAPPNAME wxT("AMover2")
+
+#define VER 2
+#define REV 1
+#define BLD 20111027
+
 // private classes
 // Define a new application type, each program should derive a class from wxApp
 class MyApp : public wxApp
diff -r a43adb9537b2 -r 550c143ab194 include/myframe.h
--- a/include/myframe.h	Wed Oct 19 07:49:32 2011 +0900
+++ b/include/myframe.h	Wed Oct 19 20:36:52 2011 +0900
@@ -1,5 +1,5 @@
 // Filename   : myframe.h
-// Last Change: 17-Oct-2011.
+// Last Change: 19-Oct-2011.
 //
 
 #ifndef __myframe__
@@ -25,6 +25,7 @@
         wxComboBox*       m_comboBoxDrive;
         wxStaticText*     m_staticTextDate;
         wxDatePickerCtrl* m_datePicker;
+        wxButton*         m_buttonNextThu;
         wxStaticText*     m_staticTextCcn;
         wxComboBox*       m_comboBoxCcn;
         wxButton*         m_buttonMkDir;
@@ -42,7 +43,6 @@
 
         wxButton*         m_buttonDetect;
         wxButton*         m_buttonMove;
-        //wxButton*         m_buttonMD;
         wxButton*         m_buttonDel;
         wxButton*         m_buttonUndo;
     
@@ -51,6 +51,7 @@
         ~MyFrame();
 
         void OnParam(wxCommandEvent& event);
+        void OnNextThursday(wxCommandEvent& event);
         void OnMakeDir(wxCommandEvent& event);
         void GetImageInfo(wxListEvent& event);
         void ViewLarge(wxListEvent& event);
@@ -60,7 +61,6 @@
         void OnDelete(wxCommandEvent& event);
         void OnUndo(wxCommandEvent& event);
         void ReadyImage(void);
-        //void MoveImage(void);
         // $B0J2<!$Dj7?$b$N(B
         void OnWinSize(wxSizeEvent& event);
         void OnWinMove(wxMoveEvent& event);
diff -r a43adb9537b2 -r 550c143ab194 include/symbol.h
--- a/include/symbol.h	Wed Oct 19 07:49:32 2011 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-// Filename   : symbol.h
-// Last Change: 17-Oct-2011.
-//
-
-#define MYAPPNAME wxT("AMover2")
-
-#define VER 2
-#define REV 1
-#define BLD 20111017
-
diff -r a43adb9537b2 -r 550c143ab194 makefile
--- a/makefile	Wed Oct 19 07:49:32 2011 +0900
+++ b/makefile	Wed Oct 19 20:36:52 2011 +0900
@@ -1,6 +1,6 @@
 #
 # Makefile for wxWidgets Application
-#  Last Change: 18-Oct-2011.
+#  Last Change: 19-Oct-2011.
 #  by Takayuki Mutoh
 #
 
@@ -98,7 +98,7 @@
 endif
 
 
-$(OBJDIR)/main.o: main.cpp main.h myframe.h common.h testframe.cpp symbol.h
+$(OBJDIR)/main.o: main.cpp main.h myframe.h common.h testframe.cpp
 	-mkdir -p $(OBJDIR)
 	$(CXX) -c $< -o $@ $(CPPFLAGS)
 
diff -r a43adb9537b2 -r 550c143ab194 src/myframe.cpp
--- a/src/myframe.cpp	Wed Oct 19 07:49:32 2011 +0900
+++ b/src/myframe.cpp	Wed Oct 19 20:36:52 2011 +0900
@@ -1,5 +1,5 @@
 // Filename   : myframe.cpp
-// Last Change: 18-Oct-2011.
+// Last Change: 19-Oct-2011.
 //
 
 #include "main.h"
@@ -83,6 +83,9 @@
 	
 	m_datePicker = new wxDatePickerCtrl( this, wxID_ANY, wxDefaultDateTime, wxDefaultPosition, wxDefaultSize, wxDP_DROPDOWN );
 	bSizerDist->Add( m_datePicker, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+	m_buttonNextThu = new wxButton( this, ID_BUTTONNEXTTHU, wxT("次木 >>"), wxDefaultPosition, wxSize(60,-1), 0 );
+	bSizerDist->Add( m_buttonNextThu, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 	
 	m_staticTextCcn = new wxStaticText( this, wxID_ANY, wxT("合議体"), wxDefaultPosition, wxDefaultSize, 0 );
 	bSizerDist->Add( m_staticTextCcn, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
@@ -174,20 +177,31 @@
 BEGIN_EVENT_TABLE( MyFrame, wxFrame )
     EVT_SIZE( MyFrame::OnWinSize )
     EVT_MOVE( MyFrame::OnWinMove )
-    EVT_MENU( ID_MENUITEMPARAM,  MyFrame::OnParam )
-    EVT_MENU( ID_MENUITEMAPPDIR, MyFrame::OnOpenAppDir )
-    EVT_MENU( wxID_EXIT,         MyFrame::OnQuit )
-    EVT_BUTTON( ID_BUTTONMKDIR,  MyFrame::OnMakeDir )
-    EVT_BUTTON( ID_BUTTONDETECT, MyFrame::OnDetect )
-    EVT_BUTTON( ID_BUTTONMOVE,   MyFrame::OnMove )
-    EVT_BUTTON( ID_BUTTONDEL,  MyFrame::OnDelete )
-    EVT_BUTTON( ID_BUTTONUNDO, MyFrame::OnUndo )
+    EVT_MENU( ID_MENUITEMPARAM,   MyFrame::OnParam )
+    EVT_MENU( ID_MENUITEMAPPDIR,  MyFrame::OnOpenAppDir )
+    EVT_MENU( wxID_EXIT,          MyFrame::OnQuit )
+    EVT_BUTTON( ID_BUTTONNEXTTHU, MyFrame::OnNextThursday )
+    EVT_BUTTON( ID_BUTTONMKDIR,   MyFrame::OnMakeDir )
+    EVT_BUTTON( ID_BUTTONDETECT,  MyFrame::OnDetect )
+    EVT_BUTTON( ID_BUTTONMOVE,    MyFrame::OnMove )
+    EVT_BUTTON( ID_BUTTONDEL,     MyFrame::OnDelete )
+    EVT_BUTTON( ID_BUTTONUNDO,    MyFrame::OnUndo )
     EVT_LIST_ITEM_SELECTED(  ID_LISTCTRLVIEW, MyFrame::GetImageInfo )
     EVT_LIST_ITEM_ACTIVATED( ID_LISTCTRLVIEW, MyFrame::ViewLarge )
     EVT_CLOSE( MyFrame::SaveConfig )
 END_EVENT_TABLE()
 
 // Event Handlers
+/* 次の木曜日 */
+void MyFrame::OnNextThursday(wxCommandEvent& WXUNUSED(event))
+{
+	wxDateTime dt = m_datePicker->GetValue();
+    wxDateSpan ds( 0, 0, 0, 1 );
+    dt += ds;
+    dt.SetToNextWeekDay( wxDateTime::Thu );
+    m_datePicker->SetValue( dt );
+}
+
 /* 移動先フォルダ作成 */
 void MyFrame::OnMakeDir(wxCommandEvent& WXUNUSED(event))
 {