Changeset 772 in dev for trunk/ab5.0/abdev/abdev/SubOperation.cpp

Timestamp:

Aug 29, 2009, 7:55:19 AM (15 years ago)

Author:

イグトランス (egtra)

Message:

Windows 7タスクバーへの対応を実装。
(#245)

File:

• trunk/ab5.0/abdev/abdev/SubOperation.cpp (modified) (8 diffs)

trunk/ab5.0/abdev/abdev/SubOperation.cpp

@@ -153 +153 @@
 }
 void SlideString(char *buffer, int slide){
-    char *temp;
-    temp=(char *)malloc(lstrlen(buffer)+1);
-    lstrcpy(temp,buffer);
-    lstrcpy(buffer+slide,temp);
-    free(temp);
+    SlideBuffer(buffer, strlen(buffer) + 1, slide);
 }
 void SlideBuffer(char *buffer,int length,int slide){
-    void *temp;
-    temp=malloc(length+1);
-    memcpy(temp,buffer,length);
-    memcpy(buffer+slide,temp,length);
-    free(temp);
+    memmove(buffer+slide, buffer, length);
 }
 BOOL IsVariableTopChar(char c){
@@ -745 +737 @@
     extern FWINLAYER pSetLayeredWindowAttributes;
     extern HINSTANCE hUser32Lib;
-    hUser32Lib=GetModuleHandle("user32.dll");
+    hUser32Lib=GetModuleHandle(TEXT("user32.dll"));
     pSetLayeredWindowAttributes=reinterpret_cast<FWINLAYER>(GetProcAddress(hUser32Lib,"SetLayeredWindowAttributes"));
 
@@ -754 +746 @@
     // フォントを定義
     /////////////////////
+
+    NONCLIENTMETRICS NCMetrics = {0};
+    NCMetrics.cbSize = sizeof( NONCLIENTMETRICS );
+    SystemParametersInfo( SPI_GETNONCLIENTMETRICS, NCMetrics.cbSize, &NCMetrics, 0 );
 
     //パラメータ ヒント フォント
@@ -764 +760 @@
 
     //ステータスバー フォント
-    LOGFONT LogFont;
     extern HFONT hStatusFont;
-    LogFont.lfHeight=-12;
-    LogFont.lfWidth=0;
-    LogFont.lfEscapement=0;
-    LogFont.lfOrientation=0;
-    LogFont.lfWeight=FW_REGULAR;
-    LogFont.lfItalic=NULL;
-    LogFont.lfUnderline=NULL;
-    LogFont.lfStrikeOut=NULL;
-    LogFont.lfCharSet=SHIFTJIS_CHARSET;
-    LogFont.lfOutPrecision=OUT_STRING_PRECIS;
-    LogFont.lfClipPrecision=CLIP_STROKE_PRECIS;
-    LogFont.lfQuality=DRAFT_QUALITY;
-    LogFont.lfPitchAndFamily=VARIABLE_PITCH;
-    sprintf(LogFont.lfFaceName,"ＭＳ Ｐゴシック");
-    hStatusFont=CreateFontIndirect(&LogFont);
+    hStatusFont=CreateFontIndirect(&NCMetrics.lfStatusFont);
 
     //ハイパーリンク フォント
     extern HFONT hHyperLinkFont;
+    LOGFONT LogFont;
     LogFont.lfHeight=-12;
     LogFont.lfWidth=0;
@@ -797 +779 @@
     LogFont.lfQuality=DRAFT_QUALITY;
     LogFont.lfPitchAndFamily=VARIABLE_PITCH;
-    sprintf(LogFont.lfFaceName,"ＭＳ Ｐゴシック");
+    _tcscpy(LogFont.lfFaceName,TEXT("ＭＳ Ｐゴシック"));
     hHyperLinkFont=CreateFontIndirect(&LogFont);
 
@@ -815 +797 @@
     LogFont.lfQuality=DRAFT_QUALITY;
     LogFont.lfPitchAndFamily=VARIABLE_PITCH;
-    sprintf(LogFont.lfFaceName,"ＭＳ ゴシック");
+    _tcscpy(LogFont.lfFaceName,TEXT("ＭＳ ゴシック"));
     hRulerFont=CreateFontIndirect(&LogFont);
 
@@ -833 +815 @@
     LogFont.lfQuality=DRAFT_QUALITY;
     LogFont.lfPitchAndFamily=VARIABLE_PITCH;
-    sprintf(LogFont.lfFaceName,"Courier New");
+    _tcscpy(LogFont.lfFaceName,TEXT("Courier New"));
     hFont_LineNumber=CreateFontIndirect(&LogFont);
 
     //メニューフォント
-    NONCLIENTMETRICS NCMetrics;
-    int sizeof_NONCLIENTMETRICS = sizeof( NONCLIENTMETRICS );
-#if WINVER >= 0x0600
-    sizeof_NONCLIENTMETRICS -= sizeof(int);
-#endif
-    NCMetrics.cbSize = sizeof_NONCLIENTMETRICS;
-    SystemParametersInfo( SPI_GETNONCLIENTMETRICS, sizeof_NONCLIENTMETRICS, &NCMetrics, 0 );
     hMenuFont=CreateFontIndirect(&NCMetrics.lfMenuFont);
 
@@ -1195 +1170 @@
         WS_VISIBLE|WS_CHILD|WS_CLIPSIBLINGS|SBARS_SIZEGRIP|CCS_BOTTOM,
         NULL,hwnd,NULL);
-    SendMessage(hStatusBar,WM_SETFONT,(long)hStatusFont,0);
+    SetWindowFont(hStatusBar,hStatusFont,FALSE);
 
     //プロジェクト ビュー