Changeset 629 in dev for trunk/ab5.0/abdev/abdev/TextEditor.cpp

Timestamp:

Jun 2, 2008, 11:50:24 PM (16 years ago)

Author:

dai_9181

Message:

MDIINFO構造体をリファクタリング。

File:

• trunk/ab5.0/abdev/abdev/TextEditor.cpp (modified) (9 diffs)

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

@@ -11 +11 @@
 
         char *pBuf;
-        pBuf=MdiInfo[WndNum].pMdiTextEdit->buffer;
+        pBuf=MdiInfo[WndNum]->pMdiTextEdit->buffer;
 
         int i,iNum=1,x=0;
@@ -85 +85 @@
     char *pBuf;
 
-    pBuf=MdiInfo[WndNum].pMdiTextEdit->buffer;
-
-    if(MdiInfo[WndNum].DocType==WNDTYPE_TEXT){
+    pBuf=MdiInfo[WndNum]->pMdiTextEdit->buffer;
+
+    if(MdiInfo[WndNum]->DocType==WNDTYPE_TEXT){
         //通常のテキストはすべてをデフォルトカラー（標準で黒）にする
         for(i=0;;i++){
             if(pBuf[i]=='\0') break;
-            MdiInfo[WndNum].pMdiTextEdit->pColorRef[i]=tci.rgbDefault;
+            MdiInfo[WndNum]->pMdiTextEdit->pColorRef[i]=tci.rgbDefault;
         }
         return;
@@ -110 +110 @@
 
             BOOL bResult=0;
-            if(MdiInfo[WndNum].DocType==WNDTYPE_BASIC){
+            if(MdiInfo[WndNum]->DocType==WNDTYPE_BASIC){
                 i3=IsBasicReservedWord(str);
                 bResult=IsManagementCommand(i3);
             }
-            else if(MdiInfo[WndNum].DocType==WNDTYPE_HTML){
+            else if(MdiInfo[WndNum]->DocType==WNDTYPE_HTML){
                 bResult=IsHtmlReservedWord(str);
             }
@@ -120 +120 @@
             if(bResult){
                 for(i3=i-i2;i3<i;i3++){
-                    MdiInfo[WndNum].pMdiTextEdit->pColorRef[i3]=tci.rgbStatement;
+                    MdiInfo[WndNum]->pMdiTextEdit->pColorRef[i3]=tci.rgbStatement;
                 }
             }
             else{
                 for(i3=i-i2;i3<i;i3++){
-                    MdiInfo[WndNum].pMdiTextEdit->pColorRef[i3]=tci.rgbDefault;
+                    MdiInfo[WndNum]->pMdiTextEdit->pColorRef[i3]=tci.rgbDefault;
                 }
             }
@@ -134 +134 @@
             if(IsStr||pBuf[i]=='\"'&&IsStr==0){
                 //文字列カラー（""で囲まれる範囲）
-                MdiInfo[WndNum].pMdiTextEdit->pColorRef[i]=tci.rgbString;
+                MdiInfo[WndNum]->pMdiTextEdit->pColorRef[i]=tci.rgbString;
             }
             else{
                 //通常カラー
-                MdiInfo[WndNum].pMdiTextEdit->pColorRef[i]=tci.rgbDefault;
+                MdiInfo[WndNum]->pMdiTextEdit->pColorRef[i]=tci.rgbDefault;
             }
         }
@@ -155 +155 @@
     //エディタ画面左端のコントロールタブ
     int iControlTabSpace;
-    iControlTabSpace=MdiInfo[WndNum].pMdiTextEdit->iWidth_ControlTabSpace;
+    iControlTabSpace=MdiInfo[WndNum]->pMdiTextEdit->iWidth_ControlTabSpace;
 
     HWND hEdit;
-    hEdit=GetWindow(MdiInfo[WndNum].hwnd,GW_CHILD);
+    hEdit=GetWindow(MdiInfo[WndNum]->hwnd,GW_CHILD);
     GetClientRect(hEdit,&rect);
 
@@ -180 +180 @@
 
     //ルーラーを再描画
-    InvalidateRect(MdiInfo[WndNum].pMdiTextEdit->pobj_Ruler->hRulerWnd,NULL,0);
-    UpdateWindow(MdiInfo[WndNum].pMdiTextEdit->pobj_Ruler->hRulerWnd);
+    InvalidateRect(MdiInfo[WndNum]->pMdiTextEdit->pobj_Ruler->hRulerWnd,NULL,0);
+    UpdateWindow(MdiInfo[WndNum]->pMdiTextEdit->pobj_Ruler->hRulerWnd);
 }
 
@@ -215 +215 @@
     char *pBuf;
 
-    pBuf=MdiInfo[WndNum].pMdiTextEdit->buffer;
+    pBuf=MdiInfo[WndNum]->pMdiTextEdit->buffer;
 
     //ダブルクリック位置を取得（バッファインデックス）
@@ -327 +327 @@
 
     i=GetBufferIndexFromCaretPos(
-        MdiInfo[WndNum].pMdiTextEdit->buffer,
-        MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.x,
-        MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.y);
+        MdiInfo[WndNum]->pMdiTextEdit->buffer,
+        MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.x,
+        MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.y);
     GetCaretPosFromBufferIndex(
-        MdiInfo[WndNum].pMdiTextEdit->buffer,
-        i-lstrlen(MdiInfo[WndNum].IndentStr),
-        &MdiInfo[WndNum].pMdiTextEdit->StartCaretPos);
+        MdiInfo[WndNum]->pMdiTextEdit->buffer,
+        i-lstrlen(MdiInfo[WndNum]->IndentStr),
+        &MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos);
 
     TextEdit_Replace(WndNum,"",1);
 
-    HeapDefaultFree(MdiInfo[WndNum].IndentStr);
-    MdiInfo[WndNum].IndentStr=0;
-}
+    HeapDefaultFree(MdiInfo[WndNum]->IndentStr);
+    MdiInfo[WndNum]->IndentStr=0;
+}