зеркало из https://github.com/mozilla/pjs.git
removal of #ifdefs foor 68396 r=cmanske all depricated code just a clean up
This commit is contained in:
Родитель
b10ed9cdfe
Коммит
9e81ea1155
|
@ -107,7 +107,7 @@ static NS_DEFINE_CID(kAttributeContentCID, NS_ATTRIBUTECONTENT_CID);
|
|||
#include "nsInlineFrame.h"
|
||||
#include "nsBlockFrame.h"
|
||||
|
||||
#include "nsGfxTextControlFrame.h"
|
||||
#include "nsFormControlHelper.h"
|
||||
#include "nsIScrollableFrame.h"
|
||||
|
||||
#include "nsIServiceManager.h"
|
||||
|
@ -4098,12 +4098,6 @@ nsCSSFrameConstructor::ConstructTextControlFrame(nsIPresShell* aPresShell
|
|||
if (NS_FAILED(rv)) {
|
||||
aNewFrame = nsnull;
|
||||
}
|
||||
if (aNewFrame)
|
||||
{
|
||||
#ifndef ENDER_LITE
|
||||
((nsGfxTextControlFrame*)aNewFrame)->SetFrameConstructor(this);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
if (!aNewFrame)
|
||||
{
|
||||
|
|
|
@ -31,14 +31,9 @@
|
|||
#include "nsCOMPtr.h"
|
||||
#include "nsIHTMLContent.h"
|
||||
|
||||
#ifndef ENDER_LITE
|
||||
#include "nsGfxTextControlFrame.h"
|
||||
typedef nsGfxTextControlFrame nsNewFrame;
|
||||
#else
|
||||
#include "nsGfxTextControlFrame2.h"
|
||||
#include "nsFormControlHelper.h"
|
||||
typedef nsGfxTextControlFrame2 nsNewFrame;
|
||||
#endif
|
||||
|
||||
class nsIPresState;
|
||||
class nsFormFrame;
|
||||
|
|
|
@ -30,14 +30,9 @@
|
|||
#include "nsIUnicodeEncoder.h"
|
||||
#include "nsIDOMKeyListener.h"
|
||||
|
||||
#ifndef ENDER_LITE
|
||||
#include "nsGfxTextControlFrame.h"
|
||||
typedef nsGfxTextControlFrame nsNewFrame;
|
||||
#else
|
||||
#include "nsGfxTextControlFrame2.h"
|
||||
#include "nsFormControlHelper.h"
|
||||
typedef nsGfxTextControlFrame2 nsNewFrame;
|
||||
#endif
|
||||
|
||||
class nsIPresState;
|
||||
class nsISupportsArray;
|
||||
|
|
|
@ -31,14 +31,9 @@
|
|||
#include "nsCOMPtr.h"
|
||||
#include "nsIHTMLContent.h"
|
||||
|
||||
#ifndef ENDER_LITE
|
||||
#include "nsGfxTextControlFrame.h"
|
||||
typedef nsGfxTextControlFrame nsNewFrame;
|
||||
#else
|
||||
#include "nsGfxTextControlFrame2.h"
|
||||
#include "nsFormControlHelper.h"
|
||||
typedef nsGfxTextControlFrame2 nsNewFrame;
|
||||
#endif
|
||||
|
||||
class nsIPresState;
|
||||
class nsFormFrame;
|
||||
|
|
|
@ -3080,7 +3080,7 @@ nsGfxTextControlFrame2::SetTextControlFrameState(const nsAReadableString& aValue
|
|||
else {
|
||||
nsCOMPtr<nsIPlaintextEditor> textEditor = do_QueryInterface(mEditor);
|
||||
if (textEditor)
|
||||
textEditor->InsertText(currentValue.GetUnicode());
|
||||
textEditor->InsertText(currentValue);
|
||||
}
|
||||
mEditor->SetFlags(savedFlags);
|
||||
if (selPriv)
|
||||
|
|
|
@ -30,14 +30,9 @@
|
|||
#include "nsIUnicodeEncoder.h"
|
||||
#include "nsIDOMKeyListener.h"
|
||||
|
||||
#ifndef ENDER_LITE
|
||||
#include "nsGfxTextControlFrame.h"
|
||||
typedef nsGfxTextControlFrame nsNewFrame;
|
||||
#else
|
||||
#include "nsGfxTextControlFrame2.h"
|
||||
#include "nsFormControlHelper.h"
|
||||
typedef nsGfxTextControlFrame2 nsNewFrame;
|
||||
#endif
|
||||
|
||||
class nsIPresState;
|
||||
class nsISupportsArray;
|
||||
|
|
|
@ -107,7 +107,7 @@ static NS_DEFINE_CID(kAttributeContentCID, NS_ATTRIBUTECONTENT_CID);
|
|||
#include "nsInlineFrame.h"
|
||||
#include "nsBlockFrame.h"
|
||||
|
||||
#include "nsGfxTextControlFrame.h"
|
||||
#include "nsFormControlHelper.h"
|
||||
#include "nsIScrollableFrame.h"
|
||||
|
||||
#include "nsIServiceManager.h"
|
||||
|
@ -4098,12 +4098,6 @@ nsCSSFrameConstructor::ConstructTextControlFrame(nsIPresShell* aPresShell
|
|||
if (NS_FAILED(rv)) {
|
||||
aNewFrame = nsnull;
|
||||
}
|
||||
if (aNewFrame)
|
||||
{
|
||||
#ifndef ENDER_LITE
|
||||
((nsGfxTextControlFrame*)aNewFrame)->SetFrameConstructor(this);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
if (!aNewFrame)
|
||||
{
|
||||
|
|
Загрузка…
Ссылка в новой задаче