зеркало из https://github.com/mozilla/pjs.git
Get this code building and linking again after the Enable changes and the -symbolic changes.
This commit is contained in:
Родитель
ecfbf969a9
Коммит
a7e7918e50
|
@ -55,7 +55,12 @@ CPPSRCS = \
|
|||
|
||||
SHARED_LIBRARY_LIBS = $(DIST)/lib/libxpwidgets_s.a
|
||||
|
||||
EXTRA_DSO_LDOPTS += $(MOZ_GTK2_LIBS)
|
||||
EXTRA_DSO_LDOPTS += \
|
||||
$(MOZ_COMPONENT_LIBS) \
|
||||
-lgkgfx \
|
||||
$(XLDFLAGS) \
|
||||
$(XLIBS) \
|
||||
$(MOZ_GTK2_LIBS)
|
||||
|
||||
EXPORTS = \
|
||||
mozdrawingarea.h \
|
||||
|
|
|
@ -48,6 +48,7 @@ nsCommonWidget::nsCommonWidget()
|
|||
mListenForResizes = PR_FALSE;
|
||||
mIsShown = PR_FALSE;
|
||||
mNeedsShow = PR_FALSE;
|
||||
mEnabled = PR_TRUE;
|
||||
|
||||
mPreferredWidth = 0;
|
||||
mPreferredHeight = 0;
|
||||
|
@ -458,6 +459,22 @@ nsCommonWidget::SetPreferredSize(PRInt32 aWidth,
|
|||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsCommonWidget::Enable(PRBool aState)
|
||||
{
|
||||
mEnabled = aState;
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsCommonWidget::IsEnabled(PRBool *aState)
|
||||
{
|
||||
*aState = mEnabled;
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
void
|
||||
nsCommonWidget::OnDestroy(void)
|
||||
{
|
||||
|
|
|
@ -109,6 +109,8 @@ class nsCommonWidget : public nsBaseWidget {
|
|||
PRInt32 &aHeight);
|
||||
NS_IMETHOD SetPreferredSize (PRInt32 aWidth,
|
||||
PRInt32 aHeight);
|
||||
NS_IMETHOD Enable (PRBool aState);
|
||||
NS_IMETHOD IsEnabled (PRBool *aState);
|
||||
|
||||
// called when we are destroyed
|
||||
void OnDestroy(void);
|
||||
|
@ -131,6 +133,8 @@ class nsCommonWidget : public nsBaseWidget {
|
|||
// This flag tracks if we're hidden or shown.
|
||||
PRPackedBool mIsShown;
|
||||
PRPackedBool mNeedsShow;
|
||||
// is this widget enabled?
|
||||
PRBool mEnabled;
|
||||
|
||||
// Preferred sizes
|
||||
PRUint32 mPreferredWidth;
|
||||
|
|
Загрузка…
Ссылка в новой задаче