changeset 33:945864229b5a v2.4

small fix
author pyon@macmini
date Mon, 07 Nov 2011 21:02:04 +0900
parents 112cd4d27f1f
children 51e522f34598
files makefile src/myframe.cpp
diffstat 2 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/makefile	Sun Nov 06 14:49:41 2011 +0900
+++ b/makefile	Mon Nov 07 21:02:04 2011 +0900
@@ -1,6 +1,6 @@
 #
 # Makefile for wxWidgets Application
-#  Last Change: 03-Nov-2011.
+#  Last Change: 07-Nov-2011.
 #  by Takayuki Mutoh
 #
 
@@ -92,7 +92,7 @@
 
 ifdef COMSPEC
 $(PROGNAME): $(OBJMSW)
-	$(CXX) $^ -o $@ $(LIBS)
+	$(CXX) $^ -o $@ $(LIBS) sqlite3.a
 else
 $(PROGNAME): $(OBJ)
 	$(CXX) $^ -o $@ $(LIBS) -lsqlite3
--- a/src/myframe.cpp	Sun Nov 06 14:49:41 2011 +0900
+++ b/src/myframe.cpp	Mon Nov 07 21:02:04 2011 +0900
@@ -1,5 +1,5 @@
 // Filename   : myframe.cpp
-// Last Change: 06-Nov-2011.
+// Last Change: 07-Nov-2011.
 //
 
 #include "main.h"
@@ -57,7 +57,7 @@
 	m_menuItemQuit = new wxMenuItem( m_menuFile, wxID_EXIT, wxString( wxT("終了\tAlt+X") ) , wxEmptyString, wxITEM_NORMAL );
 	m_menuFile->Append( m_menuItemQuit );
 	
-	m_menubarFile->Append( m_menuFile, wxT("ファイル\tAlt+F") ); 
+	m_menubarFile->Append( m_menuFile, wxT("ファイル") ); 
 	
 	this->SetMenuBar( m_menubarFile );
 	
@@ -124,14 +124,14 @@
 	bSizerRecog->Add( m_staticTextName, 0, wxTOP|wxLEFT, 5 );
     wxString logo = wxGetCwd() + wxFILE_SEP_PATH + wxT("image") + wxFILE_SEP_PATH + wxT("logo.png");
     wxBitmap bmp = wxBitmap( logo, wxBITMAP_TYPE_PNG );
-	m_bitmapName = new wxStaticBitmap( this, wxID_ANY, bmp, wxDefaultPosition, wxSize(320,95), 0 );
+	m_bitmapName = new wxStaticBitmap( this, wxID_ANY, bmp, wxDefaultPosition, wxSize(LOGO_W,LOGO_H), 0 );
 	bSizerRecog->Add( m_bitmapName, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
 	
 	m_staticTextHhsno = new wxStaticText( this, wxID_ANY, wxT("被保険者番号"), wxDefaultPosition, wxDefaultSize, 0 );
 	bSizerRecog->Add( m_staticTextHhsno, 0, wxTOP|wxLEFT, 5 );
     logo = wxGetCwd() + wxFILE_SEP_PATH + wxT("image") + wxFILE_SEP_PATH + wxT("0123456789.png");
     bmp.LoadFile( logo, wxBITMAP_TYPE_PNG );
-	m_bitmapHhsno = new wxStaticBitmap( this, wxID_ANY, bmp, wxDefaultPosition, wxSize(320,54), 0 );
+	m_bitmapHhsno = new wxStaticBitmap( this, wxID_ANY, bmp, wxDefaultPosition, wxSize(HHSN_W,HHSN_H), 0 );
 	bSizerRecog->Add( m_bitmapHhsno, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
 	
 	m_staticTextGuess = new wxStaticText( this, wxID_ANY, wxT("推定値"), wxDefaultPosition, wxDefaultSize, 0 );
@@ -153,7 +153,7 @@
 	
 	m_listCtrlView = new wxListCtrl( this, ID_LISTCTRLVIEW, wxDefaultPosition, wxDefaultSize, wxLC_ICON );
     m_listCtrlView->SetBackgroundColour(wxT("LIGHT GREY"));
-	bSizerManip->Add( m_listCtrlView, 1, wxTOP|wxRIGHT|wxBOTTOM|wxEXPAND, 5 );
+	bSizerManip->Add( m_listCtrlView, 1, wxALL|wxEXPAND, 5 );
     m_imageList = new wxImageList( THUMB_W, THUMB_H );
     m_listCtrlView->AssignImageList( m_imageList, wxIMAGE_LIST_NORMAL );
     //m_listCtrlView->SetDropTarget( new DnDFile(m_dirPickerWork) );