Changeset 36365 for lang/objective-cplusplus/i3/trunk/src

Timestamp:

01/08/10 10:48:41 (3 years ago)

Author:

saturday06

Message:

uiuiui

Location:

lang/objective-cplusplus/i3/trunk/src

Files:

• gui-windows/CompletionWindowPlatform.cpp (modified) (1 diff)
• gui-windows/Gui.cpp (modified) (1 diff)
• gui-windows/InputWindowPlatform.cpp (modified) (6 diffs)
• gui-windows/OutputWindowPlatform.cpp (modified) (1 diff)
• mil/include/mil/Thread.h (modified) (2 diffs)
• mil/include/mil/os-windows/Os.h (modified) (1 diff)

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

@@ -92 +92 @@
     createUI();
     UpdateWindow(local_window);
-    ShowWindow(local_window, SW_SHOW);
+    ShowWindow(local_window, SW_HIDE);
     loop();
 }

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

@@ -53 +53 @@
 #endif
 
-#if defined(_MSC_VER) && !defined(NDEBUG)
+#if defined(_MSC_VER) && !defined(NDEBUG) && 0
 
 #define SET_DLL_ADDRESS(module, name)           \

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

@@ -55 +55 @@
         return;
     } else if (_tcscmp(e.command, _T("exit")) == 0) {
+                ShowWindow(mediator.getInputWindow().window.load(), SW_HIDE);
         ExitEvent ex;
         mediator.getInputWindow().post(ex, *this);
@@ -257 +258 @@
     layout.window.height = client_height;
 
+    int x = layout.window.padding.left + layout.icon.width + layout.edit.padding.right;
+    int y = layout.window.height - layout.window.padding.bottom - layout.edit.height + layout.edit.padding.top;
     int w = layout.window.width
         - layout.window.padding.right - layout.window.padding.left
@@ -263 +266 @@
 
     int h = layout.edit.height - layout.edit.padding.top - layout.edit.padding.bottom;
-    SetWindowPos(edit, 0, 0, 0, w, h, SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOREDRAW | SWP_NOOWNERZORDER | SWP_NOZORDER);
+
+    SetWindowPos(edit, NULL, x, y, w, h, SWP_NOACTIVATE | SWP_NOREDRAW | SWP_NOOWNERZORDER | SWP_NOZORDER);
     SetMsgHandled(false);
 }
@@ -389 +393 @@
 void InputWindowPlatform<InputWindow>::OnKeyDown(HWND hWnd, UINT vk, BOOL fDown, int cRepeat, UINT flags) {
     if (vk == VK_ESCAPE) {
+                ShowWindow(local_window, SW_HIDE);
         PostMessage(hWnd, WM_CLOSE, 0, 0);
     }
@@ -739 +744 @@
     // �G�f�B�b�g�R���g���[���쐬
     //
-    int x = layout.window.padding.left + layout.icon.width + layout.edit.padding.right;
-    int y = layout.window.height - layout.window.padding.bottom - layout.edit.height + layout.edit.padding.top;
     edit = CreateWindowEx(
                 richedit_exstyle,
@@ -748 +751 @@
                 _T(""),
                 richedit_style,
-                x,
-                y,
+                0,
+                0,
                 100,
                 100,

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

@@ -92 +92 @@
     createUI();
     UpdateWindow(local_window);
-    ShowWindow(local_window, SW_SHOW);
+    ShowWindow(local_window, SW_HIDE);
     loop();
 }

lang/objective-cplusplus/i3/trunk/src/mil/include/mil/Thread.h

@@ -232 +232 @@
 
     void join() {
-        for (int retry = 50; thread_routine_status.load() == RUNNING; retry--) {
+        for (int retry = 500; thread_routine_status.load() == RUNNING; retry--) {
 
             if (retry == 0) {
@@ -239 +239 @@
             }
 
-            sleep(1);
+            milli_sleep(50);
         }
 

lang/objective-cplusplus/i3/trunk/src/mil/include/mil/os-windows/Os.h

@@ -17 +17 @@
 
 namespace mil {
+
+inline static void milli_sleep(unsigned int milli_seconds) {
+        Sleep(milli_seconds);
+}
 
 inline static void sleep_gui() {