Changeset 824 in dev

Timestamp:

Feb 19, 2012, 8:58:50 PM (12 years ago)

Author:

イグトランス (egtra)

Message:

Windows SDK 7.1以上を前提とし、それ以前のWindows/Platform SDK対応の記述を削除。

Location:

trunk/ab5.0/abdev

Files:

• BasicCompiler_Common/Psapi.h (deleted)
• BasicCompiler_Common/common.h (modified) (1 diff)
• abdev/Psapi.Lib (deleted)
• abdev/htmlhelp.h (deleted)
• abdev/htmlhelp.lib (deleted)
• abdev/include/MainFrame.h (modified) (5 diffs)
• abdev/src/MainFrame.cpp (modified) (5 diffs)

trunk/ab5.0/abdev/BasicCompiler_Common/common.h

@@ -17 +17 @@
 
 #include "../BasicCompiler_Common/NonVolatile.h"
-#include "../BasicCompiler_Common/psapi.h"
+#include <psapi.h>
 
 

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

@@ -17 +17 @@
 #define WM_DESTROYDEBUGGERVIEW  WM_USER+76  //デバッガウィンドウが表示されたとき
 
-#ifdef HAVE_WINDOWS_7_SDK
 class TaskbarList;
-#endif
 
 namespace ActiveBasic{ namespace IDE{
@@ -29 +27 @@
     WindowAreaManager wam;
     UINT TaskbarButtonCreated;
-#ifdef HAVE_WINDOWS_7_SDK
     boost::shared_ptr<TaskbarList> taskbarList;
-#endif
 
 public:
@@ -90 +86 @@
     ::LRESULT OnShowSourceLine( ::UINT msg, ::WPARAM wParam, ::LPARAM lParam, ::BOOL& handled );
 
-#ifdef HAVE_WINDOWS_7_SDK
     // タスクバーボタンが生成された
     ::LRESULT OnTaskbarButtonCreated(::UINT msg, ::WPARAM wParam, ::LPARAM lParam);
@@ -108 +103 @@
     // サムネイル画像が古くなった（ので更新したい）
     void InvalidateBitmap( HWND hwndChild );
-#endif
 
     // 「新規作成」メニューがクリックされた
@@ -302 +296 @@
         MSG_WM_PAINT( OnPaint )
         MESSAGE_HANDLER( WM_SHOWERROR, OnShowSourceLine )   
-#ifdef HAVE_WINDOWS_7_SDK
         MESSAGE_HANDLER_EX( TaskbarButtonCreated, OnTaskbarButtonCreated )
-#endif
         COMMAND_ID_HANDLER_EX( IDM_NEW, OnCmdNew )
         COMMAND_ID_HANDLER_EX( IDM_OPEN, OnCmdOpen )

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

@@ -27 +27 @@
     CloseHandle( pi.hThread );
 }
-
-#ifdef HAVE_WINDOWS_7_SDK
 
 #define MSGFLT_ADD 1
@@ -311 +309 @@
     WindowMap windowMap;
 };
-#endif HAVE_WINDOWS_7_SDK
-
-#ifdef HAVE_WINDOWS_7_SDK
+
 MainFrame::MainFrame() :
     TaskbarButtonCreated( RegisterWindowMessage( TEXT("TaskbarButtonCreated") ) )
@@ -330 +326 @@
     }
 }
-#else
-MainFrame::MainFrame() {}
-#endif
 
 void MainFrame::Resized()
@@ -925 +918 @@
 ::LRESULT MainFrame::OnTaskbarButtonCreated( ::UINT msg, ::WPARAM, ::LPARAM )
 {
-#ifdef HAVE_WINDOWS_7_SDK
     if ( msg == 0 ) { // 念のため確認
         return 0;
     }
     taskbarList.reset(new TaskbarList(*this));
-#endif
     return 0;
 }
@@ -936 +927 @@
 void MainFrame::AddChildWindow( HWND hwndChild )
 {
-#ifdef HAVE_WINDOWS_7_SDK
-    taskbarList->RegisterTab( hwndChild );
-#endif
+    if (taskbarList)
+    {
+        taskbarList->RegisterTab( hwndChild );
+    }
 }
 
 void MainFrame::DeleteChildWindow( HWND hwndChild )
 {
-#ifdef HAVE_WINDOWS_7_SDK
-    taskbarList->UnregisterTab( hwndChild );
-#endif
+    if (taskbarList)
+    {
+        taskbarList->UnregisterTab( hwndChild );
+    }
 }
 
 void MainFrame::ActivateChildWindow( HWND hwndChild )
 {
-#ifdef HAVE_WINDOWS_7_SDK
-    taskbarList->SetTabActivate( hwndChild );
-#endif
+    if (taskbarList)
+    {
+        taskbarList->SetTabActivate( hwndChild );
+    }
 }
 
 void MainFrame::SetTabOrder( HWND hwndChild, HWND hwndInsertBefore )
 {
-#ifdef HAVE_WINDOWS_7_SDK
-    taskbarList->SetTabOrder( hwndChild, hwndInsertBefore );
-#endif
+    if (taskbarList)
+    {
+        taskbarList->SetTabOrder( hwndChild, hwndInsertBefore );
+    }
 }
 
 void MainFrame::InvalidateBitmap( HWND hwndChild )
 {
-#ifdef HAVE_WINDOWS_7_SDK
-    taskbarList->InvalidateIconicBitmaps( hwndChild );
-#endif
+    if (taskbarList)
+    {
+        taskbarList->InvalidateIconicBitmaps( hwndChild );
+    }
 }