shdocvw: Better window handling.
Use unicode version of DefWindowProc in unicode window procs. Fix window styles.
This commit is contained in:
parent
150bd5442c
commit
b81b614da8
|
@ -120,7 +120,7 @@ static LRESULT WINAPI doc_view_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l
|
|||
return navigate2(This);
|
||||
}
|
||||
|
||||
return DefWindowProcA(hwnd, msg, wParam, lParam);
|
||||
return DefWindowProcW(hwnd, msg, wParam, lParam);
|
||||
}
|
||||
|
||||
void create_doc_view_hwnd(WebBrowser *This)
|
||||
|
@ -149,7 +149,7 @@ void create_doc_view_hwnd(WebBrowser *This)
|
|||
GetClientRect(This->shell_embedding_hwnd, &rect);
|
||||
This->doc_view_hwnd = CreateWindowExW(0, wszShell_DocObject_View,
|
||||
wszShell_DocObject_View,
|
||||
WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_TABSTOP | WS_MAXIMIZEBOX,
|
||||
WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_TABSTOP,
|
||||
rect.left, rect.top, rect.right, rect.bottom, This->shell_embedding_hwnd,
|
||||
NULL, shdocvw_hinstance, This);
|
||||
}
|
||||
|
|
|
@ -58,7 +58,7 @@ static LRESULT WINAPI shell_embedding_proc(HWND hwnd, UINT msg, WPARAM wParam, L
|
|||
return resize_window(This, LOWORD(lParam), HIWORD(lParam));
|
||||
}
|
||||
|
||||
return DefWindowProcA(hwnd, msg, wParam, lParam);
|
||||
return DefWindowProcW(hwnd, msg, wParam, lParam);
|
||||
}
|
||||
|
||||
static void create_shell_embedding_hwnd(WebBrowser *This)
|
||||
|
@ -91,10 +91,12 @@ static void create_shell_embedding_hwnd(WebBrowser *This)
|
|||
IOleInPlaceSite_Release(inplace);
|
||||
}
|
||||
|
||||
This->shell_embedding_hwnd = CreateWindowExW(0, wszShellEmbedding, wszShellEmbedding,
|
||||
WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_TABSTOP | WS_MAXIMIZEBOX,
|
||||
0, 0, 0, 0, parent,
|
||||
NULL, shdocvw_hinstance, This);
|
||||
This->shell_embedding_hwnd = CreateWindowExW(
|
||||
WS_EX_WINDOWEDGE,
|
||||
wszShellEmbedding, wszShellEmbedding,
|
||||
WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_TABSTOP,
|
||||
0, 0, 0, 0, parent,
|
||||
NULL, shdocvw_hinstance, This);
|
||||
}
|
||||
|
||||
/**********************************************************************
|
||||
|
|
Loading…
Reference in New Issue