mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

NOT PART OF BUILD. Fix test app to work with new location of some files it needs moved by bug 206901 plus improve layout and properly monitor command state change events.

This commit is contained in:
locka%iol.ie 2003-06-12 20:48:43 +00:00
Родитель bbda4156dc
Коммит fccaeaf76c
8 изменённых файлов: 162 добавлений и 112 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

139
embedding/browser/activex/tests/cbrowse/CBrowseDlg.cpp
Просмотреть файл

@ -51,7 +51,6 @@ CBrowseDlg::CBrowseDlg(CWnd* pParent /*=NULL*/)
double y = 1.0/x;
//{{AFX_DATA_INIT(CBrowseDlg)
m_bNewWindow = FALSE;
//}}AFX_DATA_INIT
// Note that LoadIcon does not require a subsequent DestroyIcon in Win32
m_pBrowseDlg = this;
@ -59,15 +58,20 @@ CBrowseDlg::CBrowseDlg(CWnd* pParent /*=NULL*/)
m_clsid = CLSID_NULL;
m_bUseCustomPopupMenu = FALSE;
m_bUseCustomDropTarget = FALSE;
m_bEditMode = FALSE;
m_bNewWindow = FALSE;
m_bCanGoBack = FALSE;
m_bCanGoForward = FALSE;
}
void CBrowseDlg::DoDataExchange(CDataExchange* pDX)
{
CDialog::DoDataExchange(pDX);
CDialog::DoDataExchange(pDX);
//{{AFX_DATA_MAP(CBrowseDlg)
DDX_Control(pDX, IDC_EDITMODE, m_btnEditMode);
DDX_Control(pDX, IDC_STOP, m_btnStop);
DDX_Control(pDX, IDC_FORWARD, m_btnForward);
DDX_Control(pDX, IDC_BACKWARD, m_btnBack);
DDX_Control(pDX, IDC_URL, m_cmbURLs);
DDX_Check(pDX, IDC_NEWWINDOW, m_bNewWindow);
//}}AFX_DATA_MAP
}
@ -81,7 +85,6 @@ BEGIN_MESSAGE_MAP(CBrowseDlg, CDialog)
ON_WM_CLOSE()
ON_WM_DESTROY()
ON_WM_SIZE()
ON_BN_CLICKED(IDC_EDITMODE, OnEditMode)
ON_COMMAND(ID_FILE_EXIT, OnFileExit)
ON_COMMAND(ID_VIEW_GOTO_BACK, OnViewGotoBack)
ON_COMMAND(ID_VIEW_GOTO_FORWARD, OnViewGotoForward)
@ -101,6 +104,11 @@ BEGIN_MESSAGE_MAP(CBrowseDlg, CDialog)
ON_COMMAND(ID_DEBUG_VISIBLE, OnDebugVisible)
ON_UPDATE_COMMAND_UI(ID_DEBUG_VISIBLE, OnUpdateDebugVisible)
ON_COMMAND(ID_DEBUG_POSTDATATEST, OnDebugPostDataTest)
ON_BN_CLICKED(IDC_RELOAD, OnReload)
ON_COMMAND(ID_VIEW_EDITMODE, OnViewEditmode)
ON_COMMAND(ID_VIEW_OPENLINKSINNEWWINDOWS, OnViewOpenInNewWindow)
ON_UPDATE_COMMAND_UI(ID_VIEW_EDITMODE, OnUpdateViewEditmode)
ON_UPDATE_COMMAND_UI(ID_VIEW_OPENLINKSINNEWWINDOWS, OnUpdateViewOpenInNewWindow)
//}}AFX_MSG_MAP
ON_COMMAND(IDB_BOLD, OnEditBold)
ON_COMMAND(IDB_ITALIC, OnEditItalic)
@ -319,8 +327,8 @@ HRESULT CBrowseDlg::CreateWebBrowser()
return E_OUTOFMEMORY;
}
CControlEventSinkInstance *pEventSink = NULL;
CControlEventSinkInstance::CreateInstance(&pEventSink);
CBrowseEventSinkInstance *pEventSink = NULL;
CBrowseEventSinkInstance::CreateInstance(&pEventSink);
if (pEventSink == NULL)
{
m_pControlSite->Release();
@ -461,52 +469,57 @@ void CBrowseDlg::OnGo()
{
UpdateData();
IWebBrowser *pIWebBrowser = NULL;
if (SUCCEEDED(GetWebBrowser(&pIWebBrowser)))
CComPtr<IWebBrowser> webBrowser;
if (SUCCEEDED(GetWebBrowser(&webBrowser)))
{
CString szURL;
m_cmbURLs.GetWindowText(szURL);
CComVariant vFlags(m_bNewWindow ? navOpenInNewWindow : 0);
BSTR bstrURL = szURL.AllocSysString();
HRESULT hr = pIWebBrowser->Navigate(bstrURL, &vFlags, NULL, NULL, NULL);
HRESULT hr = webBrowser->Navigate(bstrURL, &vFlags, NULL, NULL, NULL);
if (FAILED(hr))
{
OutputString("Navigate failed (hr=0x%08x)", hr);
}
::SysFreeString(bstrURL);
pIWebBrowser->Release();
}
}
void CBrowseDlg::OnStop()
{
IWebBrowser *pIWebBrowser = NULL;
if (SUCCEEDED(GetWebBrowser(&pIWebBrowser)))
CComPtr<IWebBrowser> webBrowser;
if (SUCCEEDED(GetWebBrowser(&webBrowser)))
{
pIWebBrowser->Stop();
pIWebBrowser->Release();
webBrowser->Stop();
}
}
void CBrowseDlg::OnReload()
{
CComPtr<IWebBrowser> webBrowser;
if (SUCCEEDED(GetWebBrowser(&webBrowser)))
{
CComVariant vValue(REFRESH_COMPLETELY);
webBrowser->Refresh2(&vValue);
}
}
void CBrowseDlg::OnBackward()
{
IWebBrowser *pIWebBrowser = NULL;
if (SUCCEEDED(GetWebBrowser(&pIWebBrowser)))
CComPtr<IWebBrowser> webBrowser;
if (SUCCEEDED(GetWebBrowser(&webBrowser)))
{
pIWebBrowser->GoBack();
pIWebBrowser->Release();
webBrowser->GoBack();
}
}
void CBrowseDlg::OnForward()
{
IWebBrowser *pIWebBrowser = NULL;
if (SUCCEEDED(GetWebBrowser(&pIWebBrowser)))
CComPtr<IWebBrowser> webBrowser;
if (SUCCEEDED(GetWebBrowser(&webBrowser)))
{
pIWebBrowser->GoForward();
pIWebBrowser->Release();
webBrowser->GoForward();
}
}
@ -782,18 +795,6 @@ void CBrowseDlg::ExecOleCommand(const GUID *pguidGroup, DWORD nCmdId)
}
void CBrowseDlg::OnEditMode()
{
DWORD nCmdID = (m_btnEditMode.GetCheck()) ? IDM_EDITMODE : IDM_BROWSEMODE;
ExecOleCommand(&CGID_MSHTML, nCmdID);
// if (m_pControlSite)
// {
// m_pControlSite->SetAmbientUserMode((m_btnEditMode.GetCheck() == 0) ? FALSE : TRUE);
// }
}
void CBrowseDlg::OnEditBold()
{
ExecOleCommand(&CGID_MSHTML, IDM_BOLD);
@ -816,13 +817,7 @@ void CBrowseDlg::OnFileExit()
void CBrowseDlg::OnViewRefresh()
{
IWebBrowser *pIWebBrowser = NULL;
if (SUCCEEDED(GetWebBrowser(&pIWebBrowser)))
{
CComVariant vValue(REFRESH_COMPLETELY);
pIWebBrowser->Refresh2(&vValue);
pIWebBrowser->Release();
}
OnReload();
}
void CBrowseDlg::OnViewGotoBack()
@ -837,21 +832,20 @@ void CBrowseDlg::OnViewGotoForward()
void CBrowseDlg::OnUpdateViewGotoBack(CCmdUI* pCmdUI)
{
// TODO: Add your command update UI handler code here
pCmdUI->Enable(m_bCanGoBack);
}
void CBrowseDlg::OnUpdateViewGotoForward(CCmdUI* pCmdUI)
{
// TODO: Add your command update UI handler code here
pCmdUI->Enable(m_bCanGoForward);
}
void CBrowseDlg::OnViewGotoHome()
{
IWebBrowser *pIWebBrowser = NULL;
if (SUCCEEDED(GetWebBrowser(&pIWebBrowser)))
CComPtr<IWebBrowser> webBrowser;
if (SUCCEEDED(GetWebBrowser(&webBrowser)))
{
pIWebBrowser->GoHome();
pIWebBrowser->Release();
webBrowser->GoHome();
}
}
@ -898,25 +892,23 @@ void CBrowseDlg::OnFilePrint()
void CBrowseDlg::OnDebugVisible()
{
VARIANT_BOOL visible = VARIANT_TRUE;
IWebBrowser *pIWebBrowser = NULL;
if (SUCCEEDED(GetWebBrowser(&pIWebBrowser)))
CComPtr<IWebBrowser> webBrowser;
if (SUCCEEDED(GetWebBrowser(&webBrowser)))
{
CIPtr(IWebBrowserApp) cpWebBrowser = pIWebBrowser;
CIPtr(IWebBrowserApp) cpWebBrowser = webBrowser;
cpWebBrowser->get_Visible(&visible);
cpWebBrowser->put_Visible(visible == VARIANT_TRUE ? VARIANT_FALSE : VARIANT_TRUE);
pIWebBrowser->Release();
}
}
void CBrowseDlg::OnUpdateDebugVisible(CCmdUI* pCmdUI)
{
VARIANT_BOOL visible = VARIANT_TRUE;
IWebBrowser *pIWebBrowser = NULL;
if (SUCCEEDED(GetWebBrowser(&pIWebBrowser)))
CComPtr<IWebBrowser> webBrowser;
if (SUCCEEDED(GetWebBrowser(&webBrowser)))
{
CIPtr(IWebBrowserApp) cpWebBrowser = pIWebBrowser;
CIPtr(IWebBrowserApp) cpWebBrowser = webBrowser;
cpWebBrowser->get_Visible(&visible);
pIWebBrowser->Release();
}
pCmdUI->SetCheck(visible == VARIANT_TRUE ? 1 : 0);
@ -924,10 +916,10 @@ void CBrowseDlg::OnUpdateDebugVisible(CCmdUI* pCmdUI)
void CBrowseDlg::OnDebugPostDataTest()
{
IWebBrowser *pIWebBrowser = NULL;
if (SUCCEEDED(GetWebBrowser(&pIWebBrowser)))
CComPtr<IWebBrowser> webBrowser;
if (SUCCEEDED(GetWebBrowser(&webBrowser)))
{
CIPtr(IWebBrowser2) cpWebBrowser = pIWebBrowser;
CIPtr(IWebBrowser2) cpWebBrowser = webBrowser;
CComVariant vURL(L"http://www.mozilla.org/htdig-cgi/htsearch");
const char *szPostData="config=htdig&restrict=&exclude=&words=embedding&method=and&format=builtin-long";
@ -953,7 +945,32 @@ void CBrowseDlg::OnDebugPostDataTest()
&vPostData,
&vHeaders // Headers
);
pIWebBrowser->Release();
}
}
void CBrowseDlg::OnViewEditmode()
{
m_bEditMode = m_bEditMode ? FALSE : TRUE;
DWORD nCmdID = m_bEditMode ? IDM_EDITMODE : IDM_BROWSEMODE;
ExecOleCommand(&CGID_MSHTML, nCmdID);
// if (m_pControlSite)
// {
// m_pControlSite->SetAmbientUserMode((m_btnEditMode.GetCheck() == 0) ? FALSE : TRUE);
// }
}
void CBrowseDlg::OnViewOpenInNewWindow()
{
m_bNewWindow = m_bNewWindow ? FALSE : TRUE;
}
void CBrowseDlg::OnUpdateViewEditmode(CCmdUI* pCmdUI)
{
pCmdUI->SetCheck(m_bEditMode ? 1 : 0);
}
void CBrowseDlg::OnUpdateViewOpenInNewWindow(CCmdUI* pCmdUI)
{
pCmdUI->SetCheck(1); //m_bNewWindow ? 1 : 0);
}

16
embedding/browser/activex/tests/cbrowse/CBrowseDlg.h
Просмотреть файл

@ -24,7 +24,10 @@ public:
BOOL m_bUseCustomPopupMenu;
BOOL m_bUseCustomDropTarget;
CMenu m_menu;
BOOL m_bNewWindow;
BOOL m_bEditMode;
BOOL m_bCanGoBack;
BOOL m_bCanGoForward;
CBrowseDlg(CWnd* pParent = NULL); // standard constructor
static CBrowseDlg *m_pBrowseDlg;
@ -44,9 +47,10 @@ public:
// Dialog Data
//{{AFX_DATA(CBrowseDlg)
enum { IDD = IDD_CBROWSE_DIALOG };
CButton m_btnEditMode;
CButton m_btnStop;
CButton m_btnForward;
CButton m_btnBack;
CComboBox m_cmbURLs;
BOOL m_bNewWindow;
//}}AFX_DATA
CToolBar m_EditBar;
@ -84,7 +88,6 @@ protected:
afx_msg void OnClose();
afx_msg void OnDestroy();
afx_msg void OnSize(UINT nType, int cx, int cy);
afx_msg void OnEditMode();
afx_msg void OnFileExit();
afx_msg void OnViewGotoBack();
afx_msg void OnViewGotoForward();
@ -104,6 +107,11 @@ protected:
afx_msg void OnDebugVisible();
afx_msg void OnUpdateDebugVisible(CCmdUI* pCmdUI);
afx_msg void OnDebugPostDataTest();
afx_msg void OnReload();
afx_msg void OnViewEditmode();
afx_msg void OnViewOpenInNewWindow();
afx_msg void OnUpdateViewEditmode(CCmdUI* pCmdUI);
afx_msg void OnUpdateViewOpenInNewWindow(CCmdUI* pCmdUI);
//}}AFX_MSG
afx_msg void OnEditBold();
afx_msg void OnEditItalic();

34
embedding/browser/activex/tests/cbrowse/ControlEventSink.cpp
Просмотреть файл

@ -1,18 +1,18 @@
// ControlEventSink.cpp : Implementation of CControlEventSink
// ControlEventSink.cpp : Implementation of CBrowseEventSink
#include "stdafx.h"
#include "Cbrowse.h"
#include "ControlEventSink.h"
/////////////////////////////////////////////////////////////////////////////
// CControlEventSink
// CBrowseEventSink
HRESULT STDMETHODCALLTYPE CControlEventSink::GetTypeInfoCount(
HRESULT STDMETHODCALLTYPE CBrowseEventSink::GetTypeInfoCount(
/* [out] */ UINT __RPC_FAR *pctinfo)
{
return E_NOTIMPL;
}
HRESULT STDMETHODCALLTYPE CControlEventSink::GetTypeInfo(
HRESULT STDMETHODCALLTYPE CBrowseEventSink::GetTypeInfo(
/* [in] */ UINT iTInfo,
/* [in] */ LCID lcid,
/* [out] */ ITypeInfo __RPC_FAR *__RPC_FAR *ppTInfo)
@ -20,7 +20,7 @@ HRESULT STDMETHODCALLTYPE CControlEventSink::GetTypeInfo(
return E_NOTIMPL;
}
HRESULT STDMETHODCALLTYPE CControlEventSink::GetIDsOfNames(
HRESULT STDMETHODCALLTYPE CBrowseEventSink::GetIDsOfNames(
/* [in] */ REFIID riid,
/* [size_is][in] */ LPOLESTR __RPC_FAR *rgszNames,
/* [in] */ UINT cNames,
@ -30,7 +30,7 @@ HRESULT STDMETHODCALLTYPE CControlEventSink::GetIDsOfNames(
return E_NOTIMPL;
}
HRESULT STDMETHODCALLTYPE CControlEventSink:: Invoke(
HRESULT STDMETHODCALLTYPE CBrowseEventSink:: Invoke(
/* [in] */ DISPID dispIdMember,
/* [in] */ REFIID riid,
/* [in] */ LCID lcid,
@ -64,13 +64,29 @@ HRESULT STDMETHODCALLTYPE CControlEventSink:: Invoke(
}
break;
case 0x69:
szEvent = _T("CommandStateChange");
{
BOOL enable = pDispParams->rgvarg[0].boolVal == VARIANT_TRUE ? TRUE : FALSE;
LONG commandState = pDispParams->rgvarg[1].lVal;
if (commandState == CSC_NAVIGATEBACK)
{
m_pBrowseDlg->m_bCanGoBack = enable;
m_pBrowseDlg->m_btnBack.EnableWindow(enable);
}
else if (commandState == CSC_NAVIGATEFORWARD)
{
m_pBrowseDlg->m_bCanGoForward = enable;
m_pBrowseDlg->m_btnForward.EnableWindow(enable);
}
szEvent.Format(_T("CommandStateChange(%ld, %d)"), commandState, enable);
}
break;
case 0x6a:
szEvent = _T("DownloadBegin");
m_pBrowseDlg->m_btnStop.EnableWindow(TRUE);
break;
case 0x68:
szEvent = _T("DownloadComplete");
m_pBrowseDlg->m_btnStop.EnableWindow(FALSE);
break;
case 0x71:
{
@ -86,9 +102,7 @@ HRESULT STDMETHODCALLTYPE CControlEventSink:: Invoke(
szEvent = _T("PropertyChange");
break;
case 0xfa:
{
szEvent = _T("BeforeNavigate2");
}
szEvent = _T("BeforeNavigate2");
break;
case 0xfb:
{

14
embedding/browser/activex/tests/cbrowse/ControlEventSink.h
Просмотреть файл

@ -1,4 +1,4 @@
// ControlEventSink.h : Declaration of the CControlEventSink
// ControlEventSink.h : Declaration of the CBrowseEventSink
#ifndef __CONTROLEVENTSINK_H_
#define __CONTROLEVENTSINK_H_
@ -7,14 +7,14 @@
#include "resource.h" // main symbols
/////////////////////////////////////////////////////////////////////////////
// CControlEventSink
class ATL_NO_VTABLE CControlEventSink :
// CBrowseEventSink
class ATL_NO_VTABLE CBrowseEventSink :
public CComObjectRootEx<CComSingleThreadModel>,
public CComCoClass<CControlEventSink, &CLSID_ControlEventSink>,
public CComCoClass<CBrowseEventSink, &CLSID_ControlEventSink>,
public IDispatch
{
public:
CControlEventSink()
CBrowseEventSink()
{
m_pBrowseDlg = NULL;
}
@ -25,7 +25,7 @@ DECLARE_REGISTRY_RESOURCEID(IDR_CONTROLEVENTSINK)
DECLARE_PROTECT_FINAL_CONSTRUCT()
BEGIN_COM_MAP(CControlEventSink)
BEGIN_COM_MAP(CBrowseEventSink)
COM_INTERFACE_ENTRY(IDispatch)
COM_INTERFACE_ENTRY_IID(DIID_DWebBrowserEvents2, IDispatch)
END_COM_MAP()
@ -55,6 +55,6 @@ public:
/* [out] */ UINT __RPC_FAR *puArgErr);
};
typedef CComObject<CControlEventSink> CControlEventSinkInstance;
typedef CComObject<CBrowseEventSink> CBrowseEventSinkInstance;
#endif //__CONTROLEVENTSINK_H_

11
embedding/browser/activex/tests/cbrowse/StdAfx.h
Просмотреть файл

@ -52,12 +52,13 @@ extern CBrowseModule _Module;
#include "..\..\src\control\ActiveXTypes.h"
#include "..\..\src\control\BrowserDiagnostics.h"
#include "..\..\src\control\PropertyList.h"
#include "..\..\src\control\PropertyBag.h"
#include "..\..\src\control\ControlSiteIPFrame.h"
#include "..\..\src\control\ControlSite.h"
#include "..\..\src\control\ActiveScriptSite.h"
#include "..\..\src\common\PropertyList.h"
#include "..\..\src\common\PropertyBag.h"
#include "..\..\src\common\ControlSiteIPFrame.h"
#include "..\..\src\common\ControlSite.h"
#include "CBrowserCtlSite.h"
#include "Tests.h"
@ -67,6 +68,8 @@ extern CBrowseModule _Module;
#define KEY_TESTURL_DEFAULTVALUE _T("http://www.mozilla.org")
#define KEY_TESTCGI_DEFAULTVALUE _T("http://www.mozilla.org")
#define NS_ASSERTION(x,y)
#define TRACE_METHOD(x)
//{{AFX_INSERT_LOCATION}}

14
embedding/browser/activex/tests/cbrowse/cbrowse.dsp
Просмотреть файл

@ -120,11 +120,11 @@ SOURCE=.\ControlEventSink.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\control\ControlSite.cpp
SOURCE=..\..\src\common\ControlSite.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\control\ControlSiteIPFrame.cpp
SOURCE=..\..\src\common\ControlSiteIPFrame.cpp
# End Source File
# Begin Source File
@ -140,7 +140,7 @@ SOURCE=.\PickerDlg.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\control\PropertyBag.cpp
SOURCE=..\..\src\common\PropertyBag.cpp
# End Source File
# Begin Source File
@ -197,11 +197,11 @@ SOURCE=.\ControlEventSink.h
# End Source File
# Begin Source File
SOURCE=..\..\ControlSite.h
SOURCE=..\..\src\common\ControlSite.h
# End Source File
# Begin Source File
SOURCE=..\..\ControlSiteIPFrame.h
SOURCE=..\..\src\common\ControlSiteIPFrame.h
# End Source File
# Begin Source File
@ -213,6 +213,10 @@ SOURCE=.\PickerDlg.h
# End Source File
# Begin Source File
SOURCE=..\..\src\common\PropertyBag.h
# End Source File
# Begin Source File
SOURCE=.\Resource.h
# End Source File
# Begin Source File

39
embedding/browser/activex/tests/cbrowse/cbrowse.rc
Просмотреть файл

@ -97,28 +97,25 @@ END
// Dialog
//
IDD_CBROWSE_DIALOG DIALOGEX 0, 0, 293, 320
IDD_CBROWSE_DIALOG DIALOGEX 0, 0, 558, 349
STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU | WS_THICKFRAME
EXSTYLE WS_EX_APPWINDOW
CAPTION "CBrowse"
FONT 8, "MS Sans Serif", 0, 0, 0x1
FONT 8, "MS Sans Serif"
BEGIN
RTEXT "&URL:",IDC_STATIC,7,13,18,8
COMBOBOX IDC_URL,27,11,125,52,CBS_DROPDOWN | CBS_AUTOHSCROLL |
PUSHBUTTON "<",IDC_BACKWARD,7,7,10,13
PUSHBUTTON ">",IDC_FORWARD,20,7,10,13
PUSHBUTTON "Reload",IDC_RELOAD,33,7,30,13
PUSHBUTTON "&Stop",IDC_STOP,66,7,25,13
DEFPUSHBUTTON "&Go",IDC_GO,526,7,25,13
RTEXT "&URL:",IDC_STATIC,94,9,18,8
COMBOBOX IDC_URL,116,7,405,52,CBS_DROPDOWN | CBS_AUTOHSCROLL |
WS_VSCROLL | WS_TABSTOP
DEFPUSHBUTTON "&Go",IDC_GO,154,11,25,13
PUSHBUTTON "&Stop",IDC_STOP,181,11,25,13
PUSHBUTTON "<",IDC_BACKWARD,208,11,10,13
PUSHBUTTON ">",IDC_FORWARD,220,11,10,13
CONTROL "&New window",IDC_NEWWINDOW,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,233,7,53,10
CONTROL "&Edit mode",IDC_EDITMODE,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,233,17,47,10
CONTROL "",IDC_TAB_MARKER,"Static",SS_BLACKFRAME,7,223,279,89
CONTROL "",IDC_BROWSER_MARKER,"Static",SS_BLACKFRAME,7,48,279,
168
CONTROL "",IDC_EDITBAR_MARKER,"Static",SS_BLACKFRAME,7,28,279,19
CONTROL "",IDC_TAB_MARKER,"Static",SS_BLACKFRAME,7,252,544,89
CONTROL "",IDC_BROWSER_MARKER,"Static",SS_BLACKFRAME,7,44,544,
202
CONTROL "",IDC_EDITBAR_MARKER,"Static",SS_BLACKFRAME,7,23,544,19
END
@ -176,10 +173,10 @@ BEGIN
IDD_CBROWSE_DIALOG, DIALOG
BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 286
RIGHTMARGIN, 551
TOPMARGIN, 7
BOTTOMMARGIN, 312
HORZGUIDE, 216
BOTTOMMARGIN, 341
HORZGUIDE, 246
END
END
#endif // APSTUDIO_INVOKED
@ -230,6 +227,10 @@ BEGIN
MENUITEM "&Refresh", ID_VIEW_REFRESH
MENUITEM SEPARATOR
MENUITEM "Sour&ce", ID_VIEW_VIEWSOURCE
MENUITEM SEPARATOR
MENUITEM "Edit Mode", ID_VIEW_EDITMODE
MENUITEM "Open Links in New Windows", ID_VIEW_OPENLINKSINNEWWINDOWS
END
POPUP "&Help"
BEGIN

7
embedding/browser/activex/tests/cbrowse/resource.h
Просмотреть файл

@ -47,6 +47,7 @@
#define IDC_EDITBAR_MARKER 1025
#define IDC_OVERRIDE 1026
#define IDC_BUTTON1 1027
#define IDC_RELOAD 1028
#define IDB_BOLD 32771
#define IDB_ITALIC 32772
#define IDB_UNDERLINE 32773
@ -67,14 +68,16 @@
#define ID_FILE_SAVEAS 32793
#define ID_DEBUG_VISIBLE 32794
#define ID_DEBUG_POSTDATATEST 32795
#define ID_VIEW_EDITMODE 32796
#define ID_VIEW_OPENLINKSINNEWWINDOWS 32797
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 142
#define _APS_NEXT_COMMAND_VALUE 32796
#define _APS_NEXT_CONTROL_VALUE 1028
#define _APS_NEXT_COMMAND_VALUE 32798
#define _APS_NEXT_CONTROL_VALUE 1029
#define _APS_NEXT_SYMED_VALUE 107
#endif
#endif