Changeset 34636

Timestamp:

07/26/09 21:43:19 (4 years ago)

Author:

saturday06

Message:

もうだめぽもうだめぽもうだめぽもうだめぽもうだめぽ

Files:

• lang/objective-cplusplus/i3/trunk/src/gui-windows/InputWindowPlatform.cpp (modified) (7 diffs)

lang/objective-cplusplus/i3/trunk/src/gui-windows/InputWindowPlatform.cpp

@@ -226 +226 @@
     layout.width = layout.width + cx - layout.nc_width;
     layout.nc_width = cx;
-    int x = layout.margin_left + layout.edit_left;
-    int y = (layout.nc_height - layout.edit_height) / 2;
     int w = layout.nc_width - layout.edit_left - layout.margin_right - layout.margin_left;
     int h = layout.edit_height;
-    SetWindowPos(hEdit, 0, x, y, w, h, SWP_NOACTIVATE | SWP_NOREDRAW | SWP_NOOWNERZORDER | SWP_NOZORDER);
+    SetWindowPos(hEdit, 0, 0, 0, w, h, SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOREDRAW | SWP_NOOWNERZORDER | SWP_NOZORDER);
     SetMsgHandled(false);
 }
@@ -502 +500 @@
 
     // -------------------------------------------------------------
-    // �G�f�B�b�g�R���g���[���쐬
-    //
-    hEdit = CreateWindowEx(
-                0,
-                name,
-                //_T("RICHEDIT"),
-                //_T("EDIT"),
-                _T(""),
-                richedit_style,
-                0,
-                0,
-                100,
-                100,
-                hWnd,
-                NULL,//reinterpret_cast<HMENU>(IDC_EDIT),
-                i3::hInstance,
-                NULL
-            );
-
-    // -------------------------------------------------------------
     // �t�H���g�ݒ�    //
     HFONT font = NULL;
@@ -533 +511 @@
         font = (HFONT)GetStockObject(DEFAULT_GUI_FONT);
     }
-    SendMessage(hEdit, WM_SETFONT, (WPARAM)font, (LPARAM)FALSE);
+
 #else
     font = (HFONT)SendMessage(hEdit, WM_GETFONT, NULL, NULL);
@@ -551 +529 @@
         int result = ReleaseDC(hWnd, dc);
     }
-
-#ifndef _WIN32_WCE
-    LRESULT dwEvent = SendMessage(hEdit, EM_GETEVENTMASK, 0, 0);
-    dwEvent |= ENM_MOUSEEVENTS | ENM_KEYEVENTS | ENM_CHANGE;
-    SendMessage(hEdit, EM_SETEVENTMASK, 0, (LPARAM)dwEvent);
-#endif
 
     // -------------------------------------------------------------
@@ -593 +565 @@
             SetWindowPos(hWnd, 0, 0, 0, layout.width, layout.height, SWP_NOACTIVATE | SWP_NOREDRAW | SWP_NOOWNERZORDER | SWP_NOZORDER | SWP_NOMOVE);
         }
-        OnSize(hWnd, SIZE_RESTORED, layout.nc_width, layout.nc_height);
     }
 
@@ -648 +619 @@
     }
 
-    // -------------------------------------------------------------
-    // �E�B���h�E����ƗL��    //
-
-    //UpdateWindow(hEdit);
-    SetFocus(hEdit);
-    setWindow(hWnd);
-    hSharedEdit.store(hEdit);
-    //InvalidateRect(hWnd, NULL, FALSE);
-    UpdateWindow(hWnd);
-    //ShowWindow(hEdit, SW_HIDE);
-    ShowWindow(hWnd, nCmdShow);
+
+    // -------------------------------------------------------------
+    // �G�f�B�b�g�R���g���[���쐬
+    //
+    int x = layout.margin_left + layout.edit_left;
+    int y = (layout.nc_height - layout.edit_height) / 2;
+    hEdit = CreateWindowEx(
+                0,
+                name,
+                //_T("RICHEDIT"),
+                //_T("EDIT"),
+                _T(""),
+                richedit_style,
+                x,
+                y,
+                100,
+                100,
+                hWnd,
+                NULL,//reinterpret_cast<HMENU>(IDC_EDIT),
+                i3::hInstance,
+                NULL
+            );
+    SendMessage(hEdit, WM_SETFONT, (WPARAM)font, (LPARAM)FALSE);
+#ifndef _WIN32_WCE
+    LRESULT dwEvent = SendMessage(hEdit, EM_GETEVENTMASK, 0, 0);
+    dwEvent |= ENM_MOUSEEVENTS | ENM_KEYEVENTS | ENM_CHANGE;
+    SendMessage(hEdit, EM_SETEVENTMASK, 0, (LPARAM)dwEvent);
+#endif
+
+    OnSize(hWnd, SIZE_RESTORED, layout.nc_width, layout.nc_height);
 
     // -------------------------------------------------------------
@@ -671 +661 @@
     _tcscpy_s(connectingIcon.szTip, _T(""));
     Shell_NotifyIcon(NIM_ADD, &connectingIcon);
-}
-
-}
+
+    // -------------------------------------------------------------
+    // �E�B���h�E����ƗL��    //
+    //UpdateWindow(hEdit);
+    SetFocus(hEdit);
+    setWindow(hWnd);
+    hSharedEdit.store(hEdit);
+    //InvalidateRect(hWnd, NULL, FALSE);
+    UpdateWindow(hWnd);
+    //ShowWindow(hEdit, SW_HIDE);
+    ShowWindow(hWnd, nCmdShow);
+}
+
+}