Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-28 19:38:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed syntax error which caused invalidation not to work when logging

Browse Source 
was turned off.
Bug# 16169 r=Dale.Stansberry@Nexwarecorp.com
This commit is contained in:
Jerry.Kirk%Nexwarecorp.com 1999-10-12 14:39:32 +00:00
parent d3ba96aeaf
commit 15558d7fa9
1 changed files with 40 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
widget/src/photon/nsWidget.cpp
View File

@ -289,7 +289,9 @@ the PtRealizeWidget functions */
EnableDamage( mWidget, PR_FALSE ); EnableDamage( mWidget, PR_FALSE );
err=PtRealizeWidget(mWidget); err=PtRealizeWidget(mWidget);
if (err == -1) if (err == -1)
{
PR_LOG(PhWidLog, PR_LOG_DEBUG, ("nsWidget::Show Failed to Realize this=<%p>\n", this)); PR_LOG(PhWidLog, PR_LOG_DEBUG, ("nsWidget::Show Failed to Realize this=<%p>\n", this));
}
EnableDamage( mWidget, PR_TRUE ); EnableDamage( mWidget, PR_TRUE );
@ -305,8 +307,9 @@ the PtRealizeWidget functions */
QueueWidgetDamage(); QueueWidgetDamage();
} }
else else
{
PR_LOG(PhWidLog, PR_LOG_DEBUG, ("nsWidget::Show mUpdateArea is empty this=<%p>\n", this)); PR_LOG(PhWidLog, PR_LOG_DEBUG, ("nsWidget::Show mUpdateArea is empty this=<%p>\n", this));
}
} }
else else
{ {
@ -414,7 +417,9 @@ NS_METHOD nsWidget::Move(PRInt32 aX, PRInt32 aY)
EnableDamage( mWidget, PR_TRUE ); EnableDamage( mWidget, PR_TRUE );
} }
else else
{
PR_LOG(PhWidLog, PR_LOG_DEBUG, ("nsWidget::Move - mWidget is NULL!\n" )); PR_LOG(PhWidLog, PR_LOG_DEBUG, ("nsWidget::Move - mWidget is NULL!\n" ));
}
return NS_OK; return NS_OK;
} }
@ -451,7 +456,9 @@ NS_METHOD nsWidget::Resize(PRInt32 aWidth, PRInt32 aHeight, PRBool aRepaint)
Invalidate( aRepaint ); Invalidate( aRepaint );
} }
else else
{
PR_LOG(PhWidLog, PR_LOG_DEBUG, ("nsWidget::Resize - mWidget is NULL!\n" )); PR_LOG(PhWidLog, PR_LOG_DEBUG, ("nsWidget::Resize - mWidget is NULL!\n" ));
}
} }
return NS_OK; return NS_OK;
@ -557,7 +564,9 @@ NS_METHOD nsWidget::Enable(PRBool bState)
PtSetResources( mWidget, 1, &arg ); PtSetResources( mWidget, 1, &arg );
} }
else else
{
PR_LOG(PhWidLog, PR_LOG_DEBUG, ("nsWidget::Enable - mWidget is NULL!\n" )); PR_LOG(PhWidLog, PR_LOG_DEBUG, ("nsWidget::Enable - mWidget is NULL!\n" ));
}
return NS_OK; return NS_OK;
} }
@ -571,9 +580,14 @@ NS_METHOD nsWidget::Enable(PRBool bState)
NS_METHOD nsWidget::SetFocus(void) NS_METHOD nsWidget::SetFocus(void)
{ {
if (mWidget) if (mWidget)
PtContainerGiveFocus( mWidget, NULL ); {
if (!PtIsFocused(mWidget))
PtContainerGiveFocus( mWidget, NULL );
}
else else
{
PR_LOG(PhWidLog, PR_LOG_DEBUG, ("nsWidget::SetFocus - mWidget is NULL!\n" )); PR_LOG(PhWidLog, PR_LOG_DEBUG, ("nsWidget::SetFocus - mWidget is NULL!\n" ));
}
return NS_OK; return NS_OK;
} }
@ -609,6 +623,7 @@ NS_METHOD nsWidget::SetFont(const nsFont &aFont)
PR_LOG(PhWidLog, PR_LOG_DEBUG, ("nsWidget::SetFont aFont.name=<%s>\n",str)); PR_LOG(PhWidLog, PR_LOG_DEBUG, ("nsWidget::SetFont aFont.name=<%s>\n",str));
delete [] str; delete [] str;
} }
PR_LOG(PhWidLog, PR_LOG_DEBUG, ("nsWidget::SetFont aFont.size=<%d>\n",aFont.size)); PR_LOG(PhWidLog, PR_LOG_DEBUG, ("nsWidget::SetFont aFont.size=<%d>\n",aFont.size));
} }
@ -712,7 +727,9 @@ NS_METHOD nsWidget::SetCursor(nsCursor aCursor)
PtSetResources( mWidget, 1, &arg ); PtSetResources( mWidget, 1, &arg );
} }
else else
{
PR_LOG(PhWidLog, PR_LOG_DEBUG, ("nsWidget::SetCursor - mWidget is NULL!\n" )); PR_LOG(PhWidLog, PR_LOG_DEBUG, ("nsWidget::SetCursor - mWidget is NULL!\n" ));
}
mCursor = aCursor; mCursor = aCursor;
@ -759,8 +776,9 @@ NS_METHOD nsWidget::Invalidate(PRBool aIsSynchronous)
} }
} }
else else
{
PR_LOG(PhWidLog, PR_LOG_DEBUG, ("nsWidget::Invalidate 1 Not Relealized skipping Damage Queue\n")); PR_LOG(PhWidLog, PR_LOG_DEBUG, ("nsWidget::Invalidate 1 Not Relealized skipping Damage Queue\n"));
}
} }
return NS_OK; return NS_OK;
@ -987,14 +1005,19 @@ void *nsWidget::GetNativeData(PRUint32 aDataType)
case NS_NATIVE_WIDGET: case NS_NATIVE_WIDGET:
case NS_NATIVE_PLUGIN_PORT: case NS_NATIVE_PLUGIN_PORT:
if( !mWidget ) if( !mWidget )
{
PR_LOG(PhWidLog, PR_LOG_DEBUG, ("nsWidget::GetNativeData(mWidget) - mWidget is NULL!\n" )); PR_LOG(PhWidLog, PR_LOG_DEBUG, ("nsWidget::GetNativeData(mWidget) - mWidget is NULL!\n" ));
}
return (void *)mWidget; return (void *)mWidget;
case NS_NATIVE_DISPLAY: case NS_NATIVE_DISPLAY:
PR_LOG(PhWidLog, PR_LOG_DEBUG, ("nsWidget::GetNativeData(NS_NATIVE_DISPLAY) - Not Implemented.\n" )); PR_LOG(PhWidLog, PR_LOG_DEBUG, ("nsWidget::GetNativeData(NS_NATIVE_DISPLAY) - Not Implemented.\n" ));
return nsnull; return nsnull;
case NS_NATIVE_GRAPHIC: case NS_NATIVE_GRAPHIC:
PR_LOG(PhWidLog, PR_LOG_DEBUG, ("nsWidget::GetNativeData(NS_NATIVE_GRAPHIC) - Not Implemented.\n" )); PR_LOG(PhWidLog, PR_LOG_DEBUG, ("nsWidget::GetNativeData(NS_NATIVE_GRAPHIC) - Not Implemented.\n" ));
return nsnull; return nsnull;
default: default:
PR_LOG(PhWidLog, PR_LOG_DEBUG, ("nsWidget::GetNativeData() - ERROR Bad ID.\n" )); PR_LOG(PhWidLog, PR_LOG_DEBUG, ("nsWidget::GetNativeData() - ERROR Bad ID.\n" ));
break; break;
@ -1075,12 +1098,19 @@ nsresult nsWidget::CreateWidget(nsIWidget *aParent,
nsNativeWidget aNativeParent) nsNativeWidget aNativeParent)
{ {
PR_LOG(PhWidLog, PR_LOG_DEBUG, ("nsWidget::CreateWidget this=<%p> mRefCnt=<%d>\n", this, mRefCnt)); PR_LOG(PhWidLog, PR_LOG_DEBUG, ("nsWidget::CreateWidget this=<%p> mRefCnt=<%d>\n", this, mRefCnt));
if (aParent) if (aParent)
{
PR_LOG(PhWidLog, PR_LOG_DEBUG, ("nsWidget::CreateWidget (%p) nsIWidget parent\n", this)); PR_LOG(PhWidLog, PR_LOG_DEBUG, ("nsWidget::CreateWidget (%p) nsIWidget parent\n", this));
}
else if (aNativeParent) else if (aNativeParent)
{
PR_LOG(PhWidLog, PR_LOG_DEBUG, ("nsWidget::CreateWidget (%p) native parent\n",this)); PR_LOG(PhWidLog, PR_LOG_DEBUG, ("nsWidget::CreateWidget (%p) native parent\n",this));
}
else if(aAppShell) else if(aAppShell)
{
PR_LOG(PhWidLog, PR_LOG_DEBUG,("nsWidget::CreateWidget (%p) nsAppShell parent\n",this)); PR_LOG(PhWidLog, PR_LOG_DEBUG,("nsWidget::CreateWidget (%p) nsAppShell parent\n",this));
}
PtWidget_t *parentWidget = nsnull; PtWidget_t *parentWidget = nsnull;
@ -2229,8 +2259,8 @@ int nsWidget::WorkProc( void *data )
extent.lr.x = extent.ul.x + temp_rect.width - 1; extent.lr.x = extent.ul.x + temp_rect.width - 1;
extent.lr.y = extent.ul.y + temp_rect.height - 1; extent.lr.y = extent.ul.y + temp_rect.height - 1;
PR_LOG(PhWidLog, PR_LOG_DEBUG, ("nsWidget::WorkProc damaging widget=<%p> %d rect=<%d,%d,%d,%d> next=<%p>\n", dqe->widget, i, extent.ul.x, extent.ul.y, extent.lr.x, extent.lr.y, dqe->next); PR_LOG(PhWidLog, PR_LOG_DEBUG, ("nsWidget::WorkProc damaging widget=<%p> %d rect=<%d,%d,%d,%d> next=<%p>\n", dqe->widget, i, extent.ul.x, extent.ul.y, extent.lr.x, extent.lr.y, dqe->next));
PtDamageExtent( dqe->widget, &extent)); PtDamageExtent( dqe->widget, &extent);
} }
dqe->inst->mUpdateArea->FreeRects(regionRectSet); dqe->inst->mUpdateArea->FreeRects(regionRectSet);