Changeset 498 in dev for trunk

Timestamp:

Apr 22, 2008, 7:13:13 PM (17 years ago)

Author:

dai_9181

Message:

いくつかのメニューをMainFrameに実装しなおした

Location:

trunk/ab5.0/abdev/abdev

Files:

• abdev.cpp (modified) (2 diffs)
• include/MainFrame.h (modified) (2 diffs)
• src/MainFrame.cpp (modified) (1 diff)

trunk/ab5.0/abdev/abdev/abdev.cpp

@@ -1350 +1350 @@
     HDROP hDrop;
     HGLOBAL hGlobal;
-    CHARRANGE CharRange;
     HANDLE hFile;
     BOOL bChecked;
@@ -1374 +1373 @@
         case WM_COMMAND:
             switch(LOWORD(wParam)){
-                case IDM_DELETE:
-                    hChild=GetWindow(hClient,GW_CHILD);
-                    WndNum=GetWndNum(hChild);
-                    if(IS_DOCUMENT_TEXT(MdiInfo[WndNum].DocType)){
-                        hEdit=GetWindow(hChild,GW_CHILD);
-                        TextEdit_ReplaceUpdateUndoData(WndNum,"",0,1);
-                    }
-                    else if(MdiInfo[WndNum].DocType==WNDTYPE_RAD)
-                        SendMessage(MdiInfo[WndNum].MdiRadInfo->hRad,WM_COMMAND,IDM_RAD_ITEM_DELETE,0);
-                    return 0;
-                case IDM_ALLSELECT:
-                    hChild=GetWindow(hClient,GW_CHILD);
-                    WndNum=GetWndNum(hChild);
-                    if(IS_DOCUMENT_TEXT(MdiInfo[WndNum].DocType)){
-                        hEdit=GetWindow(hChild,GW_CHILD);
-
-                        MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.x=0;
-                        MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.y=0;
-
-                        GetCaretPosFromBufferIndex(
-                            MdiInfo[WndNum].pMdiTextEdit->buffer,
-                            lstrlen(MdiInfo[WndNum].pMdiTextEdit->buffer),
-                            &MdiInfo[WndNum].pMdiTextEdit->EndCaretPos);
-
-                        InvalidateRect(hEdit,NULL,0);
-
-                        ResetState_EditMenu();
-                    }
-                    else if(MdiInfo[WndNum].DocType==WNDTYPE_RAD){
-                        i2=GetWndInfoNum(MdiInfo[WndNum].path);
-                        for(i3=0;i3<ProjectInfo.pWindowInfo[i2].NumberOfChildWindows;i3++){
-                            MdiInfo[WndNum].MdiRadInfo->SelectingItem[i3]=i3;
-                        }
-                        DrawRadWindow(WndNum,&ProjectInfo.pWindowInfo[i2]);
-                    }
-                    return 0;
-                case IDM_FIND:
-                    DialogBox(hResInst,MAKEINTRESOURCE(IDD_FIND),hOwner,(DLGPROC)DlgFind);
-                    return 0;
-                case IDM_PERMUTATION:
-                    DialogBox(hResInst,MAKEINTRESOURCE(IDD_PERMUTATION),hOwner,(DLGPROC)DlgPermutation);
-                    return 0;
 
 

trunk/ab5.0/abdev/abdev/include/MainFrame.h

@@ -105 +105 @@
     void OnCmdPaste( UINT uNotifyCode, int nID, CWindow wndCtl );
 
+    // 「削除」メニューがクリックされた
+    void OnCmdDelete( UINT uNotifyCode, int nID, CWindow wndCtl );
+
+    // 「すべて選択」メニューがクリックされた
+    void OnCmdAllSelect( UINT uNotifyCode, int nID, CWindow wndCtl );
+
+    // 「検索」メニューがクリックされた
+    void OnCmdFind( UINT uNotifyCode, int nID, CWindow wndCtl );
+
+    // 「置換」メニューがクリックされた
+    void OnCmdPermutation( UINT uNotifyCode, int nID, CWindow wndCtl );
+
 private:
     // メッセージマップ
@@ -142 +154 @@
         COMMAND_ID_HANDLER_EX( IDM_COPY, OnCmdCopy )
         COMMAND_ID_HANDLER_EX( IDM_PASTE, OnCmdPaste )
+        COMMAND_ID_HANDLER_EX( IDM_DELETE, OnCmdDelete )
+        COMMAND_ID_HANDLER_EX( IDM_ALLSELECT, OnCmdAllSelect )
+        COMMAND_ID_HANDLER_EX( IDM_FIND, OnCmdFind )
+        COMMAND_ID_HANDLER_EX( IDM_PERMUTATION, OnCmdPermutation )
     END_MSG_MAP()
 };

trunk/ab5.0/abdev/abdev/src/MainFrame.cpp

@@ -615 +615 @@
     }
 }
+
+void MainFrame::OnCmdDelete( UINT uNotifyCode, int nID, CWindow wndCtl )
+{
+    HWND hChild=::GetWindow(hClient,GW_CHILD);
+    int WndNum=GetWndNum(hChild);
+    if(IS_DOCUMENT_TEXT(MdiInfo[WndNum].DocType)){
+        HWND hEdit=::GetWindow(hChild,GW_CHILD);
+        TextEdit_ReplaceUpdateUndoData(WndNum,"",0,1);
+    }
+    else if(MdiInfo[WndNum].DocType==WNDTYPE_RAD)
+        SendMessage(MdiInfo[WndNum].MdiRadInfo->hRad,WM_COMMAND,IDM_RAD_ITEM_DELETE,0);
+}
+
+void MainFrame::OnCmdAllSelect( UINT uNotifyCode, int nID, CWindow wndCtl )
+{
+    HWND hChild=::GetWindow(hClient,GW_CHILD);
+    int WndNum=GetWndNum(hChild);
+    if(IS_DOCUMENT_TEXT(MdiInfo[WndNum].DocType)){
+        HWND hEdit=::GetWindow(hChild,GW_CHILD);
+
+        MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.x=0;
+        MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.y=0;
+
+        GetCaretPosFromBufferIndex(
+            MdiInfo[WndNum].pMdiTextEdit->buffer,
+            lstrlen(MdiInfo[WndNum].pMdiTextEdit->buffer),
+            &MdiInfo[WndNum].pMdiTextEdit->EndCaretPos);
+
+        ::InvalidateRect(hEdit,NULL,0);
+
+        ResetState_EditMenu();
+    }
+    else if(MdiInfo[WndNum].DocType==WNDTYPE_RAD){
+        int i2=GetWndInfoNum(MdiInfo[WndNum].path);
+        for(int i3=0;i3<ProjectInfo.pWindowInfo[i2].NumberOfChildWindows;i3++){
+            MdiInfo[WndNum].MdiRadInfo->SelectingItem[i3]=i3;
+        }
+        DrawRadWindow(WndNum,&ProjectInfo.pWindowInfo[i2]);
+    }
+}
+
+void MainFrame::OnCmdFind( UINT uNotifyCode, int nID, CWindow wndCtl )
+{
+    DialogBox(hResInst,MAKEINTRESOURCE(IDD_FIND),m_hWnd,(DLGPROC)DlgFind);
+}
+
+void MainFrame::OnCmdPermutation( UINT uNotifyCode, int nID, CWindow wndCtl )
+{
+    DialogBox(hResInst,MAKEINTRESOURCE(IDD_PERMUTATION),m_hWnd,(DLGPROC)DlgPermutation);
+}