diff --git a/reactos/subsys/system/ibrowser/ibrowser.cpp b/reactos/subsys/system/ibrowser/ibrowser.cpp index 7165a4e8946..064f7d5ed2c 100644 --- a/reactos/subsys/system/ibrowser/ibrowser.cpp +++ b/reactos/subsys/system/ibrowser/ibrowser.cpp @@ -370,7 +370,7 @@ PopupMenu::PopupMenu(UINT nid) } - /// "About Explorer" Dialog + /// "About" Dialog struct ExplorerAboutDlg : public CtlColorParent< OwnerDrawParent diff --git a/reactos/subsys/system/ibrowser/ibrowser_intres.rc b/reactos/subsys/system/ibrowser/ibrowser_intres.rc index bdf80344995..a1857e6ade3 100644 --- a/reactos/subsys/system/ibrowser/ibrowser_intres.rc +++ b/reactos/subsys/system/ibrowser/ibrowser_intres.rc @@ -43,8 +43,8 @@ BEGIN END POPUP "&Ajutor" BEGIN - MENUITEM "Explorer &FAQ...", ID_IBROWSER_FAQ - MENUITEM "&Despre Explorer...", ID_ABOUT_IBROWSER + MENUITEM "IBrowser &FAQ...", ID_IBROWSER_FAQ + MENUITEM "&Despre IBrowser...", ID_ABOUT_IBROWSER MENUITEM "Despre &OS...", ID_ABOUT_WINDOWS END END @@ -116,8 +116,8 @@ BEGIN END POPUP "&Hilfe" BEGIN - MENUITEM "Explorer &FAQ...", ID_IBROWSER_FAQ - MENUITEM "&About Explorer...", ID_ABOUT_IBROWSER + MENUITEM "IBrowser &FAQ...", ID_IBROWSER_FAQ + MENUITEM "&About IBrowser...", ID_ABOUT_IBROWSER MENUITEM "About &OS...", ID_ABOUT_WINDOWS END END @@ -188,9 +188,9 @@ BEGIN "BEGIN\r\n" "IDS_VERSION_STR """"\r\n" "#ifdef UNICODE\r\n" - "IDS_IBROWSER_VERSION_STR ""ROS Explorer%0s""\r\n" + "IDS_IBROWSER_VERSION_STR ""ROS IBrowser%0s""\r\n" "#else\r\n" - "IDS_IBROWSER_VERSION_STR ""ROS Explorer Ansi%0s""\r\n" + "IDS_IBROWSER_VERSION_STR ""ROS IBrowser Ansi%0s""\r\n" "#endif\r\n" "END\r\n" "#endif\r\n" @@ -265,8 +265,8 @@ BEGIN END POPUP "&Help" BEGIN - MENUITEM "Explorer &FAQ...", ID_IBROWSER_FAQ - MENUITEM "&About Explorer...", ID_ABOUT_IBROWSER + MENUITEM "IBrowser &FAQ...", ID_IBROWSER_FAQ + MENUITEM "&About IBrowser...", ID_ABOUT_IBROWSER MENUITEM "About &OS...", ID_ABOUT_WINDOWS END END @@ -323,8 +323,8 @@ BEGIN END POPUP "&Ayuda" BEGIN - MENUITEM "Explorer &FAQ...", ID_IBROWSER_FAQ - MENUITEM "&Acerca de Explorer...", ID_ABOUT_IBROWSER + MENUITEM "IBrowser &FAQ...", ID_IBROWSER_FAQ + MENUITEM "&Acerca de IBrowser...", ID_ABOUT_IBROWSER MENUITEM "Acerca de &OS...", ID_ABOUT_WINDOWS END END @@ -386,9 +386,9 @@ STRINGTABLE DISCARDABLE BEGIN IDS_VERSION_STR "" #ifdef UNICODE -IDS_IBROWSER_VERSION_STR "ROS Explorer%0s" +IDS_IBROWSER_VERSION_STR "ROS IBrowser%0s" #else -IDS_IBROWSER_VERSION_STR "ROS Explorer Ansi%0s" +IDS_IBROWSER_VERSION_STR "ROS IBrowser Ansi%0s" #endif END #endif diff --git a/reactos/subsys/system/ibrowser/mainframe.cpp b/reactos/subsys/system/ibrowser/mainframe.cpp index ba34da97ec7..f6112bc10bb 100644 --- a/reactos/subsys/system/ibrowser/mainframe.cpp +++ b/reactos/subsys/system/ibrowser/mainframe.cpp @@ -672,9 +672,9 @@ LRESULT MainFrame::WndProc(UINT nmsg, WPARAM wparam, LPARAM lparam) if (!url || !*url) #ifdef _DEBUG - url = _T("http://localhost"); + url = TEXT("http://localhost"); #else - url = _T("about:blank"); + url = TEXT("about:blank"); #endif if (!_right_hwnd) { @@ -764,7 +764,7 @@ void MainFrame::resize_children() } if (_right_hwnd) - hdwp = DeferWindowPos(hdwp, _right_hwnd, 0, _clnt_rect.left+cx+1, _clnt_rect.top, _clnt_rect.right-cx, _clnt_rect.bottom-_clnt_rect.top, SWP_NOZORDER|SWP_NOACTIVATE); + hdwp = DeferWindowPos(hdwp, _right_hwnd, 0, _clnt_rect.left+cx, _clnt_rect.top, _clnt_rect.right-cx, _clnt_rect.bottom-_clnt_rect.top, SWP_NOZORDER|SWP_NOACTIVATE); EndDeferWindowPos(hdwp); } diff --git a/reactos/subsys/system/ibrowser/webchild.cpp b/reactos/subsys/system/ibrowser/webchild.cpp index 78cc3c0f72a..4b4bb484b4c 100644 --- a/reactos/subsys/system/ibrowser/webchild.cpp +++ b/reactos/subsys/system/ibrowser/webchild.cpp @@ -222,8 +222,8 @@ WebChildWindow::WebChildWindow(HWND hwnd, const WebChildWndInfo& info) _connector = auto_ptr(new EventConnector(_control, DIID_DWebBrowserEvents2, this)); + // We need to call Navigate() here to initialize the browser control (see _browser_initialized) _control->Navigate(BStr(info._url), &vtMissing, &vtMissing, &vtMissing, &vtMissing); - //browser->Navigate2(&Variant(info._url), &vtMissing, &vtMissing, &vtMissing, &vtMissing); } }