зеркало из https://github.com/mozilla/gecko-dev.git
basic implementation of new method nsIWidget::IsEnabled. b ug 126786 r=hyatt,rginda a=asa
This commit is contained in:
Родитель
d1a43965de
Коммит
2372d1f129
|
@ -162,7 +162,8 @@ public:
|
|||
NS_IMETHOD Resize(PRInt32 aWidth,PRInt32 aHeight, PRBool aRepaint);
|
||||
NS_IMETHOD Resize(PRInt32 aX, PRInt32 aY,PRInt32 aWidth,PRInt32 aHeight, PRBool aRepaint);
|
||||
|
||||
NS_IMETHOD Enable(PRBool bState);
|
||||
NS_IMETHOD Enable(PRBool aState);
|
||||
NS_IMETHOD IsEnabled(PRBool *aState);
|
||||
NS_IMETHOD SetFocus(PRBool aRaise);
|
||||
NS_IMETHOD SetBounds(const nsRect &aRect);
|
||||
NS_IMETHOD GetBounds(nsRect &aRect);
|
||||
|
|
|
@ -556,13 +556,20 @@ NS_IMETHODIMP nsChildView::ModalEventFilter(PRBool aRealEvent, void *aEvent,
|
|||
// Enable/disable this component
|
||||
//
|
||||
//-------------------------------------------------------------------------
|
||||
NS_IMETHODIMP nsChildView::Enable(PRBool bState)
|
||||
NS_IMETHODIMP nsChildView::Enable(PRBool aState)
|
||||
{
|
||||
// unimplemented.
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
||||
|
||||
NS_IMETHODIMP nsChildView::IsEnabled(PRBool *aState)
|
||||
{
|
||||
// unimplemented.
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
||||
static Boolean we_are_front_process()
|
||||
{
|
||||
ProcessSerialNumber thisPSN;
|
||||
|
|
|
@ -114,7 +114,8 @@ public:
|
|||
|
||||
NS_IMETHOD Show(PRBool aState);
|
||||
|
||||
NS_IMETHOD Enable(PRBool aState) { return NS_OK; }
|
||||
NS_IMETHOD Enable(PRBool aState);
|
||||
NS_IMETHOD IsEnabled(PRBool *aState);
|
||||
NS_IMETHOD SetModal(PRBool aState) { return NS_OK; }
|
||||
NS_IMETHOD IsVisible(PRBool & aState);
|
||||
NS_IMETHOD SetFocus(PRBool aState=PR_FALSE) { return NS_OK; }
|
||||
|
|
|
@ -913,6 +913,20 @@ NS_IMETHODIMP nsCocoaWindow::Show(PRBool bState)
|
|||
}
|
||||
|
||||
|
||||
NS_IMETHODIMP nsCocoaWindow::Enable(PRBool aState)
|
||||
{
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
||||
NS_IMETHODIMP nsCocoaWindow::IsEnabled(PRBool *aState)
|
||||
{
|
||||
if (aState)
|
||||
*aState = PR_TRUE;
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
NS_METHOD nsWindow::Minimize(void)
|
||||
{
|
||||
|
|
|
@ -562,18 +562,25 @@ PRBool nsWidget::OnMove(PRInt32 aX, PRInt32 aY)
|
|||
// Enable/disable this component
|
||||
//
|
||||
//-------------------------------------------------------------------------
|
||||
NS_IMETHODIMP nsWidget::Enable(PRBool bState)
|
||||
NS_IMETHODIMP nsWidget::Enable(PRBool aState)
|
||||
{
|
||||
if (mWidget)
|
||||
{
|
||||
if (GTK_WIDGET_SENSITIVE(mWidget) == bState)
|
||||
if (GTK_WIDGET_SENSITIVE(mWidget) == aState)
|
||||
return NS_OK;
|
||||
gtk_widget_set_sensitive(mWidget, bState);
|
||||
gtk_widget_set_sensitive(mWidget, aState);
|
||||
}
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP nsWidget::IsEnabled(PRBool *aState)
|
||||
{
|
||||
NS_ENSURE_ARG_POINTER(aState);
|
||||
*aState = mWidget && GTK_WIDGET_SENSITIVE(mWidget) ? PR_TRUE : PR_FALSE;
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
//-------------------------------------------------------------------------
|
||||
//
|
||||
// Give the focus to this component
|
||||
|
|
|
@ -120,6 +120,7 @@ public:
|
|||
PRInt32 aHeight, PRBool aRepaint);
|
||||
|
||||
NS_IMETHOD Enable(PRBool aState);
|
||||
NS_IMETHOD IsEnabled(PRBool *aState);
|
||||
NS_IMETHOD SetFocus(PRBool aRaise);
|
||||
|
||||
virtual void LoseFocus(void);
|
||||
|
|
|
@ -662,9 +662,17 @@ NS_IMETHODIMP nsWindow::ModalEventFilter(PRBool aRealEvent, void *aEvent,
|
|||
// Enable/disable this component
|
||||
//
|
||||
//-------------------------------------------------------------------------
|
||||
NS_IMETHODIMP nsWindow::Enable(PRBool bState)
|
||||
NS_IMETHODIMP nsWindow::Enable(PRBool aState)
|
||||
{
|
||||
mEnabled = bState;
|
||||
mEnabled = aState;
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
||||
NS_IMETHODIMP nsWindow::IsEnabled(PRBool *aState)
|
||||
{
|
||||
NS_ENSURE_ARG_POINTER(aState);
|
||||
*aState = mEnabled;
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
|
|
@ -134,7 +134,8 @@ public:
|
|||
NS_IMETHOD Resize(PRInt32 aWidth,PRInt32 aHeight, PRBool aRepaint);
|
||||
NS_IMETHOD Resize(PRInt32 aX, PRInt32 aY,PRInt32 aWidth,PRInt32 aHeight, PRBool aRepaint);
|
||||
|
||||
NS_IMETHOD Enable(PRBool bState);
|
||||
NS_IMETHOD Enable(PRBool aState);
|
||||
NS_IMETHOD IsEnabled(PRBool *aState);
|
||||
NS_IMETHOD SetFocus(PRBool aRaise);
|
||||
NS_IMETHOD SetBounds(const nsRect &aRect);
|
||||
NS_IMETHOD GetBounds(nsRect &aRect);
|
||||
|
|
|
@ -1272,6 +1272,15 @@ NS_METHOD nsWindow::Enable(PRBool bState)
|
|||
}
|
||||
|
||||
|
||||
NS_METHOD nsWindow::IsEnabled(PRBool *aState)
|
||||
{
|
||||
NS_ENSURE_ARG_POINTER(aState);
|
||||
*aState = PR_TRUE;
|
||||
return NS_ERROR_NOT_IMPLEMENTED;
|
||||
}
|
||||
|
||||
|
||||
|
||||
//-------------------------------------------------------------------------
|
||||
//
|
||||
// Give the focus to this component
|
||||
|
|
|
@ -115,7 +115,8 @@ class nsWindow : public nsBaseWidget,
|
|||
PRInt32 aHeight,
|
||||
PRBool aRepaint);
|
||||
NS_IMETHOD GetClientBounds( nsRect &aRect);
|
||||
NS_IMETHOD Enable( PRBool bState);
|
||||
NS_IMETHOD Enable( PRBool aState);
|
||||
NS_IMETHOD IsEnabled(PRBool *aState);
|
||||
NS_IMETHOD SetFocus(PRBool aRaise);
|
||||
NS_IMETHOD IsVisible( PRBool &aState);
|
||||
NS_IMETHOD PlaceBehind(nsIWidget *aWidget, PRBool aActivate);
|
||||
|
|
|
@ -499,10 +499,10 @@ PRBool nsWidget::OnMove( PRInt32 aX, PRInt32 aY ) {
|
|||
// Enable/disable this component
|
||||
//
|
||||
//-------------------------------------------------------------------------
|
||||
NS_METHOD nsWidget::Enable( PRBool bState ) {
|
||||
NS_METHOD nsWidget::Enable( PRBool aState ) {
|
||||
if( mWidget ) {
|
||||
PtArg_t arg;
|
||||
if( bState )
|
||||
if( aState )
|
||||
PtSetArg( &arg, Pt_ARG_FLAGS, 0, Pt_BLOCKED );
|
||||
else
|
||||
PtSetArg( &arg, Pt_ARG_FLAGS, Pt_BLOCKED, Pt_BLOCKED );
|
||||
|
@ -512,6 +512,13 @@ NS_METHOD nsWidget::Enable( PRBool bState ) {
|
|||
}
|
||||
|
||||
|
||||
NS_METHOD nsWidget::IsEnabled( PRBool *aState ) {
|
||||
NS_ENSURE_ARG_POINTER(aState);
|
||||
*aState = PR_TRUE;
|
||||
return NS_ERROR_NOT_IMPLEMENTED;
|
||||
}
|
||||
|
||||
|
||||
//-------------------------------------------------------------------------
|
||||
//
|
||||
// Give the focus to this component
|
||||
|
|
|
@ -106,6 +106,7 @@ public:
|
|||
PRInt32 aHeight, PRBool aRepaint);
|
||||
|
||||
NS_IMETHOD Enable(PRBool aState);
|
||||
NS_IMETHOD IsEnabled(PRBool *aState);
|
||||
NS_IMETHOD SetFocus(PRBool aRaise);
|
||||
|
||||
PRBool OnResize(nsSizeEvent event);
|
||||
|
|
|
@ -361,14 +361,21 @@ PRBool nsWidget::OnMove(PRInt32 aX, PRInt32 aY)
|
|||
//-------------------------------------------------------------------------
|
||||
// Enable/disable this component
|
||||
//-------------------------------------------------------------------------
|
||||
NS_METHOD nsWidget::Enable(PRBool bState)
|
||||
NS_METHOD nsWidget::Enable(PRBool aState)
|
||||
{
|
||||
if (mWidget) {
|
||||
mWidget->Enable(bState);
|
||||
mWidget->Enable(aState);
|
||||
}
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_METHOD nsWidget::IsEnabled(PRBool *aState)
|
||||
{
|
||||
NS_ENSURE_ARG_POINTER(aState);
|
||||
*aState = PR_TRUE;
|
||||
return NS_ERROR_NOT_IMPLEMENTED;
|
||||
}
|
||||
|
||||
//-------------------------------------------------------------------------
|
||||
// Give the focus to this component
|
||||
//-------------------------------------------------------------------------
|
||||
|
|
|
@ -91,6 +91,7 @@ public:
|
|||
PRBool aRepaint);
|
||||
|
||||
NS_IMETHOD Enable(PRBool aState);
|
||||
NS_IMETHOD IsEnabled(PRBool *aState);
|
||||
NS_IMETHOD SetFocus(PRBool aRaise);
|
||||
|
||||
PRBool OnResize(nsSizeEvent event);
|
||||
|
|
|
@ -1882,6 +1882,16 @@ NS_METHOD nsWindow::Enable(PRBool bState)
|
|||
}
|
||||
|
||||
|
||||
NS_METHOD nsWindow::IsEnabled(PRBool *aState)
|
||||
{
|
||||
NS_ENSURE_ARG_POINTER(aState);
|
||||
*aState = PR_FALSE;
|
||||
if (mWnd && ::IsWindowEnabled(mWnd))
|
||||
*aState = PR_TRUE;
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
||||
//-------------------------------------------------------------------------
|
||||
//
|
||||
// Give the focus to this component
|
||||
|
|
|
@ -258,7 +258,8 @@ public:
|
|||
PRInt32 aWidth,
|
||||
PRInt32 aHeight,
|
||||
PRBool aRepaint);
|
||||
NS_IMETHOD Enable(PRBool bState);
|
||||
NS_IMETHOD Enable(PRBool aState);
|
||||
NS_IMETHOD IsEnabled(PRBool *aState);
|
||||
NS_IMETHOD SetFocus(PRBool aRaise);
|
||||
NS_IMETHOD GetBounds(nsRect &aRect);
|
||||
NS_IMETHOD GetClientBounds(nsRect &aRect);
|
||||
|
|
|
@ -517,11 +517,18 @@ NS_IMETHODIMP nsWidget::Resize(PRInt32 aX,
|
|||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP nsWidget::Enable(PRBool bState)
|
||||
NS_IMETHODIMP nsWidget::Enable(PRBool aState)
|
||||
{
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP nsWidget::IsEnabled(PRBool *aState)
|
||||
{
|
||||
NS_ENSURE_ARG_POINTER(aState);
|
||||
*aState = PR_TRUE;
|
||||
return NS_ERROR_NOT_IMPLEMENTED;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP nsWidget::SetFocus(PRBool aRaise)
|
||||
{
|
||||
|
||||
|
|
|
@ -102,7 +102,8 @@ public:
|
|||
PRInt32 aHeight,
|
||||
PRBool aRepaint);
|
||||
|
||||
NS_IMETHOD Enable(PRBool bState);
|
||||
NS_IMETHOD Enable(PRBool aState);
|
||||
NS_IMETHOD IsEnabled(PRBool *aState);
|
||||
NS_IMETHOD SetFocus(PRBool aRaise = PR_FALSE);
|
||||
NS_IMETHOD SetName(const char * aName);
|
||||
NS_IMETHOD SetBackgroundColor(const nscolor &aColor);
|
||||
|
|
Загрузка…
Ссылка в новой задаче