--- a/src/main.cpp	Wed Jul 27 19:01:09 2011 +0900
+++ b/src/main.cpp	Wed Jul 27 21:27:56 2011 +0900
@@ -1,5 +1,5 @@
 // Filename   : main.cpp
-// Last Change: 26-Jul-2011.
+// Last Change: 27-Jul-2011.
 //
 
 #include "common.h"

--- a/src/myframe.cpp	Wed Jul 27 19:01:09 2011 +0900
+++ b/src/myframe.cpp	Wed Jul 27 21:27:56 2011 +0900
@@ -433,7 +433,6 @@
 MyFrame::MyFrame( wxWindow* parent, wxWindowID id, const wxString& title )
     : wxFrame( parent, id, title )
 {
-	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
     // set the frame icon
     SetIcon(wxICON(sample));
 	
@@ -477,17 +476,14 @@
     m_statusBar->SetStatusWidths( WXSIZEOF(widths), widths );
     m_statusBar->SetStatusText( wxEmptyString, 0 );
 	
-	wxBoxSizer* bSizer;
-	bSizer = new wxBoxSizer( wxVERTICAL );
-	m_panel = new wxPanel( this );
+	wxBoxSizer* TopSizer = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizerPanel = new wxBoxSizer( wxVERTICAL );
+	//m_panel = new wxPanel( this );
+    /*
 	
-	wxBoxSizer* bSizerPanel;
-	bSizerPanel = new wxBoxSizer( wxVERTICAL );
-
     // controls here
 	m_panelHead = new wxPanel( m_panel, wxID_ANY, wxDefaultPosition, wxDefaultSize );
-	wxBoxSizer* bSizerHead;
-	bSizerHead = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizerHead = new wxBoxSizer( wxHORIZONTAL );
 	
 	bSizerHead->AddStretchSpacer( 1 );    // spacer
 	m_staticTextIdx = new wxStaticText( m_panelHead, wxID_ANY, wxT("インデックス"), wxDefaultPosition, wxDefaultSize, 0 );
@@ -508,18 +504,13 @@
 	m_btnMkIdx = new wxButton( m_panelHead, ID_MKIDX, wxT("作成"), wxDefaultPosition, wxDefaultSize, 0 );
 	bSizerHead->Add( m_btnMkIdx, 0, wxALL, 5 );
 
-	m_panelHead->SetSizer( bSizerHead );
-	m_panelHead->Layout();
-	bSizerHead->Fit( m_panelHead );
-	
-    // 検索結果Html
-	m_html = new wxHtmlWindow( m_panel, ID_HTML, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_AUTO );
-    m_html->LoadPage( wxT("html/start.html") );
+	//m_panelHead->SetSizer( bSizerHead );
+	//m_panelHead->Layout();
+	//bSizerHead->Fit( m_panelHead );
 	
     // コマンドライン	
 	m_panelCmd = new wxPanel( m_panel, wxID_ANY, wxDefaultPosition, wxDefaultSize );
-	wxBoxSizer* bSizerCmd;
-	bSizerCmd = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizerCmd = new wxBoxSizer( wxHORIZONTAL );
 	
 	m_staticTextCmd = new wxStaticText( m_panelCmd, wxID_ANY, wxT("コマンド？"), wxDefaultPosition, wxDefaultSize, 0 );
 	bSizerCmd->Add( m_staticTextCmd, 0, wxALL, 5 );
@@ -530,20 +521,26 @@
 
 	m_panelCmd->SetSizer( bSizerCmd );
 	m_panelCmd->Layout();
-	bSizerCmd->Fit( m_panelCmd );
+	//bSizerCmd->Fit( m_panelCmd );
 
-	bSizerPanel->Add( m_panelHead, 0, wxEXPAND|wxTOP, 1 );
+	bSizerPanel->Add( bSizerHead, 0, wxEXPAND|wxTOP, 1 );
 	bSizerPanel->Add( m_html,      1, wxEXPAND|wxALL, 1 );
-	bSizerPanel->Add( m_panelCmd,  0, wxEXPAND|wxALL, 0 );
+	bSizerPanel->Add( bSizerCmd,  0, wxEXPAND|wxALL, 0 );
 	
-	m_panel->SetSizer( bSizerPanel );
-	m_panel->Layout();
-    bSizerPanel->Fit( m_panel );
+  	this->SetMinSize( wxSize( 550, 600 ) );
+    */
+    // 検索結果Html
+	m_html = new wxHtmlWindow( this, ID_HTML, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_AUTO );
+    m_html->LoadPage( wxT("html/start.html") );
+	bSizerPanel->Add( m_html, 1, wxEXPAND|wxALL, 0 );
 
-	bSizer->Add( m_panel, 1, wxEXPAND|wxALL, 0 );
-	this->SetSizer( bSizer );
+	TopSizer->Add( bSizerPanel, 1, wxEXPAND|wxALL, 0 );
+
+	this->SetSizer( TopSizer );
+    TopSizer->Fit(this);
+    TopSizer->SetSizeHints(this);
+	
 	this->Layout();
-  	this->SetMinSize( wxSize( 550, 600 ) );
 }
 
 // destructor
@@ -810,11 +807,12 @@
         wxGetApp().rect = this->GetRect();
     }
 
+    /*
     int i = m_cmdbox->hist.GetCount();
-    for ( int j=0; j<5; j++ ) {
+    for ( int j=0; j<10; j++ ) {
         wxGetApp().searchhist[j] = m_cmdbox->hist[--i];
     }
-
+    */
     Destroy();
 }