Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor cleanup.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@54264 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
warren%netscape.com 1999-11-23 07:05:53 +00:00
parent f966e3dacd
commit 7cc3cd1861
2 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mozilla/content/events/src/nsEventStateManager.cpp
View File

@ -51,7 +51,6 @@
#undef DEBUG_scroll // define to see ugly mousewheel messages
static NS_DEFINE_IID(kIEventStateManagerIID, NS_IEVENTSTATEMANAGER_IID);
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
static NS_DEFINE_IID(kIDOMHTMLAnchorElementIID, NS_IDOMHTMLANCHORELEMENT_IID);
static NS_DEFINE_IID(kIDOMHTMLInputElementIID, NS_IDOMHTMLINPUTELEMENT_IID);
@ -114,9 +113,7 @@ nsEventStateManager::~nsEventStateManager()
NS_IF_RELEASE(mLastWindowToHaveFocus);
}
NS_IMPL_ADDREF(nsEventStateManager)
NS_IMPL_RELEASE(nsEventStateManager)
NS_IMPL_QUERY_INTERFACE(nsEventStateManager, kIEventStateManagerIID);
NS_IMPL_ISUPPORTS1(nsEventStateManager, nsIEventStateManager)
// This must be the same across instances
static nsCOMPtr<nsIContent> mLastFocusedContent;
@ -1418,12 +1415,12 @@ nsEventStateManager::ChangeFocus(nsIContent* aFocusContent, nsIFrame* aFocusFram
if(!surpressBlurAndFocus) {
if (aSetFocus) {
mLastFocusedContent = nsnull;
mLastFocusedContent = nsnull;
focusChange->SetFocus(mPresContext);
mLastFocusedContent = aFocusContent;
mLastFocusedContent = aFocusContent;
} else {
} else {
focusChange->RemoveFocus(mPresContext);
}
}
@ -2064,6 +2061,6 @@ nsresult NS_NewEventStateManager(nsIEventStateManager** aInstancePtrResult)
if (nsnull == manager) {
return NS_ERROR_OUT_OF_MEMORY;
}
return manager->QueryInterface(kIEventStateManagerIID, (void **) aInstancePtrResult);
return manager->QueryInterface(NS_GET_IID(nsIEventStateManager), (void **) aInstancePtrResult);
}

13
mozilla/layout/events/src/nsEventStateManager.cpp
View File

@ -51,7 +51,6 @@
#undef DEBUG_scroll // define to see ugly mousewheel messages
static NS_DEFINE_IID(kIEventStateManagerIID, NS_IEVENTSTATEMANAGER_IID);
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
static NS_DEFINE_IID(kIDOMHTMLAnchorElementIID, NS_IDOMHTMLANCHORELEMENT_IID);
static NS_DEFINE_IID(kIDOMHTMLInputElementIID, NS_IDOMHTMLINPUTELEMENT_IID);
@ -114,9 +113,7 @@ nsEventStateManager::~nsEventStateManager()
NS_IF_RELEASE(mLastWindowToHaveFocus);
}
NS_IMPL_ADDREF(nsEventStateManager)
NS_IMPL_RELEASE(nsEventStateManager)
NS_IMPL_QUERY_INTERFACE(nsEventStateManager, kIEventStateManagerIID);
NS_IMPL_ISUPPORTS1(nsEventStateManager, nsIEventStateManager)
// This must be the same across instances
static nsCOMPtr<nsIContent> mLastFocusedContent;
@ -1418,12 +1415,12 @@ nsEventStateManager::ChangeFocus(nsIContent* aFocusContent, nsIFrame* aFocusFram
if(!surpressBlurAndFocus) {
if (aSetFocus) {
mLastFocusedContent = nsnull;
mLastFocusedContent = nsnull;
focusChange->SetFocus(mPresContext);
mLastFocusedContent = aFocusContent;
mLastFocusedContent = aFocusContent;
} else {
} else {
focusChange->RemoveFocus(mPresContext);
}
}
@ -2064,6 +2061,6 @@ nsresult NS_NewEventStateManager(nsIEventStateManager** aInstancePtrResult)
if (nsnull == manager) {
return NS_ERROR_OUT_OF_MEMORY;
}
return manager->QueryInterface(kIEventStateManagerIID, (void **) aInstancePtrResult);
return manager->QueryInterface(NS_GET_IID(nsIEventStateManager), (void **) aInstancePtrResult);
}