[ros-diffs] [mf] 13326: - rename some Explorer strings to IBrowser

- rename some Explorer strings to IBrowser
- fix child window size
Modified: trunk/reactos/subsys/system/ibrowser/ibrowser.cpp
Modified: trunk/reactos/subsys/system/ibrowser/ibrowser_intres.rc
Modified: trunk/reactos/subsys/system/ibrowser/mainframe.cpp
Modified: trunk/reactos/subsys/system/ibrowser/webchild.cpp
  _____

Modified: trunk/reactos/subsys/system/ibrowser/ibrowser.cpp
--- trunk/reactos/subsys/system/ibrowser/ibrowser.cpp	2005-01-26
23:30:50 UTC (rev 13325)
+++ trunk/reactos/subsys/system/ibrowser/ibrowser.cpp	2005-01-27
00:09:43 UTC (rev 13326)
@@ -370,7 +370,7 @@

}

- /// "About Explorer" Dialog
+ /// "About" Dialog
 struct ExplorerAboutDlg : public
    		CtlColorParent<
    			OwnerDrawParent<Dialog>
  _____

Modified: trunk/reactos/subsys/system/ibrowser/ibrowser_intres.rc
--- trunk/reactos/subsys/system/ibrowser/ibrowser_intres.rc
2005-01-26 23:30:50 UTC (rev 13325)
+++ trunk/reactos/subsys/system/ibrowser/ibrowser_intres.rc
2005-01-27 00:09:43 UTC (rev 13326)
@@ -43,8 +43,8 @@

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 @@
     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\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 @@
     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 @@
     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 @@
 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
  _____

Modified: trunk/reactos/subsys/system/ibrowser/mainframe.cpp
--- trunk/reactos/subsys/system/ibrowser/mainframe.cpp	2005-01-26
23:30:50 UTC (rev 13325)
+++ trunk/reactos/subsys/system/ibrowser/mainframe.cpp	2005-01-27
00:09:43 UTC (rev 13326)
@@ -672,9 +672,9 @@

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 @@
    }

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);
 }
  _____

Modified: trunk/reactos/subsys/system/ibrowser/webchild.cpp
--- trunk/reactos/subsys/system/ibrowser/webchild.cpp	2005-01-26
23:30:50 UTC (rev 13325)
+++ trunk/reactos/subsys/system/ibrowser/webchild.cpp	2005-01-27
00:09:43 UTC (rev 13326)
@@ -222,8 +222,8 @@

_connector = auto_ptr<EventConnector>(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);
    }
 }