Bug 95556 - removing obsolete native textarea widget. r=jag, sr=blizzard, a=blizzard.
This commit is contained in:
Родитель
a80366e29a
Коммит
530641777d
|
@ -27,7 +27,7 @@
|
|||
#include "nsWindow.h"
|
||||
|
||||
/**
|
||||
* Base class for nsTextAreaWidget and nsTextWidget
|
||||
* Base class for nsTextAreaWidget (obsolete) and nsTextWidget
|
||||
*/
|
||||
|
||||
class nsTextHelper : public nsWindow,
|
||||
|
|
|
@ -8,7 +8,6 @@ nsIKBStateControl.h
|
|||
nsIButton.h
|
||||
nsICheckButton.h
|
||||
nsITextWidget.h
|
||||
nsITextAreaWidget.h
|
||||
nsIScrollbar.h
|
||||
nsGUIEvent.h
|
||||
nsEvent.h
|
||||
|
|
|
@ -44,7 +44,6 @@ EXPORTS = \
|
|||
nsIButton.h \
|
||||
nsICheckButton.h \
|
||||
nsITextWidget.h \
|
||||
nsITextAreaWidget.h \
|
||||
nsIScrollbar.h \
|
||||
nsGUIEvent.h \
|
||||
nsEvent.h \
|
||||
|
|
|
@ -68,11 +68,6 @@
|
|||
{ 0x2d96b3da, 0xc051, 0x11d1, \
|
||||
{0xa8, 0x27, 0x00, 0x40, 0x95, 0x9a, 0x28, 0xc9} }
|
||||
|
||||
/* 2d96b3db-c051-11d1-a827-0040959a28c9 */
|
||||
#define NS_TEXTAREA_CID \
|
||||
{ 0x2d96b3db, 0xc051, 0x11d1, \
|
||||
{0xa8, 0x27, 0x00, 0x40, 0x95, 0x9a, 0x28, 0xc9} }
|
||||
|
||||
/* 2d96b3dc-c051-11d1-a827-0040959a28c9 */
|
||||
#define NS_TEXTFIELD_CID \
|
||||
{ 0x2d96b3dc, 0xc051, 0x11d1, \
|
||||
|
|
|
@ -48,7 +48,6 @@ CPPSRCS = \
|
|||
nsPopUpMenu.cpp \
|
||||
nsScrollbar.cpp \
|
||||
nsSound.cpp \
|
||||
nsTextAreaWidget.cpp \
|
||||
nsTextHelper.cpp \
|
||||
nsTextWidget.cpp \
|
||||
nsToolkit.cpp \
|
||||
|
|
|
@ -185,7 +185,7 @@ NS_METHOD nsTextHelper::GetCaretPosition(PRUint32& aPos)
|
|||
//
|
||||
//-------------------------------------------------------------------------
|
||||
|
||||
nsTextHelper::nsTextHelper() : nsWindow(), nsITextAreaWidget(), nsITextWidget()
|
||||
nsTextHelper::nsTextHelper() : nsWindow(), nsITextWidget()
|
||||
{
|
||||
mIsReadOnly = PR_FALSE;
|
||||
mIsPassword = PR_FALSE;
|
||||
|
|
|
@ -24,17 +24,15 @@
|
|||
|
||||
#include "nsdefs.h"
|
||||
#include "nsITextWidget.h"
|
||||
#include "nsITextAreaWidget.h"
|
||||
#include "nsWindow.h"
|
||||
|
||||
class BTextView;
|
||||
|
||||
/**
|
||||
* Base class for nsTextAreaWidget and nsTextWidget
|
||||
* Base class for nsTextAreaWidget (obsolete) and nsTextWidget
|
||||
*/
|
||||
|
||||
class nsTextHelper : public nsWindow,
|
||||
public nsITextAreaWidget,
|
||||
public nsITextWidget
|
||||
{
|
||||
|
||||
|
|
|
@ -34,7 +34,6 @@
|
|||
#include "nsScrollbar.h"
|
||||
#include "nsCheckButton.h"
|
||||
#include "nsTextWidget.h"
|
||||
#include "nsTextAreaWidget.h"
|
||||
#include "nsFilePicker.h"
|
||||
#include "nsFileWidget.h"
|
||||
#include "nsLookAndFeel.h"
|
||||
|
@ -61,7 +60,6 @@ static NS_DEFINE_IID(kCFileOpen, NS_FILEWIDGET_CID);
|
|||
static NS_DEFINE_IID(kCFilePicker, NS_FILEPICKER_CID);
|
||||
static NS_DEFINE_IID(kCHorzScrollbar, NS_HORZSCROLLBAR_CID);
|
||||
static NS_DEFINE_IID(kCVertScrollbar, NS_VERTSCROLLBAR_CID);
|
||||
static NS_DEFINE_IID(kCTextArea, NS_TEXTAREA_CID);
|
||||
static NS_DEFINE_IID(kCTextField, NS_TEXTFIELD_CID);
|
||||
static NS_DEFINE_IID(kCAppShell, NS_APPSHELL_CID);
|
||||
static NS_DEFINE_IID(kCToolkit, NS_TOOLKIT_CID);
|
||||
|
@ -184,9 +182,6 @@ nsresult nsWidgetFactory::CreateInstance(nsISupports *aOuter,
|
|||
else if (mClassID.Equals(kCVertScrollbar)) {
|
||||
inst = (nsISupports*)(nsWindow *)new nsScrollbar(PR_TRUE);
|
||||
}
|
||||
else if (mClassID.Equals(kCTextArea)) {
|
||||
inst = (nsISupports*)(nsWindow *)new nsTextAreaWidget();
|
||||
}
|
||||
else if (mClassID.Equals(kCTextField)) {
|
||||
inst = (nsISupports*)(nsWindow *)new nsTextWidget();
|
||||
}
|
||||
|
|
|
@ -23,7 +23,6 @@
|
|||
|
||||
#include "nsWidgetSupport.h"
|
||||
#include "nsRect.h"
|
||||
#include "nsITextAreaWidget.h"
|
||||
#include "nsIFileWidget.h"
|
||||
#include "nsIAppShell.h"
|
||||
#include "nsIButton.h"
|
||||
|
@ -127,36 +126,6 @@ NS_CreateLabel( nsISupports* aParent,
|
|||
|
||||
|
||||
|
||||
NS_WIDGET nsresult
|
||||
NS_CreateTextAreaWidget(nsISupports* aParent,
|
||||
nsITextAreaWidget* aWidget,
|
||||
const nsRect& aRect,
|
||||
EVENT_CALLBACK aHandleEventFunction,
|
||||
const nsFont* aFont)
|
||||
{
|
||||
nsIWidget* parent = nsnull;
|
||||
if (aParent != nsnull)
|
||||
aParent->QueryInterface(kIWidgetIID,(void**)&parent);
|
||||
|
||||
nsIWidget* widget = nsnull;
|
||||
if (NS_OK == aWidget->QueryInterface(kIWidgetIID,(void**)&widget)) {
|
||||
widget->Create(parent, aRect, aHandleEventFunction, NULL);
|
||||
widget->Show(PR_TRUE);
|
||||
if (aFont != nsnull)
|
||||
widget->SetFont(*aFont);
|
||||
NS_IF_RELEASE(widget);
|
||||
}
|
||||
else
|
||||
{
|
||||
NS_ERROR("Called QueryInterface on a non kIWidgetIID supported object");
|
||||
}
|
||||
|
||||
if (aParent)
|
||||
NS_IF_RELEASE(parent);
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_WIDGET nsresult
|
||||
NS_CreateTextWidget(nsISupports* aParent,
|
||||
nsITextWidget* aWidget,
|
||||
|
|
|
@ -35,7 +35,7 @@ NS_IMPL_RELEASE_INHERITED(nsTextHelper, nsWidget)
|
|||
//
|
||||
//-------------------------------------------------------------------------
|
||||
|
||||
nsTextHelper::nsTextHelper() : nsWidget(), nsITextAreaWidget(), nsITextWidget()
|
||||
nsTextHelper::nsTextHelper() : nsWidget(), nsITextWidget()
|
||||
{
|
||||
mIsReadOnly = PR_FALSE;
|
||||
mIsPassword = PR_FALSE;
|
||||
|
|
|
@ -23,14 +23,12 @@
|
|||
#define nsTextHelper_h__
|
||||
|
||||
#include "nsITextWidget.h"
|
||||
#include "nsITextAreaWidget.h"
|
||||
#include "nsWidget.h"
|
||||
|
||||
/**
|
||||
* Base class for nsTextAreaWidget and nsTextWidget
|
||||
* Base class for nsTextAreaWidget (obsolete) and nsTextWidget
|
||||
*/
|
||||
class nsTextHelper : public nsWidget,
|
||||
public nsITextAreaWidget,
|
||||
public nsITextWidget
|
||||
{
|
||||
|
||||
|
|
|
@ -62,7 +62,6 @@
|
|||
#include "nsDragService.h"
|
||||
|
||||
#if USE_NATIVE_VERSION
|
||||
# include "nsTextAreaWidget.h"
|
||||
# include "nsCheckButton.h"
|
||||
#endif
|
||||
|
||||
|
@ -90,7 +89,6 @@ static NS_DEFINE_CID(kCFilePicker, NS_FILEPICKER_CID);
|
|||
static NS_DEFINE_CID(kCFileOpen, NS_FILEWIDGET_CID);
|
||||
static NS_DEFINE_CID(kCHorzScrollbar, NS_HORZSCROLLBAR_CID);
|
||||
static NS_DEFINE_CID(kCVertScrollbar, NS_VERTSCROLLBAR_CID);
|
||||
static NS_DEFINE_CID(kCTextArea, NS_TEXTAREA_CID);
|
||||
static NS_DEFINE_CID(kCTextField, NS_TEXTFIELD_CID);
|
||||
static NS_DEFINE_CID(kCAppShell, NS_APPSHELL_CID);
|
||||
static NS_DEFINE_CID(kCToolkit, NS_TOOLKIT_CID);
|
||||
|
@ -208,9 +206,6 @@ nsresult nsWidgetFactory::CreateInstance(nsISupports *aOuter,
|
|||
else if (mClassID.Equals(kCCheckButton)) {
|
||||
inst = (nsISupports*)(nsBaseWidget*)(nsWindow*)new nsCheckButton();
|
||||
}
|
||||
else if (mClassID.Equals(kCTextArea)) {
|
||||
inst = (nsISupports*)(nsBaseWidget*)(nsWindow*)new nsTextAreaWidget();
|
||||
}
|
||||
#endif
|
||||
else if (mClassID.Equals(kCHorzScrollbar)) {
|
||||
inst = (nsISupports*)(nsBaseWidget*)(nsWindow*)new nsScrollbar(PR_FALSE);
|
||||
|
|
|
@ -23,7 +23,6 @@
|
|||
|
||||
#include "nsWidgetSupport.h"
|
||||
#include "nsRect.h"
|
||||
#include "nsITextAreaWidget.h"
|
||||
#include "nsIFileWidget.h"
|
||||
#include "nsIAppShell.h"
|
||||
#include "nsIButton.h"
|
||||
|
@ -117,36 +116,6 @@ NS_CreateLabel( nsISupports* aParent,
|
|||
|
||||
|
||||
|
||||
NS_WIDGET nsresult
|
||||
NS_CreateTextAreaWidget(nsISupports* aParent,
|
||||
nsITextAreaWidget* aWidget,
|
||||
const nsRect& aRect,
|
||||
EVENT_CALLBACK aHandleEventFunction,
|
||||
const nsFont* aFont)
|
||||
{
|
||||
nsIWidget* parent = nsnull;
|
||||
if (aParent != nsnull)
|
||||
aParent->QueryInterface(NS_GET_IID(nsIWidget),(void**)&parent);
|
||||
|
||||
nsIWidget* widget = nsnull;
|
||||
if (NS_OK == aWidget->QueryInterface(NS_GET_IID(nsIWidget),(void**)&widget)) {
|
||||
widget->Create(parent, aRect, aHandleEventFunction, NULL);
|
||||
widget->Show(PR_TRUE);
|
||||
if (aFont != nsnull)
|
||||
widget->SetFont(*aFont);
|
||||
NS_IF_RELEASE(widget);
|
||||
}
|
||||
else
|
||||
{
|
||||
NS_ERROR("Called QueryInterface on a non nsIWidget supported object");
|
||||
}
|
||||
|
||||
if (aParent)
|
||||
NS_IF_RELEASE(parent);
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_WIDGET nsresult
|
||||
NS_CreateTextWidget(nsISupports* aParent,
|
||||
nsITextWidget* aWidget,
|
||||
|
|
|
@ -45,7 +45,6 @@ CPPSRCS = \
|
|||
nsMenuItem.cpp \
|
||||
nsPopUpMenu.cpp \
|
||||
nsScrollbar.cpp \
|
||||
nsTextAreaWidget.cpp \
|
||||
nsTextHelper.cpp \
|
||||
nsTextWidget.cpp \
|
||||
nsToolkit.cpp \
|
||||
|
|
|
@ -38,7 +38,7 @@
|
|||
//
|
||||
//-------------------------------------------------------------------------
|
||||
|
||||
nsTextHelper::nsTextHelper() : nsWindow(), nsITextAreaWidget(), nsITextWidget()
|
||||
nsTextHelper::nsTextHelper() : nsWindow(), nsITextWidget()
|
||||
{
|
||||
mIsReadOnly = PR_FALSE;
|
||||
mIsPassword = PR_FALSE;
|
||||
|
|
|
@ -23,16 +23,14 @@
|
|||
#define nsTextHelper_h__
|
||||
|
||||
#include "nsITextWidget.h"
|
||||
#include "nsITextAreaWidget.h"
|
||||
#include "nsWindow.h"
|
||||
#include <Xm/Xm.h>
|
||||
|
||||
/**
|
||||
* Base class for nsTextAreaWidget and nsTextWidget
|
||||
* Base class for nsTextAreaWidget (obsolete) and nsTextWidget
|
||||
*/
|
||||
|
||||
class nsTextHelper : public nsWindow,
|
||||
public nsITextAreaWidget,
|
||||
public nsITextWidget
|
||||
{
|
||||
|
||||
|
|
|
@ -34,7 +34,6 @@
|
|||
#include "nsScrollbar.h"
|
||||
#include "nsCheckButton.h"
|
||||
#include "nsTextWidget.h"
|
||||
#include "nsTextAreaWidget.h"
|
||||
#include "nsFileWidget.h"
|
||||
#include "nsLookAndFeel.h"
|
||||
#include "nsLabel.h"
|
||||
|
@ -62,7 +61,6 @@ static NS_DEFINE_IID(kCCheckButton, NS_CHECKBUTTON_CID);
|
|||
static NS_DEFINE_IID(kCFileOpen, NS_FILEWIDGET_CID);
|
||||
static NS_DEFINE_IID(kCHorzScrollbar, NS_HORZSCROLLBAR_CID);
|
||||
static NS_DEFINE_IID(kCVertScrollbar, NS_VERTSCROLLBAR_CID);
|
||||
static NS_DEFINE_IID(kCTextArea, NS_TEXTAREA_CID);
|
||||
static NS_DEFINE_IID(kCTextField, NS_TEXTFIELD_CID);
|
||||
static NS_DEFINE_IID(kCAppShell, NS_APPSHELL_CID);
|
||||
static NS_DEFINE_IID(kCToolkit, NS_TOOLKIT_CID);
|
||||
|
@ -183,9 +181,6 @@ nsresult nsWidgetFactory::CreateInstance(nsISupports *aOuter,
|
|||
else if (mClassID.Equals(kCVertScrollbar)) {
|
||||
inst = (nsISupports*)(nsIWidget *)new nsScrollbar(PR_TRUE);
|
||||
}
|
||||
else if (mClassID.Equals(kCTextArea)) {
|
||||
inst = (nsISupports*)(nsIWidget *)new nsTextAreaWidget();
|
||||
}
|
||||
else if (mClassID.Equals(kCTextField)) {
|
||||
inst = (nsISupports*)(nsIWidget *)new nsTextWidget();
|
||||
}
|
||||
|
|
|
@ -245,7 +245,7 @@ NS_METHOD nsTextHelper::GetCaretPosition(PRUint32& aPos)
|
|||
//
|
||||
//-------------------------------------------------------------------------
|
||||
|
||||
nsTextHelper::nsTextHelper() : nsWidget(), nsITextAreaWidget(), nsITextWidget()
|
||||
nsTextHelper::nsTextHelper() : nsWidget(), nsITextWidget()
|
||||
{
|
||||
mIsReadOnly = PR_FALSE;
|
||||
mIsPassword = PR_FALSE;
|
||||
|
|
|
@ -23,15 +23,13 @@
|
|||
#define nsTextHelper_h__
|
||||
|
||||
#include "nsITextWidget.h"
|
||||
#include "nsITextAreaWidget.h"
|
||||
#include "nsWidget.h"
|
||||
|
||||
/**
|
||||
* Base class for nsTextAreaWidget and nsTextWidget
|
||||
* Base class for nsTextAreaWidget (obsolete) and nsTextWidget
|
||||
*/
|
||||
|
||||
class nsTextHelper : public nsWidget,
|
||||
public nsITextAreaWidget,
|
||||
public nsITextWidget
|
||||
{
|
||||
|
||||
|
|
|
@ -1,11 +0,0 @@
|
|||
Makefile
|
||||
moc_nsQApplication.cpp
|
||||
moc_nsLabel.cpp
|
||||
moc_nsScrollbar.cpp
|
||||
moc_nsButton.cpp
|
||||
moc_nsTextAreaWidget.cpp
|
||||
moc_nsCheckButton.cpp
|
||||
moc_nsTextWidget.cpp
|
||||
moc_nsTabWidget.cpp
|
||||
moc_nsQEventHandler.cpp
|
||||
moc_nsWindow.cpp
|
|
@ -22,7 +22,6 @@
|
|||
|
||||
#include "nsTextHelper.h"
|
||||
#include "nsTextWidget.h"
|
||||
#include "nsTextAreaWidget.h"
|
||||
#include "nsToolkit.h"
|
||||
#include "nsColor.h"
|
||||
#include "nsGUIEvent.h"
|
||||
|
@ -42,7 +41,7 @@
|
|||
//
|
||||
//-------------------------------------------------------------------------
|
||||
|
||||
nsTextHelper::nsTextHelper() : nsWidget(), nsITextAreaWidget(), nsITextWidget()
|
||||
nsTextHelper::nsTextHelper() : nsWidget(), nsITextWidget()
|
||||
{
|
||||
PR_LOG(QtWidgetsLM, PR_LOG_DEBUG, ("nsTextHelper::nsTextHelper()\n"));
|
||||
mIsReadOnly = PR_FALSE;
|
||||
|
|
|
@ -23,15 +23,13 @@
|
|||
#define nsTextHelper_h__
|
||||
|
||||
#include "nsITextWidget.h"
|
||||
#include "nsITextAreaWidget.h"
|
||||
#include "nsWidget.h"
|
||||
|
||||
/**
|
||||
* Base class for nsTextAreaWidget and nsTextWidget
|
||||
* Base class for nsTextAreaWidget (obsolete) and nsTextWidget
|
||||
*/
|
||||
|
||||
class nsTextHelper : public nsWidget,
|
||||
public nsITextAreaWidget,
|
||||
public nsITextWidget
|
||||
{
|
||||
|
||||
|
|
|
@ -24,15 +24,13 @@
|
|||
|
||||
#include "nsdefs.h"
|
||||
#include "nsITextWidget.h"
|
||||
#include "nsITextAreaWidget.h"
|
||||
#include "nsWindow.h"
|
||||
|
||||
/**
|
||||
* Base class for nsTextAreaWidget and nsTextWidget
|
||||
* Base class for nsTextAreaWidget (obsolete) and nsTextWidget
|
||||
*/
|
||||
|
||||
class nsTextHelper : public nsWindow,
|
||||
public nsITextAreaWidget,
|
||||
public nsITextWidget
|
||||
{
|
||||
|
||||
|
|
|
@ -52,7 +52,6 @@ CPPSRCS = \
|
|||
nsPopUpMenu.cpp \
|
||||
nsScrollBar.cpp \
|
||||
nsSound.cpp \
|
||||
nsTextAreaWidget.cpp \
|
||||
nsTextHelper.cpp \
|
||||
nsTextWidget.cpp \
|
||||
nsToolkit.cpp \
|
||||
|
|
|
@ -92,7 +92,7 @@ NS_METHOD nsTextHelper::GetCaretPosition(PRUint32& aPos)
|
|||
return NS_OK;
|
||||
}
|
||||
|
||||
nsTextHelper::nsTextHelper() : nsWidget(), nsITextAreaWidget(), nsITextWidget()
|
||||
nsTextHelper::nsTextHelper() : nsWidget(), nsITextWidget()
|
||||
{
|
||||
}
|
||||
|
||||
|
|
|
@ -23,15 +23,13 @@
|
|||
#define nsTextHelper_h__
|
||||
|
||||
#include "nsITextWidget.h"
|
||||
#include "nsITextAreaWidget.h"
|
||||
#include "nsWidget.h"
|
||||
|
||||
/**
|
||||
* Base class for nsTextAreaWidget and nsTextWidget
|
||||
* Base class for nsTextAreaWidget (obsolete) and nsTextWidget
|
||||
*/
|
||||
|
||||
class nsTextHelper : public nsWidget,
|
||||
public nsITextAreaWidget,
|
||||
public nsITextWidget
|
||||
{
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче