Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-06 00:10:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed some interface changes that broke the build

Browse Source
This commit is contained in:
locka%iol.ie 1999-08-03 23:03:16 +00:00
parent 1495e59f02
commit da0cb229c8
3 changed files with 43 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
webshell/embed/ActiveX/MozillaBrowser.cpp
View File

@ -38,15 +38,11 @@ static const TCHAR *c_szUninitialized = _T("Method called while control is unini
RETURN_ERROR(c_szUninitialized, E_UNEXPECTED);
extern "C" void NS_SetupRegistry();
static const std::string c_szPrefsFile = "prefs50.js";
static const std::string c_szPrefsHomePage = "browser.startup.homepage";
static const std::string c_szDefaultPage = "resource:/res/MozillaControl.html";
BOOL CMozillaBrowser::m_bRegistryInitialized = FALSE;
class CMozDir
{
TCHAR m_szOldDir[1024];
@ -73,6 +69,8 @@ public:
}
};
BOOL CMozillaBrowser::m_bRegistryInitialized = FALSE;
/////////////////////////////////////////////////////////////////////////////
// CMozillaBrowser
@ -2098,6 +2096,14 @@ HRESULT STDMETHODCALLTYPE CMozillaBrowser::get_RegisterAsDropTarget(VARIANT_BOOL
}
static BOOL CALLBACK EnumChildProc(HWND hwnd, LPARAM lParam)
{
::RevokeDragDrop(hwnd);
return TRUE;
}
HRESULT STDMETHODCALLTYPE CMozillaBrowser::put_RegisterAsDropTarget(VARIANT_BOOL bRegister)
{
NG_TRACE_METHOD(CMozillaBrowser::put_RegisterAsDropTarget);
@ -2137,6 +2143,11 @@ HRESULT STDMETHODCALLTYPE CMozillaBrowser::put_RegisterAsDropTarget(VARIANT_BOOL
pDropTarget->Release();
}
// Now revoke any child window drop targets and pray they aren't
// reset by the layout engine.
::EnumChildWindows(m_hWnd, EnumChildProc, (LPARAM) this);
}
}
else

24
webshell/embed/ActiveX/WebShellContainer.cpp
View File

@ -112,14 +112,25 @@ CWebShellContainer::MoveTo(PRInt32 aX, PRInt32 aY)
NS_IMETHODIMP
CWebShellContainer::SizeWindowTo(PRInt32 aWidth, PRInt32 aHeight)
CWebShellContainer::SizeTo(PRInt32 aWidth, PRInt32 aHeight)
{
NG_TRACE_METHOD(CWebShellContainer::SizeTo);
return NS_OK;
}
NS_IMETHODIMP
CWebShellContainer::SizeWindowTo(PRInt32 aWidth, PRInt32 aHeight)
{
NG_TRACE_METHOD(CWebShellContainer::SizeWindowTo);
return NS_OK;
}
NS_IMETHODIMP
CWebShellContainer::SizeContentTo(PRInt32 aWidth, PRInt32 aHeight)
{
NG_TRACE_METHOD(CWebShellContainer::SizeContentTo);
return NS_OK;
}
@ -132,6 +143,16 @@ CWebShellContainer::GetContentBounds(nsRect& aResult)
}
NS_IMETHODIMP
CWebShellContainer::GetBounds(nsRect& aResult)
{
NG_TRACE_METHOD(CWebShellContainer::GetBounds);
return NS_OK;
}
NS_IMETHODIMP
CWebShellContainer::GetWindowBounds(nsRect& aResult)
{
@ -143,6 +164,7 @@ CWebShellContainer::GetWindowBounds(nsRect& aResult)
NS_IMETHODIMP
CWebShellContainer::IsIntrinsicallySized(PRBool& aResult)
{
NG_TRACE_METHOD(CWebShellContainer::IsIntrinsicallySized);
aResult = PR_FALSE;
return NS_OK;
}

12
webshell/embed/ActiveX/WebShellContainer.h
View File

@ -48,16 +48,14 @@ public:
// nsIBrowserWindow
NS_IMETHOD Init(nsIAppShell* aAppShell, nsIPref* aPrefs, const nsRect& aBounds, PRUint32 aChromeMask, PRBool aAllowPlugins = PR_TRUE);
NS_IMETHOD MoveTo(PRInt32 aX, PRInt32 aY);
NS_IMETHOD SizeTo(PRInt32 aWidth, PRInt32 aHeight);
NS_IMETHOD GetContentBounds(nsRect& aResult);
NS_IMETHOD GetBounds(nsRect& aResult);
NS_IMETHOD GetWindowBounds(nsRect& aResult);
NS_IMETHOD IsIntrinsicallySized(PRBool& aResult);
NS_IMETHOD SizeWindowTo(PRInt32 aWidth, PRInt32 aHeight);
NS_IMETHOD SizeContentTo(PRInt32 aWidth, PRInt32 aHeight);
NS_IMETHOD GetContentBounds(nsRect& aResult);
NS_IMETHOD GetWindowBounds(nsRect& aResult);
NS_IMETHOD IsIntrinsicallySized(PRBool& aResult);
NS_IMETHOD ShowAfterCreation();
NS_IMETHOD Show();
NS_IMETHOD Hide();
NS_IMETHOD Close();