Changeset 35968

Timestamp:

11/23/09 01:49:35 (4 years ago)

Author:

saturday06

Message:

monkey

Location:

lang/objective-cplusplus/i3/trunk

Files:

• configure.ac (modified) (2 diffs)
• src/gui-windows/CompletionWindowPlatform.cpp (modified) (2 diffs)
• src/gui-windows/InputWindowPlatform.cpp (modified) (4 diffs)
• src/gui-windows/InputWindowPlatform.h (modified) (1 diff)

lang/objective-cplusplus/i3/trunk/configure.ac

@@ -90 +90 @@
         GCH_LANG="objective-c++-header"
         CXXFLAGS="$CXXFLAGS -xobjective-c++"
+        #CXXFLAGS="$CXXFLAGS $OBJCFLAGS -xobjective-c++"
         LDFLAGS="$LDFLAGS -xnone -framework Cocoa"
     ;;
@@ -96 +97 @@
         GCH_LANG="objective-c++-header"
         CXXFLAGS="$CXXFLAGS -xobjective-c++"
+        #CXXFLAGS="$CXXFLAGS $OBJCFLAGS -xobjective-c++"
         LDFLAGS="$LDFLAGS -xnone"
 

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

@@ -22 +22 @@
 template <>
 void CompletionWindowPlatform<CompletionWindow>::createUI() {
+    if (hLocalWnd) {
+        return;
+    }
+    // -------------------------------------------------------------
+    // ウィンドウ作成
+    //
+
+    const int DEFAULT_WINDOW_WIDTH = 200;
+    const int DEFAULT_WINDOW_HEIGHT = 200;
+
+    TCHAR ClassName[] = _T("i3/WNDCLASS::lpszClassName/CompletionWindow"); //  <- rule required
+    int nCmdShow = SW_SHOW;
+
+    WNDCLASS wc    = {};
+    wc.style         = CS_HREDRAW | CS_VREDRAW;
+    wc.lpfnWndProc   = DefWindowProc;
+    wc.cbClsExtra    = 0;
+    wc.cbWndExtra    = 0;
+    wc.hInstance     = i3::hInstance;
+    wc.hIcon         = NULL;//LoadIcon(hCrtInst, MAKEINTRESOURCE(IDI_ICON1));
+    wc.hCursor       = LoadCursor(NULL, IDC_ARROW);
+    wc.hbrBackground = GetSysColorBrush(COLOR_3DFACE);
+    wc.lpszMenuName  = NULL;
+    wc.lpszClassName = ClassName;
+
+    if (!RegisterClass(&wc)) {
+        halt << "lpszClassName: [" << wc.lpszClassName << "]";
+        return;
+    }
+
+    DWORD dwDefaultStyle = WS_POPUP;
+    DWORD dwDefaultExStyle = 0;
+//    DWORD dwDefaultExStyle = WS_EX_DLGMODALFRAME;
+#ifdef _WIN32_WCE
+    dwDefaultStyle |= WS_BORDER;
+#else
+    dwDefaultStyle |= WS_THICKFRAME;
+//    dwDefaultStyle |= WS_DLGFRAME;
+//    dwDefaultStyle |= WS_BORDER;
+#endif
+    dwDefaultStyle &= ~WS_CAPTION;
+
+    HWND hWnd = CreateWindowEx(
+                    dwDefaultExStyle,
+                    ClassName,
+                    _T("i3/CompletionWindow"), //  <- need rule
+                    dwDefaultStyle,
+                    30, //CW_USEDEFAULT,
+                    30, //CW_USEDEFAULT,
+                    DEFAULT_WINDOW_WIDTH,
+                    DEFAULT_WINDOW_HEIGHT,
+                    NULL,
+                    NULL,
+                    i3::hInstance,
+                    NULL
+                );
+
+    if (!IsWindow(hWnd)) {
+        // what ..?
+        halt << hWnd;
+        return;
+    }
+
+    setWindow(hWnd);
 }
 
@@ -27 +91 @@
 void CompletionWindowPlatform<CompletionWindow>::run() {
     createUI();
+    UpdateWindow(hLocalWnd);
+    ShowWindow(hLocalWnd, SW_SHOW);
     loop();
 }

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

@@ -421 +421 @@
 template <>
 size_t InputWindowPlatform<InputWindow>::getEditVerticalMargin() {
-    NONCLIENTMETRICS NCMetrics = {};
-    NCMetrics.cbSize = sizeof(NCMetrics);
-    SystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), &NCMetrics, 0);
-
-    DWORD dwStyle = (DWORD)GetWindowLongPtr(hEdit, GWL_STYLE);
-    DWORD dwExStyle = (DWORD)GetWindowLongPtr(hEdit, GWL_EXSTYLE);
-
-    int cyborder = GetSystemMetrics(SM_CYBORDER);
-    int cysizeframe = GetSystemMetrics(SM_CYSIZEFRAME);
-    int cyfixedframe = GetSystemMetrics(SM_CYFIXEDFRAME);
-    int cyedge = GetSystemMetrics(SM_CYEDGE);
+    //NONCLIENTMETRICS NCMetrics = {};
+    //NCMetrics.cbSize = sizeof(NCMetrics);
+    //SystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), &NCMetrics, 0);
+
+    //DWORD dwStyle = (DWORD)GetWindowLongPtr(hEdit, GWL_STYLE);
+    //DWORD dwExStyle = (DWORD)GetWindowLongPtr(hEdit, GWL_EXSTYLE);
+
+    //int cyborder = GetSystemMetrics(SM_CYBORDER);
+    //int cysizeframe = GetSystemMetrics(SM_CYSIZEFRAME);
+    //int cyfixedframe = GetSystemMetrics(SM_CYFIXEDFRAME);
+    //int cyedge = GetSystemMetrics(SM_CYEDGE);
 
 //     debug << boost::basic_format<char>(
@@ -465 +465 @@
 
 template <>
-void InputWindowPlatform<InputWindow>::loop() {
+void InputWindowPlatform<InputWindow>::run() {
+    createGui();
     UpdateWindow(hLocalWnd);
-    int nCmdShow = SW_SHOW; // XXX
-    ShowWindow(hLocalWnd, nCmdShow);
-    mil::GuiModule<InputWindowPlatform<InputWindow> >::loop();
+    ShowWindow(hLocalWnd, SW_SHOW);
+    loop();
 }
 
@@ -496 +496 @@
     const int DEFAULT_WINDOW_HEIGHT = 200;
 
-    TCHAR ClassName[] = _T("i3.WNDCLASS::lpszClassName.InputWindow"); //  <- rule required
+    TCHAR ClassName[] = _T("i3/WNDCLASS::lpszClassName/InputWindow"); //  <- rule required
     int nCmdShow = SW_SHOW;
 
@@ -531 +531 @@
                     dwDefaultExStyle,
                     ClassName,
-                    _T("i3 Title: InputWindow"), //  <- need rule
+                    _T("i3/InputWindow"), //  <- need rule
                     dwDefaultStyle,
                     30, //CW_USEDEFAULT,

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

@@ -18 +18 @@
 
     void createGui();
-    void loop();
+    void run();
 
     void OnActivate(HWND hWnd, UINT state, HWND hWndActDeact, BOOL fMinimized);