Changeset 824 in dev for trunk/ab5.0/abdev
- Timestamp:
- Feb 19, 2012, 8:58:50 PM (13 years ago)
- Location:
- trunk/ab5.0/abdev
- Files:
-
- 4 deleted
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ab5.0/abdev/BasicCompiler_Common/common.h
r764 r824 17 17 18 18 #include "../BasicCompiler_Common/NonVolatile.h" 19 #include "../BasicCompiler_Common/psapi.h"19 #include <psapi.h> 20 20 21 21 -
trunk/ab5.0/abdev/abdev/include/MainFrame.h
r772 r824 17 17 #define WM_DESTROYDEBUGGERVIEW WM_USER+76 //デバッガウィンドウが表示されたとき 18 18 19 #ifdef HAVE_WINDOWS_7_SDK20 19 class TaskbarList; 21 #endif22 20 23 21 namespace ActiveBasic{ namespace IDE{ … … 29 27 WindowAreaManager wam; 30 28 UINT TaskbarButtonCreated; 31 #ifdef HAVE_WINDOWS_7_SDK32 29 boost::shared_ptr<TaskbarList> taskbarList; 33 #endif34 30 35 31 public: … … 90 86 ::LRESULT OnShowSourceLine( ::UINT msg, ::WPARAM wParam, ::LPARAM lParam, ::BOOL& handled ); 91 87 92 #ifdef HAVE_WINDOWS_7_SDK93 88 // タスクバーボタンが生成された 94 89 ::LRESULT OnTaskbarButtonCreated(::UINT msg, ::WPARAM wParam, ::LPARAM lParam); … … 108 103 // サムネイル画像が古くなった(ので更新したい) 109 104 void InvalidateBitmap( HWND hwndChild ); 110 #endif111 105 112 106 // 「新規作成」メニューがクリックされた … … 302 296 MSG_WM_PAINT( OnPaint ) 303 297 MESSAGE_HANDLER( WM_SHOWERROR, OnShowSourceLine ) 304 #ifdef HAVE_WINDOWS_7_SDK305 298 MESSAGE_HANDLER_EX( TaskbarButtonCreated, OnTaskbarButtonCreated ) 306 #endif307 299 COMMAND_ID_HANDLER_EX( IDM_NEW, OnCmdNew ) 308 300 COMMAND_ID_HANDLER_EX( IDM_OPEN, OnCmdOpen ) -
trunk/ab5.0/abdev/abdev/src/MainFrame.cpp
r772 r824 27 27 CloseHandle( pi.hThread ); 28 28 } 29 30 #ifdef HAVE_WINDOWS_7_SDK31 29 32 30 #define MSGFLT_ADD 1 … … 311 309 WindowMap windowMap; 312 310 }; 313 #endif HAVE_WINDOWS_7_SDK 314 315 #ifdef HAVE_WINDOWS_7_SDK 311 316 312 MainFrame::MainFrame() : 317 313 TaskbarButtonCreated( RegisterWindowMessage( TEXT("TaskbarButtonCreated") ) ) … … 330 326 } 331 327 } 332 #else333 MainFrame::MainFrame() {}334 #endif335 328 336 329 void MainFrame::Resized() … … 925 918 ::LRESULT MainFrame::OnTaskbarButtonCreated( ::UINT msg, ::WPARAM, ::LPARAM ) 926 919 { 927 #ifdef HAVE_WINDOWS_7_SDK928 920 if ( msg == 0 ) { // 念のため確認 929 921 return 0; 930 922 } 931 923 taskbarList.reset(new TaskbarList(*this)); 932 #endif933 924 return 0; 934 925 } … … 936 927 void MainFrame::AddChildWindow( HWND hwndChild ) 937 928 { 938 #ifdef HAVE_WINDOWS_7_SDK 939 taskbarList->RegisterTab( hwndChild ); 940 #endif 929 if (taskbarList) 930 { 931 taskbarList->RegisterTab( hwndChild ); 932 } 941 933 } 942 934 943 935 void MainFrame::DeleteChildWindow( HWND hwndChild ) 944 936 { 945 #ifdef HAVE_WINDOWS_7_SDK 946 taskbarList->UnregisterTab( hwndChild ); 947 #endif 937 if (taskbarList) 938 { 939 taskbarList->UnregisterTab( hwndChild ); 940 } 948 941 } 949 942 950 943 void MainFrame::ActivateChildWindow( HWND hwndChild ) 951 944 { 952 #ifdef HAVE_WINDOWS_7_SDK 953 taskbarList->SetTabActivate( hwndChild ); 954 #endif 945 if (taskbarList) 946 { 947 taskbarList->SetTabActivate( hwndChild ); 948 } 955 949 } 956 950 957 951 void MainFrame::SetTabOrder( HWND hwndChild, HWND hwndInsertBefore ) 958 952 { 959 #ifdef HAVE_WINDOWS_7_SDK 960 taskbarList->SetTabOrder( hwndChild, hwndInsertBefore ); 961 #endif 953 if (taskbarList) 954 { 955 taskbarList->SetTabOrder( hwndChild, hwndInsertBefore ); 956 } 962 957 } 963 958 964 959 void MainFrame::InvalidateBitmap( HWND hwndChild ) 965 960 { 966 #ifdef HAVE_WINDOWS_7_SDK 967 taskbarList->InvalidateIconicBitmaps( hwndChild ); 968 #endif 961 if (taskbarList) 962 { 963 taskbarList->InvalidateIconicBitmaps( hwndChild ); 964 } 969 965 } 970 966
Note:
See TracChangeset
for help on using the changeset viewer.