diff --git a/mozilla/widget/public/Makefile b/mozilla/widget/public/Makefile index 35dee3ccebd..12bd44eb0c4 100644 --- a/mozilla/widget/public/Makefile +++ b/mozilla/widget/public/Makefile @@ -44,6 +44,8 @@ EXPORTS = \ nsITooltipWidget.h \ nsIAppShell.h \ nsILookAndFeel.h \ + nsIDialog.h \ + nsILabel.h \ $(NULL) MODULE = raptor diff --git a/mozilla/widget/public/makefile.win b/mozilla/widget/public/makefile.win index b95f127e83e..94e3d5a0326 100644 --- a/mozilla/widget/public/makefile.win +++ b/mozilla/widget/public/makefile.win @@ -26,7 +26,7 @@ EXPORTS=nsui.h nsIWidget.h nsIButton.h nsICheckButton.h nsIListWidget.h \ nsIListBox.h nsIFileWidget.h nsIScrollbar.h nsGUIEvent.h \ nsIRadioButton.h nsIRadioGroup.h nsIMouseListener.h \ nsIEventListener.h nsIToolkit.h nsWidgetsCID.h nsITabWidget.h \ - nsITooltipWidget.h nsIAppShell.h nsStringUtil.h nsILookAndFeel.h + nsITooltipWidget.h nsIAppShell.h nsStringUtil.h nsILookAndFeel.h nsIDialog.h nsILabel.h include <$(DEPTH)\config\rules.mak> diff --git a/mozilla/widget/public/nsIDialog.h b/mozilla/widget/public/nsIDialog.h new file mode 100644 index 00000000000..a398d21c8be --- /dev/null +++ b/mozilla/widget/public/nsIDialog.h @@ -0,0 +1,59 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- + * + * The contents of this file are subject to the Netscape Public License + * Version 1.0 (the "NPL"); you may not use this file except in + * compliance with the NPL. You may obtain a copy of the NPL at + * http://www.mozilla.org/NPL/ + * + * Software distributed under the NPL is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL + * for the specific language governing rights and limitations under the + * NPL. + * + * The Initial Developer of this code under the NPL is Netscape + * Communications Corporation. Portions created by Netscape are + * Copyright (C) 1998 Netscape Communications Corporation. All Rights + * Reserved. + */ + +#ifndef nsIDialog_h__ +#define nsIDialog_h__ + +#include "nsIWidget.h" + +// {4A781D61-3D28-11d2-8DB8-00609703C14E} +#define NS_IDIALOG_IID \ +{ 0x4a781d61, 0x3d28, 0x11d2, \ +{ 0x8d, 0xb8, 0x0, 0x60, 0x97, 0x3, 0xc1, 0x4e } } + + +/** + * The base class for all the widgets. It provides the interface for + * all basic and necessary functionality. + */ +class nsIDialog : public nsIWidget { + + public: + + /** + * Set the button label + * + * @param aText button label + */ + + virtual void SetLabel(const nsString &aText) = 0; + + /** + * Get the button label + * + * @param aBuffer contains label upon return + */ + + virtual void GetLabel(nsString &aBuffer) = 0; + + + + +}; + +#endif // nsIDialog_h__ diff --git a/mozilla/widget/public/nsILabel.h b/mozilla/widget/public/nsILabel.h new file mode 100644 index 00000000000..f0bf9b9dccb --- /dev/null +++ b/mozilla/widget/public/nsILabel.h @@ -0,0 +1,74 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- + * + * The contents of this file are subject to the Netscape Public License + * Version 1.0 (the "NPL"); you may not use this file except in + * compliance with the NPL. You may obtain a copy of the NPL at + * http://www.mozilla.org/NPL/ + * + * Software distributed under the NPL is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL + * for the specific language governing rights and limitations under the + * NPL. + * + * The Initial Developer of this code under the NPL is Netscape + * Communications Corporation. Portions created by Netscape are + * Copyright (C) 1998 Netscape Communications Corporation. All Rights + * Reserved. + */ + +#ifndef nsILabel_h__ +#define nsILabel_h__ + +#include "nsIWidget.h" +#include "nsString.h" + +/* F3131891-3DC7-11d2-8DB8-00609703C14E */ +#define NS_ILABEL_IID \ +{ 0xf3131891, 0x3dc7, 0x11d2, \ + { 0x8d, 0xb8, 0x0, 0x60, 0x97, 0x3, 0xc1, 0x4e } } + +/** + * Label Alignments + */ + +enum nsLabelAlignment { + eAlign_Right, + eAlign_Left, + eAlign_Center + }; + +/** + * Label widget. + * Automatically shows itself as depressed when clicked on. + */ +class nsILabel : public nsIWidget { + + public: + + /** + * Set the button label + * + * @param aText button label + */ + + virtual void SetLabel(const nsString &aText) = 0; + + /** + * Get the button label + * + * @param aBuffer contains label upon return + */ + + virtual void GetLabel(nsString &aBuffer) = 0; + + + /** + * Set the Label Alignemnt for creation + * + * @param aAlignment the alignment + */ + virtual void SetAlignment(nsLabelAlignment aAlignment) = 0; + +}; + +#endif diff --git a/mozilla/widget/public/nsWidgetsCID.h b/mozilla/widget/public/nsWidgetsCID.h index ba1e709289b..4b14167fe18 100644 --- a/mozilla/widget/public/nsWidgetsCID.h +++ b/mozilla/widget/public/nsWidgetsCID.h @@ -101,3 +101,12 @@ { 0x21b51de0, 0x21a3, 0x11d2, \ { 0xb6, 0xe0, 0x0, 0x80, 0x5f, 0x8a, 0x26, 0x76 } } +/* 4A781D61-3D28-11d2-8DB8-00609703C14E */ +#define NS_DIALOG_CID \ +{ 0x4a781d61, 0x3d28, 0x11d2, \ + { 0x8d, 0xb8, 0x0, 0x60, 0x97, 0x3, 0xc1, 0x4e } } + +/* F3131891-3DC7-11d2-8DB8-00609703C14E */ +#define NS_LABEL_CID \ +{ 0xf3131891, 0x3dc7, 0x11d2, \ + { 0x8d, 0xb8, 0x0, 0x60, 0x97, 0x3, 0xc1, 0x4e } }