Changeset 83 in dev

Timestamp:

Mar 26, 2007, 11:11:22 AM (17 years ago)

Author:

dai_9181

Message:

STRING_NONE → STRING_NONE_
SetLayeredWindowAttributes → pSetLayeredWindowAttributes

Location:

ProjectEditor

Files:

• ProjectEditor.h (modified) (1 diff)
• RadToolsAndPropertyProc.cpp (modified) (6 diffs)
• SubOperation.cpp (modified) (1 diff)
• WebSearch.cpp (modified) (3 diffs)
• common_msg_eng.h (modified) (1 diff)
• common_msg_jpn.h (modified) (1 diff)

ProjectEditor/ProjectEditor.h

@@ -41 +41 @@
 char *lpszCompilerName;
 
-FWINLAYER SetLayeredWindowAttributes;
+FWINLAYER pSetLayeredWindowAttributes;
 HINSTANCE hUser32Lib;
 

ProjectEditor/RadToolsAndPropertyProc.cpp

@@ -588 +588 @@
 
             //"なし"
-            SendDlgItemMessage(hwnd,IDC_WINDOWMENU,CB_ADDSTRING,0,(long)STRING_NONE);
+            SendDlgItemMessage(hwnd,IDC_WINDOWMENU,CB_ADDSTRING,0,(long)STRING_NONE_);
 
             for(i3=0,i4=0;i3<ProjectInfo.NumberOfMenu;i3++){
@@ -1957 +1957 @@
 
             //"なし"
-            SendDlgItemMessage(hwnd,IDC_CBS_OWNERDRAW,CB_ADDSTRING,0,(long)STRING_NONE);
+            SendDlgItemMessage(hwnd,IDC_CBS_OWNERDRAW,CB_ADDSTRING,0,(long)STRING_NONE_);
             //"固定"
             SendDlgItemMessage(hwnd,IDC_CBS_OWNERDRAW,CB_ADDSTRING,0,(long)STRING_OWNERDRAW_FIXED);
@@ -3040 +3040 @@
 
             //"なし"
-            SendDlgItemMessage(hwnd,IDC_LVS_SORT,CB_ADDSTRING,0,(long)STRING_NONE);
+            SendDlgItemMessage(hwnd,IDC_LVS_SORT,CB_ADDSTRING,0,(long)STRING_NONE_);
             //"昇順"
             SendDlgItemMessage(hwnd,IDC_LVS_SORT,CB_ADDSTRING,0,(long)STRING_SORT_ASCENDING);
@@ -3302 +3302 @@
             SendDlgItemMessage(hwnd,IDC_LBS_SELECT,CB_ADDSTRING,0,(long)STRING_LISTBOXPROP_STYLE_SEL_EXTENDED);
             //"なし"
-            SendDlgItemMessage(hwnd,IDC_LBS_SELECT,CB_ADDSTRING,0,(long)STRING_NONE);
+            SendDlgItemMessage(hwnd,IDC_LBS_SELECT,CB_ADDSTRING,0,(long)STRING_NONE_);
 
             if(ProjectInfo.pWindowInfo[i2].pChildInfo[MdiInfo[i].MdiRadInfo->SelectingItem[0]].style&LBS_MULTIPLESEL) SendDlgItemMessage(hwnd,IDC_LBS_SELECT,CB_SETCURSEL,1,0);
@@ -3315 +3315 @@
 
             //"なし"
-            SendDlgItemMessage(hwnd,IDC_LBS_OWNERDRAW,CB_ADDSTRING,0,(long)STRING_NONE);
+            SendDlgItemMessage(hwnd,IDC_LBS_OWNERDRAW,CB_ADDSTRING,0,(long)STRING_NONE_);
             //"固定"
             SendDlgItemMessage(hwnd,IDC_LBS_OWNERDRAW,CB_ADDSTRING,0,(long)STRING_OWNERDRAW_FIXED);
@@ -4443 +4443 @@
 
             //"なし"
-            SendDlgItemMessage(hwnd,IDC_UDS_ATTACH,CB_ADDSTRING,0,(long)STRING_NONE);
+            SendDlgItemMessage(hwnd,IDC_UDS_ATTACH,CB_ADDSTRING,0,(long)STRING_NONE_);
             //"左端"
             SendDlgItemMessage(hwnd,IDC_UDS_ATTACH,CB_ADDSTRING,0,(long)STRING_LEFT);

ProjectEditor/SubOperation.cpp

@@ -939 +939 @@
 
     //アルファブレンド用のAPIを取得
-    extern FWINLAYER SetLayeredWindowAttributes;
+    extern FWINLAYER pSetLayeredWindowAttributes;
     extern HINSTANCE hUser32Lib;
     hUser32Lib=LoadLibrary("user32.dll");
-    SetLayeredWindowAttributes=(FWINLAYER)GetProcAddress(hUser32Lib,"SetLayeredWindowAttributes");
+    pSetLayeredWindowAttributes=(FWINLAYER)GetProcAddress(hUser32Lib,"pSetLayeredWindowAttributes");
 
 

ProjectEditor/WebSearch.cpp

@@ -6 +6 @@
 #define ID_TIMER_IDLE 200
 
-extern FWINLAYER SetLayeredWindowAttributes;
+extern FWINLAYER pSetLayeredWindowAttributes;
 
 
@@ -20 +20 @@
                 pobj_ResultList=(CResultList *)GetWindowLong(hwnd,GWL_USERDATA);
 
-                SetLayeredWindowAttributes(hwnd, 0,(int)((double)255/(double)100*(double)(pobj_ResultList->iAnimeCount*10)), LWA_ALPHA);
+                pSetLayeredWindowAttributes(hwnd, 0,(int)((double)255/(double)100*(double)(pobj_ResultList->iAnimeCount*10)), LWA_ALPHA);
 
                 GetWindowRect(hwnd,&rc);
@@ -151 +151 @@
     lStyle=GetWindowLong(hwnd,GWL_EXSTYLE) | WS_EX_LAYERED;
     SetWindowLong(hwnd,GWL_EXSTYLE,lStyle);
-    SetLayeredWindowAttributes(hwnd, 0, 0, LWA_ALPHA);
+    pSetLayeredWindowAttributes(hwnd, 0, 0, LWA_ALPHA);
 
     SetWindowLong(hwnd,GWL_USERDATA,(long)this);

ProjectEditor/common_msg_eng.h

@@ -9 +9 @@
 // 汎用
 ////////
-#define STRING_NONE             "None"
+#define STRING_NONE_                "None"
 #define STRING_DEFAULT          "Default"
 #define STRING_ERROR            "Error"

ProjectEditor/common_msg_jpn.h

@@ -9 +9 @@
 // 汎用
 ////////
-#define STRING_NONE             "なし"
+#define STRING_NONE_                "なし"
 #define STRING_DEFAULT          "デフォルト"
 #define STRING_ERROR            "エラー"