Index: /trunk/ab5.0/abdev/abdev/abdev.cpp
===================================================================
--- /trunk/ab5.0/abdev/abdev/abdev.cpp	(revision 498)
+++ /trunk/ab5.0/abdev/abdev/abdev.cpp	(revision 499)
@@ -1343,7 +1343,7 @@
 WNDPROC oldMainFrameWndProc;
 LRESULT CALLBACK WindowFunc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
-	int i,i2,i3,WndNum;
+	int i,i2,WndNum;
 	char str[MAX_PATH],temporary[1024],temp2[MAX_PATH],temp3[MAX_PATH],*pTemp;
-	HWND hChild,hEdit;
+	HWND hChild;
 	RECT rect;
 	POINT pos;
@@ -1351,5 +1351,4 @@
 	HGLOBAL hGlobal;
 	HANDLE hFile;
-	BOOL bChecked;
 
 	static COLORREF colorUser=RGB(255,255,255);
@@ -1373,95 +1372,4 @@
 		case WM_COMMAND:
 			switch(LOWORD(wParam)){
-
-
-				///////////////////////
-				// 変換メニュー
-				///////////////////////
-				case IDM_CONV_ALPHA_SMALL:
-				case IDM_CONV_ALPHA_BIG:
-				case IDM_CONV_HALF:
-				case IDM_CONV_MULTI:
-				case IDM_CONV_KATAKANA:
-				case IDM_CONV_HIRAGANA:
-				case IDM_CONV_SPACE:
-				case IDM_CONV_TAB:
-#ifdef THETEXT
-				case IDM_CONV_HASRETURN:
-				case IDM_CONV_QUOTE:
-#else
-				case IDM_CODEFORMAT:
-#endif
-					TextEdit_Convert(LOWORD(wParam));
-					return 0;
-
-#ifdef THETEXT
-				///////////////////////
-				// ツールメニュー
-				///////////////////////
-				case IDM_STRING_COUNT:
-					DialogBoxParam(hResInst,MAKEINTRESOURCE(IDD_STRING_COUNT),hOwner,(DLGPROC)DlgStringCount,0);
-					return 0;
-				case IDM_SEL_STRING_COUNT:
-					DialogBoxParam(hResInst,MAKEINTRESOURCE(IDD_STRING_COUNT),hOwner,(DLGPROC)DlgStringCount,1);
-					return 0;
-#endif //THETEXT
-
-				case IDM_PROJECTVIEW:
-					if(pobj_nv->bClipProjectView){
-						if(IsWindowVisible(hProjectView)){
-							ShowWindow(hProjectView,SW_HIDE);
-							bChecked=0;
-						}
-						else{
-							ShowWindow(hProjectView,SW_SHOW);
-							bChecked=1;
-						}
-					}
-					else{
-						if(IsWindowVisible(hProjectView_ToolWindow)){
-							ShowWindow(hProjectView_ToolWindow,SW_HIDE);
-							bChecked=0;
-						}
-						else{
-							ShowWindow(hProjectView_ToolWindow,SW_SHOW);
-							ShowWindow(hProjectView,SW_SHOW);
-							bChecked=1;
-						}
-					}
-					pobj_MainMenu->CheckMenu(IDM_PROJECTVIEW,bChecked);
-
-					//再配置
-					ResizeOwnerWnd();
-
-					ShowWindow(hClient,SW_SHOW);
-					return 0;
-				case IDM_PROJECT_OPTION:
-					DlgProjectOptionSetting(hwnd);
-					return 0;
-				case IDM_TOPMOST:
-					if(pobj_MainMenu->IsCheck(IDM_TOPMOST)){
-						SetWindowPos(hwnd,HWND_NOTOPMOST,0,0,0,0,SWP_NOMOVE|SWP_NOSIZE);
-						pobj_MainMenu->CheckMenu(IDM_TOPMOST,0);
-					}
-					else{
-						SetWindowPos(hwnd,HWND_TOPMOST,0,0,0,0,SWP_NOMOVE|SWP_NOSIZE);
-						pobj_MainMenu->CheckMenu(IDM_TOPMOST,1);
-					}
-					return 0;
-
-#ifdef THETEXT
-				case IDM_RIGHT_TURN:
-					pobj_nv->bRightTurn^=1;
-					ResetState_ViewMenu();
-
-					//トップのウィンドウを再描画
-					RedrawAllWindow();
-
-					return 0;
-#endif
-
-				case IDM_SET:
-					DlgOptionSetting(hwnd);
-					return 0;
 
 #ifndef THETEXT
Index: /trunk/ab5.0/abdev/abdev/include/MainFrame.h
===================================================================
--- /trunk/ab5.0/abdev/abdev/include/MainFrame.h	(revision 498)
+++ /trunk/ab5.0/abdev/abdev/include/MainFrame.h	(revision 499)
@@ -116,4 +116,28 @@
 	// 「置換」メニューがクリックされた
 	void OnCmdPermutation( UINT uNotifyCode, int nID, CWindow wndCtl );
+
+	// 変換メニューのいずれかがクリックされた
+	void OnCmdConvertX( UINT uNotifyCode, int nID, CWindow wndCtl );
+
+	// 「文字カウント」メニューがクリックされた
+	void OnCmdStringCount( UINT uNotifyCode, int nID, CWindow wndCtl );
+
+	// 「選択範囲の文字カウント」メニューがクリックされた
+	void OnCmdSelStringCount( UINT uNotifyCode, int nID, CWindow wndCtl );
+
+	// 「プロジェクトビュー」メニューがクリックされた
+	void OnCmdProjectView( UINT uNotifyCode, int nID, CWindow wndCtl );
+
+	// 「プロジェクトオプション」メニューがクリックされた
+	void OnCmdProjectOption( UINT uNotifyCode, int nID, CWindow wndCtl );
+
+	// 「最前面表示」メニューがクリックされた
+	void OnCmdTopMost( UINT uNotifyCode, int nID, CWindow wndCtl );
+
+	// 「右端で折り返す」メニューがクリックされた
+	void OnCmdRightTurn( UINT uNotifyCode, int nID, CWindow wndCtl );
+
+	// 「オプション」メニューがクリックされた
+	void OnCmdSet( UINT uNotifyCode, int nID, CWindow wndCtl );
 
 private:
@@ -135,8 +159,10 @@
 		COMMAND_ID_HANDLER_EX( IDM_OPEN, OnCmdOpen )
 		COMMAND_ID_HANDLER_EX( IDM_CLOSE, OnCmdClose )
+#ifndef THETEXT
 		COMMAND_ID_HANDLER_EX( IDM_PROJECT_OPEN, OnCmdProjectOpen )
 		COMMAND_ID_HANDLER_EX( IDM_PROJECT_SAVE, OnCmdProjectSave )
 		COMMAND_ID_HANDLER_EX( IDM_PROJECT_CLOSE, OnCmdProjectClose )
 		COMMAND_ID_HANDLER_EX( IDM_PROJECT_FOLDER_OPEN, OnCmdProjectFolderOpen )
+#endif
 		COMMAND_ID_HANDLER_EX( IDM_SAVE, OnCmdSave )
 		COMMAND_ID_HANDLER_EX( IDM_NEWSAVE, OnCmdNewSave )
@@ -158,4 +184,27 @@
 		COMMAND_ID_HANDLER_EX( IDM_FIND, OnCmdFind )
 		COMMAND_ID_HANDLER_EX( IDM_PERMUTATION, OnCmdPermutation )
+		COMMAND_ID_HANDLER_EX( IDM_CONV_ALPHA_SMALL, OnCmdConvertX )
+		COMMAND_ID_HANDLER_EX( IDM_CONV_ALPHA_BIG, OnCmdConvertX )
+		COMMAND_ID_HANDLER_EX( IDM_CONV_HALF, OnCmdConvertX )
+		COMMAND_ID_HANDLER_EX( IDM_CONV_MULTI, OnCmdConvertX )
+		COMMAND_ID_HANDLER_EX( IDM_CONV_KATAKANA, OnCmdConvertX )
+		COMMAND_ID_HANDLER_EX( IDM_CONV_HIRAGANA, OnCmdConvertX )
+		COMMAND_ID_HANDLER_EX( IDM_CONV_SPACE, OnCmdConvertX )
+		COMMAND_ID_HANDLER_EX( IDM_CONV_TAB, OnCmdConvertX )
+#ifdef THETEXT
+		COMMAND_ID_HANDLER_EX( IDM_CONV_HASRETURN, OnCmdConvertX )
+		COMMAND_ID_HANDLER_EX( IDM_CONV_QUOTE, OnCmdConvertX )
+		COMMAND_ID_HANDLER_EX( IDM_STRING_COUNT, OnCmdStringCount )
+		COMMAND_ID_HANDLER_EX( IDM_SEL_STRING_COUNT, OnCmdSelStringCount )
+#else
+		COMMAND_ID_HANDLER_EX( IDM_CODEFORMAT, OnCmdConvertX )
+#endif
+		COMMAND_ID_HANDLER_EX( IDM_PROJECTVIEW, OnCmdProjectView )
+		COMMAND_ID_HANDLER_EX( IDM_PROJECT_OPTION, OnCmdProjectOption )
+		COMMAND_ID_HANDLER_EX( IDM_TOPMOST, OnCmdTopMost )
+#ifdef THETEXT
+		COMMAND_ID_HANDLER_EX( IDM_RIGHT_TURN, OnCmdRightTurn )
+#endif
+		COMMAND_ID_HANDLER_EX( IDM_SET, OnCmdSet )
 	END_MSG_MAP()
 };
Index: /trunk/ab5.0/abdev/abdev/src/MainFrame.cpp
===================================================================
--- /trunk/ab5.0/abdev/abdev/src/MainFrame.cpp	(revision 498)
+++ /trunk/ab5.0/abdev/abdev/src/MainFrame.cpp	(revision 499)
@@ -665,2 +665,83 @@
 	DialogBox(hResInst,MAKEINTRESOURCE(IDD_PERMUTATION),m_hWnd,(DLGPROC)DlgPermutation);
 }
+
+void MainFrame::OnCmdConvertX( UINT uNotifyCode, int nID, CWindow wndCtl )
+{
+	TextEdit_Convert( nID );
+}
+
+#ifdef THETEXT
+void MainFrame::OnCmdStringCount( UINT uNotifyCode, int nID, CWindow wndCtl )
+{
+	DialogBoxParam(hResInst,MAKEINTRESOURCE(IDD_STRING_COUNT),m_hWnd,(DLGPROC)DlgStringCount,0);
+}
+
+void MainFrame::OnCmdSelStringCount( UINT uNotifyCode, int nID, CWindow wndCtl )
+{
+	DialogBoxParam(hResInst,MAKEINTRESOURCE(IDD_STRING_COUNT),m_hWnd,(DLGPROC)DlgStringCount,1);
+}
+#endif
+
+void MainFrame::OnCmdProjectView( UINT uNotifyCode, int nID, CWindow wndCtl )
+{
+	extern HWND hProjectView;
+	bool isCheck = false;
+	if(pobj_nv->bClipProjectView){
+		if(::IsWindowVisible(hProjectView)){
+			::ShowWindow(hProjectView,SW_HIDE);
+		}
+		else{
+			::ShowWindow(hProjectView,SW_SHOW);
+			isCheck = true;
+		}
+	}
+	else{
+		extern HWND hProjectView_ToolWindow;
+		if(::IsWindowVisible(hProjectView_ToolWindow)){
+			::ShowWindow(hProjectView_ToolWindow,SW_HIDE);
+		}
+		else{
+			::ShowWindow(hProjectView_ToolWindow,SW_SHOW);
+			::ShowWindow(hProjectView,SW_SHOW);
+			isCheck = true;
+		}
+	}
+	pobj_MainMenu->CheckMenu(IDM_PROJECTVIEW,isCheck);
+
+	//再配置
+	ResizeOwnerWnd();
+
+	::ShowWindow(hClient,SW_SHOW);
+}
+
+void MainFrame::OnCmdProjectOption( UINT uNotifyCode, int nID, CWindow wndCtl )
+{
+	DlgProjectOptionSetting( m_hWnd );
+}
+
+void MainFrame::OnCmdTopMost( UINT uNotifyCode, int nID, CWindow wndCtl )
+{
+	if(pobj_MainMenu->IsCheck(IDM_TOPMOST)){
+		SetWindowPos( HWND_NOTOPMOST,0,0,0,0,SWP_NOMOVE|SWP_NOSIZE);
+		pobj_MainMenu->CheckMenu(IDM_TOPMOST,0);
+	}
+	else{
+		SetWindowPos( HWND_TOPMOST,0,0,0,0,SWP_NOMOVE|SWP_NOSIZE);
+		pobj_MainMenu->CheckMenu(IDM_TOPMOST,1);
+	}
+}
+
+void ResetState_ViewMenu(void);
+void MainFrame::OnCmdRightTurn( UINT uNotifyCode, int nID, CWindow wndCtl )
+{
+	pobj_nv->bRightTurn^=1;
+	ResetState_ViewMenu();
+
+	//トップのウィンドウを再描画
+	RedrawAllWindow();
+}
+
+void MainFrame::OnCmdSet( UINT uNotifyCode, int nID, CWindow wndCtl )
+{
+	DlgOptionSetting( m_hWnd );
+}
Index: /trunk/ab5.0/abdev/abdev/stdafx.h
===================================================================
--- /trunk/ab5.0/abdev/abdev/stdafx.h	(revision 498)
+++ /trunk/ab5.0/abdev/abdev/stdafx.h	(revision 499)
@@ -38,5 +38,9 @@
 #include <abdev/ab_common/Environment.h>
 
+#ifdef THETEXT
+#include "../res_TheText/resource.h"
+#else
 #include "../res/resource.h"
+#endif
 
 #include <WindowComponents/BaseWindow.h>