Changeset 828 in dev for trunk/ab5.0/abdev/abdev/DrawBuffer.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/DrawBuffer.cpp (modified) (3 diffs)

trunk/ab5.0/abdev/abdev/DrawBuffer.cpp

@@ -222 +222 @@
 
                 if(bBreakPoint){
-                    DrawIconEx(memdc,3,i*font_height+(font_height-16)/2,
-                        (HICON)LoadImage(hIconResInst,MAKEINTRESOURCE(IDI_BREAKPOINT_FLAG),IMAGE_ICON,16,16,LR_SHARED),
-                        16,16,0,NULL,DI_NORMAL);
+                    ActiveBasic::Resource::UniqueHIcon hicon(ActiveBasic::Resource::LoadIconAlt(hIconResInst, IDI_BREAKPOINT_FLAG, 16, 16));
+                    DrawIconEx(memdc,3,i*font_height+(font_height-16)/2,hicon.get(),16,16,0,NULL,DI_NORMAL);
                 }
                 else{
@@ -272 +271 @@
     }
 };
+
+static bool IsRemoteSession()
+{
+    OSVERSIONINFO vi = {sizeof vi};
+    BOOL ret = ::GetVersionEx(&vi);
+    if (ret && vi.dwMajorVersion >= 5)
+    {
+        const int SM_REMOTESESSION = 0x1000;
+        return GetSystemMetrics(SM_REMOTESESSION);
+    }
+    return false;
+}
 
 void TextEdit_DrawBuffer(HDC hdc,int WndNum,bool drawDirectly){
@@ -307 +318 @@
         OnePage_CharHeight,
         iLineNumberTextCount,
-        drawDirectly || GetSystemMetrics(SM_REMOTESESSION));
+        drawDirectly || IsRemoteSession());