Changeset 828 in dev for trunk/ab5.0/abdev/abdev/src/MainFrame.cpp

Timestamp:

Mar 19, 2012, 1:59:48 AM (12 years ago)

Author:

イグトランス (egtra)

Message:

egtraブランチの内容をマージ。

Location:

trunk

Files:

• . (modified) (1 prop)
• ab5.0/abdev (modified) (1 prop)
• ab5.0/abdev/abdev/src/MainFrame.cpp (modified) (9 diffs)

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

@@ -55 +55 @@
         wndTarget(hwndTarget)
     {
+        DWORD const WS_EX_NOACTIVATE = 0x08000000;
+
         HWND hwndDummy = Create( hOwner, CRect( -32000, -32000, 1, 1 ), title,
             WS_BORDER | WS_SYSMENU | WS_CAPTION, WS_EX_NOACTIVATE);
@@ -292 +294 @@
         if (taskbarList)
         {
-        taskbarList->SetTabOrder(*mapAt(hwndChild),
-            hwndInsertBefore
-            ? static_cast<HWND>(*mapAt(hwndInsertBefore))
-            : 0);
+            taskbarList->SetTabOrder(*mapAt(hwndChild),
+                hwndInsertBefore
+                ? static_cast<HWND>(*mapAt(hwndInsertBefore))
+                : 0);
         }
     }
@@ -976 +978 @@
     char temporary[MAX_PATH];
 
-    FileType=DialogBox(hResInst,MAKEINTRESOURCE(IDD_NEWFILE),hOwner,DlgNewFile);
+    FileType = ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_NEWFILE, hOwner, DlgNewFile);
     if(FileType==-1) return;
 
@@ -1023 +1025 @@
 {
     //"ファイルを指定してください"
-    extern LPSTR DefFileFilter;
+    extern const LPCSTR DefFileFilter;
     char temporary[1024];
     if(!GetFilePathDialog(m_hWnd,temporary,DefFileFilter,STRING_FILEOPENTITLE_DEFAULT,TRUE)) return;
@@ -1039 +1041 @@
 {
     //"プロジェクト ファイルを指定して下さい"
-    extern LPSTR ProjectFileFilter;
+    extern const LPCSTR ProjectFileFilter;
     char temporary[1024];
     if(!GetFilePathDialog(m_hWnd,temporary,ProjectFileFilter,STRING_FILEOPENTITLE_PROJECT,TRUE))
@@ -1072 +1074 @@
 {
     //"保存先のファイルを指定してください"
-    extern LPSTR DefFileFilter;
+    extern const LPCSTR DefFileFilter;
     char temporary[1024];
     if(!GetFilePathDialog(m_hWnd,temporary,DefFileFilter,STRING_FILESAVETITLE_DEFAULT,FALSE)) return;
@@ -1367 +1369 @@
 void MainFrame::OnCmdFind( UINT uNotifyCode, int nID, CWindow wndCtl )
 {
-    DialogBox(hResInst,MAKEINTRESOURCE(IDD_FIND),m_hWnd,DlgFind);
+    ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_FIND, m_hWnd, DlgFind);
 }
 
 void MainFrame::OnCmdPermutation( UINT uNotifyCode, int nID, CWindow wndCtl )
 {
-    DialogBox(hResInst,MAKEINTRESOURCE(IDD_PERMUTATION),m_hWnd,DlgPermutation);
+    ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_PERMUTATION, m_hWnd, DlgPermutation);
 }
 
@@ -1627 +1629 @@
     int idProcess;
     DWORD dwPlatform;
-    idProcess=DialogBoxParam(hResInst,MAKEINTRESOURCE(IDD_ATTACH),m_hWnd,DlgAttach,(LPARAM)&dwPlatform);
+    idProcess = ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_ATTACH, m_hWnd, DlgAttach, reinterpret_cast<LPARAM>(&dwPlatform));
     if(idProcess==0) return;
 
@@ -1889 +1891 @@
 void MainFrame::OnCmdAbout( UINT uNotifyCode, int nID, CWindow wndCtl )
 {
-    DialogBox(hResInst,MAKEINTRESOURCE(IDD_ABOUT),m_hWnd,DialogAbout);
+    ActiveBasic::Resource::DialogBoxAlt(hResInst, IDD_ABOUT, m_hWnd, DialogAbout);
 }