Changeset 778 in dev for branches/egtra/ab5.0/abdev/abdev/src/MainFrame.cpp

Timestamp:

Jan 24, 2011, 2:01:54 AM (13 years ago)

Author:

イグトランス (egtra)

Message:

XP以前対応途中（Win98でabdevが起動するところまで）

File:

• branches/egtra/ab5.0/abdev/abdev/src/MainFrame.cpp (modified) (6 diffs)

branches/egtra/ab5.0/abdev/abdev/src/MainFrame.cpp

@@ -28 +28 @@
 }
 
-#ifdef HAVE_WINDOWS_7_SDK
-
 #define MSGFLT_ADD 1
 
@@ -57 +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);
@@ -311 +311 @@
     WindowMap windowMap;
 };
-#endif HAVE_WINDOWS_7_SDK
-
-#ifdef HAVE_WINDOWS_7_SDK
+
 MainFrame::MainFrame() :
     TaskbarButtonCreated( RegisterWindowMessage( TEXT("TaskbarButtonCreated") ) )
@@ -330 +328 @@
     }
 }
-#else
-MainFrame::MainFrame() {}
-#endif
 
 void MainFrame::Resized()
@@ -925 +920 @@
 ::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 +929 @@
 void MainFrame::AddChildWindow( HWND hwndChild )
 {
-#ifdef HAVE_WINDOWS_7_SDK
     taskbarList->RegisterTab( hwndChild );
-#endif
 }
 
 void MainFrame::DeleteChildWindow( HWND hwndChild )
 {
-#ifdef HAVE_WINDOWS_7_SDK
     taskbarList->UnregisterTab( hwndChild );
-#endif
 }
 
 void MainFrame::ActivateChildWindow( HWND hwndChild )
 {
-#ifdef HAVE_WINDOWS_7_SDK
     taskbarList->SetTabActivate( hwndChild );
-#endif
 }
 
 void MainFrame::SetTabOrder( HWND hwndChild, HWND hwndInsertBefore )
 {
-#ifdef HAVE_WINDOWS_7_SDK
     taskbarList->SetTabOrder( hwndChild, hwndInsertBefore );
-#endif
 }
 
 void MainFrame::InvalidateBitmap( HWND hwndChild )
 {
-#ifdef HAVE_WINDOWS_7_SDK
     taskbarList->InvalidateIconicBitmaps( hwndChild );
-#endif
 }