зеркало из https://github.com/mozilla/pjs.git
Bug 473687 - Remove widget WinCE support: Part B (Main ifdef removal); r=dougt
This commit is contained in:
Ed Morley
Родитель
8d7e749a51
Коммит
a61d4e207c
|
|
@ -63,14 +63,7 @@ LOCAL_INCLUDES = \
|
|||
-I$(srcdir)/../windows \
|
||||
$(NULL)
|
||||
|
||||
OS_LIBS += $(call EXPAND_LIBNAME, uuid ole32 oleaut32 ws2_32)
|
||||
|
||||
ifneq ($(OS_ARCH), WINCE)
|
||||
OS_LIBS += $(call EXPAND_LIBNAME, comctl32 comdlg32 shell32 imm32 shlwapi winspool msimg32)
|
||||
else
|
||||
OS_LIBS += $(call EXPAND_LIBNAME, aygshell ddraw)
|
||||
EXTRA_DSO_LDOPTS += $(DEPTH)/gfx/cairo/libpixman/src/mozlibpixman.lib
|
||||
endif
|
||||
OS_LIBS += $(call EXPAND_LIBNAME, uuid ole32 oleaut32 ws2_32 comctl32 comdlg32 shell32 imm32 shlwapi winspool msimg32)
|
||||
|
||||
SHARED_LIBRARY_LIBS = \
|
||||
../windows/$(LIB_PREFIX)widget_windows.$(LIB_SUFFIX) \
|
||||
|
|
|
|||
|
|
@ -63,13 +63,9 @@
|
|||
|
||||
#include "nsClipboardHelper.h"
|
||||
|
||||
#ifdef WINCE
|
||||
#include "nsClipboardCE.h"
|
||||
#else
|
||||
#include "nsClipboard.h"
|
||||
#include "nsBidiKeyboard.h"
|
||||
#include "nsDragService.h"
|
||||
#endif
|
||||
#include "nsTransferable.h"
|
||||
#include "nsHTMLFormatConverter.h"
|
||||
|
||||
|
|
@ -110,10 +106,8 @@ NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(GfxInfo, Init);
|
|||
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsTransferable)
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsHTMLFormatConverter)
|
||||
#ifndef WINCE
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsDragService)
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsBidiKeyboard)
|
||||
#endif
|
||||
|
||||
#ifdef NS_PRINTING
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPrintOptionsWin, Init)
|
||||
|
|
@ -137,7 +131,7 @@ NS_DEFINE_NAMED_CID(NS_CLIPBOARDHELPER_CID);
|
|||
NS_DEFINE_NAMED_CID(NS_SOUND_CID);
|
||||
NS_DEFINE_NAMED_CID(NS_TRANSFERABLE_CID);
|
||||
NS_DEFINE_NAMED_CID(NS_HTMLFORMATCONVERTER_CID);
|
||||
#ifndef WINCE
|
||||
|
||||
#if MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_WIN7
|
||||
NS_DEFINE_NAMED_CID(NS_WIN_TASKBAR_CID);
|
||||
NS_DEFINE_NAMED_CID(NS_WIN_JUMPLISTBUILDER_CID);
|
||||
|
|
@ -146,9 +140,10 @@ NS_DEFINE_NAMED_CID(NS_WIN_JUMPLISTSEPARATOR_CID);
|
|||
NS_DEFINE_NAMED_CID(NS_WIN_JUMPLISTLINK_CID);
|
||||
NS_DEFINE_NAMED_CID(NS_WIN_JUMPLISTSHORTCUT_CID);
|
||||
#endif
|
||||
|
||||
NS_DEFINE_NAMED_CID(NS_DRAGSERVICE_CID);
|
||||
NS_DEFINE_NAMED_CID(NS_BIDIKEYBOARD_CID);
|
||||
#endif
|
||||
|
||||
#ifdef NS_PRINTING
|
||||
NS_DEFINE_NAMED_CID(NS_PRINTSETTINGSSERVICE_CID);
|
||||
NS_DEFINE_NAMED_CID(NS_PRINTER_ENUMERATOR_CID);
|
||||
|
|
@ -173,7 +168,6 @@ static const mozilla::Module::CIDEntry kWidgetCIDs[] = {
|
|||
{ &kNS_SOUND_CID, false, NULL, nsSoundConstructor },
|
||||
{ &kNS_TRANSFERABLE_CID, false, NULL, nsTransferableConstructor },
|
||||
{ &kNS_HTMLFORMATCONVERTER_CID, false, NULL, nsHTMLFormatConverterConstructor },
|
||||
#ifndef WINCE
|
||||
#if MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_WIN7
|
||||
{ &kNS_WIN_TASKBAR_CID, false, NULL, WinTaskbarConstructor },
|
||||
{ &kNS_WIN_JUMPLISTBUILDER_CID, false, NULL, JumpListBuilderConstructor },
|
||||
|
|
@ -184,7 +178,6 @@ static const mozilla::Module::CIDEntry kWidgetCIDs[] = {
|
|||
#endif
|
||||
{ &kNS_DRAGSERVICE_CID, false, NULL, nsDragServiceConstructor },
|
||||
{ &kNS_BIDIKEYBOARD_CID, false, NULL, nsBidiKeyboardConstructor },
|
||||
#endif
|
||||
#ifdef NS_PRINTING
|
||||
{ &kNS_PRINTSETTINGSSERVICE_CID, false, NULL, nsPrintOptionsWinConstructor },
|
||||
{ &kNS_PRINTER_ENUMERATOR_CID, false, NULL, nsPrinterEnumeratorWinConstructor },
|
||||
|
|
@ -210,7 +203,6 @@ static const mozilla::Module::ContractIDEntry kWidgetContracts[] = {
|
|||
{ "@mozilla.org/sound;1", &kNS_SOUND_CID },
|
||||
{ "@mozilla.org/widget/transferable;1", &kNS_TRANSFERABLE_CID },
|
||||
{ "@mozilla.org/widget/htmlformatconverter;1", &kNS_HTMLFORMATCONVERTER_CID },
|
||||
#ifndef WINCE
|
||||
#if MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_WIN7
|
||||
{ "@mozilla.org/windows-taskbar;1", &kNS_WIN_TASKBAR_CID },
|
||||
{ "@mozilla.org/windows-jumplistbuilder;1", &kNS_WIN_JUMPLISTBUILDER_CID },
|
||||
|
|
@ -221,7 +213,6 @@ static const mozilla::Module::ContractIDEntry kWidgetContracts[] = {
|
|||
#endif
|
||||
{ "@mozilla.org/widget/dragservice;1", &kNS_DRAGSERVICE_CID },
|
||||
{ "@mozilla.org/widget/bidikeyboard;1", &kNS_BIDIKEYBOARD_CID },
|
||||
#endif
|
||||
#ifdef NS_PRINTING
|
||||
{ "@mozilla.org/gfx/printsettings-service;1", &kNS_PRINTSETTINGSSERVICE_CID },
|
||||
{ "@mozilla.org/gfx/printerenumerator;1", &kNS_PRINTER_ENUMERATOR_CID },
|
||||
|
|
|
|||
|
|
@ -37,13 +37,7 @@
|
|||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
#include "resource.h"
|
||||
#ifdef WINCE
|
||||
#include "winuser.h"
|
||||
#include "aygshell.h"
|
||||
#define DS_CONTEXTHELP 0
|
||||
#else
|
||||
#include <winresrc.h>
|
||||
#endif
|
||||
#include <dlgs.h>
|
||||
|
||||
IDC_GRAB CURSOR DISCARDABLE "res/grab.cur"
|
||||
|
|
|
|||
|
|
@ -87,12 +87,6 @@ CPPSRCS += \
|
|||
$(NULL)
|
||||
endif
|
||||
|
||||
ifeq ($(OS_ARCH), WINCE)
|
||||
CPPSRCS += \
|
||||
nsWindowCE.cpp \
|
||||
nsClipboardCE.cpp \
|
||||
$(NULL)
|
||||
else
|
||||
CPPSRCS += \
|
||||
KeyboardLayout.cpp \
|
||||
IEnumFE.cpp \
|
||||
|
|
@ -108,7 +102,6 @@ CPPSRCS += \
|
|||
ifdef NS_ENABLE_TSF
|
||||
CPPSRCS += nsTextStore.cpp
|
||||
endif
|
||||
endif
|
||||
|
||||
|
||||
DEFINES += -D_IMPL_NS_WIDGET -DMOZ_UNICODE
|
||||
|
|
@ -138,10 +131,6 @@ LOCAL_INCLUDES = \
|
|||
|
||||
FORCE_STATIC_LIB = 1
|
||||
|
||||
ifdef WINCE
|
||||
EXTRA_DSO_LDOPTS += ddraw.lib
|
||||
endif
|
||||
|
||||
include $(topsrcdir)/config/config.mk
|
||||
include $(topsrcdir)/ipc/chromium/chromium-config.mk
|
||||
|
||||
|
|
|
|||
|
|
@ -52,22 +52,6 @@
|
|||
const PRUnichar* kAppShellEventId = L"nsAppShell:EventID";
|
||||
const PRUnichar* kTaskbarButtonEventId = L"TaskbarButtonCreated";
|
||||
|
||||
#ifdef WINCE
|
||||
BOOL WaitMessage(VOID)
|
||||
{
|
||||
BOOL retval = TRUE;
|
||||
|
||||
HANDLE hThread = GetCurrentThread();
|
||||
DWORD waitRes = MsgWaitForMultipleObjectsEx(1, &hThread, INFINITE, QS_ALLEVENTS, 0);
|
||||
if((DWORD)-1 == waitRes)
|
||||
{
|
||||
retval = FALSE;
|
||||
}
|
||||
|
||||
return retval;
|
||||
}
|
||||
#endif
|
||||
|
||||
static UINT sMsgId;
|
||||
|
||||
#if MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_WIN7
|
||||
|
|
|
|||
|
|
@ -38,9 +38,7 @@
|
|||
#include "nsDeviceContextSpecWin.h"
|
||||
#include "prmem.h"
|
||||
|
||||
#ifndef WINCE
|
||||
#include <winspool.h>
|
||||
#endif
|
||||
|
||||
#include <tchar.h>
|
||||
|
||||
|
|
@ -132,7 +130,6 @@ const NativePaperSizes kPaperSizes[] = {
|
|||
{DMPAPER_A4, 210.0, 297.0, PR_FALSE},
|
||||
{DMPAPER_B4, 250.0, 354.0, PR_FALSE},
|
||||
{DMPAPER_B5, 182.0, 257.0, PR_FALSE},
|
||||
#ifndef WINCE
|
||||
{DMPAPER_TABLOID, 11.0, 17.0, PR_TRUE},
|
||||
{DMPAPER_LEDGER, 17.0, 11.0, PR_TRUE},
|
||||
{DMPAPER_STATEMENT, 5.5, 8.5, PR_TRUE},
|
||||
|
|
@ -169,7 +166,6 @@ const NativePaperSizes kPaperSizes[] = {
|
|||
{DMPAPER_FANFOLD_US, 14.875, 11.0, PR_TRUE},
|
||||
{DMPAPER_FANFOLD_STD_GERMAN, 8.5, 12.0, PR_TRUE},
|
||||
{DMPAPER_FANFOLD_LGL_GERMAN, 8.5, 13.0, PR_TRUE},
|
||||
#endif // WINCE
|
||||
};
|
||||
const PRInt32 kNumPaperSizes = 41;
|
||||
|
||||
|
|
@ -218,9 +214,6 @@ static PRUnichar * GetDefaultPrinterNameFromGlobalPrinters()
|
|||
static nsresult
|
||||
EnumerateNativePrinters(DWORD aWhichPrinters, LPWSTR aPrinterName, PRBool& aIsFound, PRBool& aIsFile)
|
||||
{
|
||||
#ifdef WINCE
|
||||
aIsFound = PR_FALSE;
|
||||
#else
|
||||
DWORD dwSizeNeeded = 0;
|
||||
DWORD dwNumItems = 0;
|
||||
LPPRINTER_INFO_2W lpInfo = NULL;
|
||||
|
|
@ -252,7 +245,6 @@ EnumerateNativePrinters(DWORD aWhichPrinters, LPWSTR aPrinterName, PRBool& aIsFo
|
|||
}
|
||||
|
||||
free(lpInfo);
|
||||
#endif
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
|
@ -262,7 +254,6 @@ CheckForPrintToFileWithName(LPWSTR aPrinterName, PRBool& aIsFile)
|
|||
{
|
||||
PRBool isFound = PR_FALSE;
|
||||
aIsFile = PR_FALSE;
|
||||
#ifndef WINCE
|
||||
nsresult rv = EnumerateNativePrinters(PRINTER_ENUM_LOCAL, aPrinterName, isFound, aIsFile);
|
||||
if (isFound) return;
|
||||
|
||||
|
|
@ -274,7 +265,6 @@ CheckForPrintToFileWithName(LPWSTR aPrinterName, PRBool& aIsFile)
|
|||
|
||||
rv = EnumerateNativePrinters(PRINTER_ENUM_REMOTE, aPrinterName, isFound, aIsFile);
|
||||
if (isFound) return;
|
||||
#endif
|
||||
}
|
||||
|
||||
static nsresult
|
||||
|
|
@ -682,9 +672,6 @@ SetupDevModeFromSettings(LPDEVMODEW aDevMode, nsIPrintSettings* aPrintSettings)
|
|||
nsresult
|
||||
nsDeviceContextSpecWin::GetDataFromPrinter(const PRUnichar * aName, nsIPrintSettings* aPS)
|
||||
{
|
||||
#ifdef WINCE
|
||||
return NS_ERROR_NOT_IMPLEMENTED;
|
||||
#else
|
||||
nsresult rv = NS_ERROR_FAILURE;
|
||||
|
||||
if (!GlobalPrinters::GetInstance()->PrintersAreAllocated()) {
|
||||
|
|
@ -749,7 +736,6 @@ nsDeviceContextSpecWin::GetDataFromPrinter(const PRUnichar * aName, nsIPrintSett
|
|||
DISPLAY_LAST_ERROR
|
||||
}
|
||||
return rv;
|
||||
#endif // WINCE
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------------------
|
||||
|
|
@ -974,7 +960,6 @@ nsresult
|
|||
GlobalPrinters::EnumerateNativePrinters()
|
||||
{
|
||||
nsresult rv = NS_ERROR_GFX_PRINTER_NO_PRINTER_AVAILABLE;
|
||||
#ifndef WINCE
|
||||
PR_PL(("-----------------------\n"));
|
||||
PR_PL(("EnumerateNativePrinters\n"));
|
||||
|
||||
|
|
@ -1000,7 +985,6 @@ GlobalPrinters::EnumerateNativePrinters()
|
|||
rv = NS_OK;
|
||||
}
|
||||
PR_PL(("-----------------------\n"));
|
||||
#endif
|
||||
return rv;
|
||||
}
|
||||
|
||||
|
|
@ -1009,7 +993,6 @@ GlobalPrinters::EnumerateNativePrinters()
|
|||
void
|
||||
GlobalPrinters::GetDefaultPrinterName(nsString& aDefaultPrinterName)
|
||||
{
|
||||
#ifndef WINCE
|
||||
aDefaultPrinterName.Truncate();
|
||||
WCHAR szDefaultPrinterName[1024];
|
||||
DWORD status = GetProfileStringW(L"windows", L"device", 0,
|
||||
|
|
@ -1029,9 +1012,6 @@ GlobalPrinters::GetDefaultPrinterName(nsString& aDefaultPrinterName)
|
|||
}
|
||||
|
||||
PR_PL(("DEFAULT PRINTER [%s]\n", aDefaultPrinterName.get()));
|
||||
#else
|
||||
aDefaultPrinterName = NS_LITERAL_STRING("UNKNOWN");
|
||||
#endif
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -57,9 +57,7 @@
|
|||
|
||||
// commdlg.h and cderr.h are needed to build with WIN32_LEAN_AND_MEAN
|
||||
#include <commdlg.h>
|
||||
#ifndef WINCE
|
||||
#include <cderr.h>
|
||||
#endif
|
||||
|
||||
#include "nsString.h"
|
||||
#include "nsToolkit.h"
|
||||
|
|
@ -100,7 +98,6 @@ nsFilePicker::~nsFilePicker()
|
|||
//
|
||||
//-------------------------------------------------------------------------
|
||||
|
||||
#ifndef WINCE_WINDOWS_MOBILE
|
||||
int CALLBACK BrowseCallbackProc(HWND hwnd, UINT uMsg, LPARAM lParam, LPARAM lpData)
|
||||
{
|
||||
if (uMsg == BFFM_INITIALIZED)
|
||||
|
|
@ -113,7 +110,6 @@ int CALLBACK BrowseCallbackProc(HWND hwnd, UINT uMsg, LPARAM lParam, LPARAM lpDa
|
|||
}
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
NS_IMETHODIMP nsFilePicker::ShowW(PRInt16 *aReturnVal)
|
||||
{
|
||||
|
|
@ -144,8 +140,6 @@ NS_IMETHODIMP nsFilePicker::ShowW(PRInt16 *aReturnVal)
|
|||
|
||||
mUnicodeFile.Truncate();
|
||||
|
||||
#ifndef WINCE_WINDOWS_MOBILE
|
||||
|
||||
if (mMode == modeGetFolder) {
|
||||
PRUnichar dirBuffer[MAX_PATH+1];
|
||||
wcsncpy(dirBuffer, initialDir.get(), MAX_PATH);
|
||||
|
|
@ -183,7 +177,6 @@ NS_IMETHODIMP nsFilePicker::ShowW(PRInt16 *aReturnVal)
|
|||
}
|
||||
}
|
||||
else
|
||||
#endif // WINCE_WINDOWS_MOBILE
|
||||
{
|
||||
|
||||
OPENFILENAMEW ofn;
|
||||
|
|
@ -198,12 +191,7 @@ NS_IMETHODIMP nsFilePicker::ShowW(PRInt16 *aReturnVal)
|
|||
ofn.lpstrTitle = (LPCWSTR)mTitle.get();
|
||||
ofn.lpstrFilter = (LPCWSTR)filterBuffer.get();
|
||||
ofn.nFilterIndex = mSelectedType;
|
||||
#ifdef WINCE_WINDOWS_MOBILE
|
||||
// If we're running fullscreen the dialog inherits that, which is bad
|
||||
ofn.hwndOwner = (HWND) 0;
|
||||
#else
|
||||
ofn.hwndOwner = (HWND) (mParentWidget.get() ? mParentWidget->GetNativeData(NS_NATIVE_TMP_WINDOW) : 0);
|
||||
#endif
|
||||
ofn.lpstrFile = fileBuffer;
|
||||
ofn.nMaxFile = FILE_BUFFER_SIZE;
|
||||
|
||||
|
|
@ -235,9 +223,7 @@ NS_IMETHODIMP nsFilePicker::ShowW(PRInt16 *aReturnVal)
|
|||
}
|
||||
}
|
||||
|
||||
#ifndef WINCE
|
||||
MOZ_SEH_TRY {
|
||||
#endif
|
||||
if (mMode == modeOpen) {
|
||||
// FILE MUST EXIST!
|
||||
ofn.Flags |= OFN_FILEMUSTEXIST;
|
||||
|
|
@ -264,9 +250,7 @@ NS_IMETHODIMP nsFilePicker::ShowW(PRInt16 *aReturnVal)
|
|||
if (!result) {
|
||||
// Error, find out what kind.
|
||||
if (::GetLastError() == ERROR_INVALID_PARAMETER
|
||||
#ifndef WINCE
|
||||
|| ::CommDlgExtendedError() == FNERR_INVALIDFILENAME
|
||||
#endif
|
||||
) {
|
||||
// probably the default file name is too long or contains illegal characters!
|
||||
// Try again, without a starting file name.
|
||||
|
|
@ -275,16 +259,9 @@ NS_IMETHODIMP nsFilePicker::ShowW(PRInt16 *aReturnVal)
|
|||
}
|
||||
}
|
||||
}
|
||||
#ifdef WINCE_WINDOWS_MOBILE
|
||||
else if (mMode == modeGetFolder) {
|
||||
ofn.Flags = OFN_PROJECT | OFN_FILEMUSTEXIST;
|
||||
result = ::GetOpenFileNameW(&ofn);
|
||||
}
|
||||
#endif
|
||||
else {
|
||||
NS_ERROR("unsupported mode");
|
||||
}
|
||||
#ifndef WINCE
|
||||
}
|
||||
MOZ_SEH_EXCEPT(PR_TRUE) {
|
||||
MessageBoxW(ofn.hwndOwner,
|
||||
|
|
@ -293,7 +270,6 @@ NS_IMETHODIMP nsFilePicker::ShowW(PRInt16 *aReturnVal)
|
|||
MB_ICONERROR);
|
||||
result = PR_FALSE;
|
||||
}
|
||||
#endif
|
||||
|
||||
if (result) {
|
||||
// Remember what filter type the user selected
|
||||
|
|
|
|||
|
|
@ -92,10 +92,8 @@ PRPackedBool nsIMM32Handler::sIsStatusChanged = PR_FALSE;
|
|||
PRPackedBool nsIMM32Handler::sIsIME = PR_TRUE;
|
||||
PRPackedBool nsIMM32Handler::sIsIMEOpening = PR_FALSE;
|
||||
|
||||
#ifndef WINCE
|
||||
UINT nsIMM32Handler::sCodePage = 0;
|
||||
DWORD nsIMM32Handler::sIMEProperty = 0;
|
||||
#endif
|
||||
|
||||
/* static */ void
|
||||
nsIMM32Handler::EnsureHandlerInstance()
|
||||
|
|
@ -197,22 +195,16 @@ nsIMM32Handler::IsDoingKakuteiUndo(HWND aWnd)
|
|||
/* static */ PRBool
|
||||
nsIMM32Handler::ShouldDrawCompositionStringOurselves()
|
||||
{
|
||||
#ifdef WINCE
|
||||
// We are not sure we should use native IME behavior...
|
||||
return PR_TRUE;
|
||||
#else
|
||||
// If current IME has special UI or its composition window should not
|
||||
// positioned to caret position, we should now draw composition string
|
||||
// ourselves.
|
||||
return !(sIMEProperty & IME_PROP_SPECIAL_UI) &&
|
||||
(sIMEProperty & IME_PROP_AT_CARET);
|
||||
#endif
|
||||
}
|
||||
|
||||
/* static */ void
|
||||
nsIMM32Handler::InitKeyboardLayout(HKL aKeyboardLayout)
|
||||
{
|
||||
#ifndef WINCE
|
||||
WORD langID = LOWORD(aKeyboardLayout);
|
||||
::GetLocaleInfoW(MAKELCID(langID, SORT_DEFAULT),
|
||||
LOCALE_IDEFAULTANSICODEPAGE | LOCALE_RETURN_NUMBER,
|
||||
|
|
@ -222,32 +214,23 @@ nsIMM32Handler::InitKeyboardLayout(HKL aKeyboardLayout)
|
|||
PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
|
||||
("IMM32: InitKeyboardLayout, aKeyboardLayout=%08x, sCodePage=%lu, sIMEProperty=%08x sIsIME=%s\n",
|
||||
aKeyboardLayout, sCodePage, sIMEProperty, sIsIME ? "TRUE" : "FALSE"));
|
||||
#endif
|
||||
}
|
||||
|
||||
/* static */ UINT
|
||||
nsIMM32Handler::GetKeyboardCodePage()
|
||||
{
|
||||
#ifdef WINCE
|
||||
return ::GetACP();
|
||||
#else
|
||||
return sCodePage;
|
||||
#endif
|
||||
}
|
||||
|
||||
/* static */ PRBool
|
||||
nsIMM32Handler::CanOptimizeKeyAndIMEMessages(MSG *aNextKeyOrIMEMessage)
|
||||
{
|
||||
#ifdef WINCE
|
||||
return PR_TRUE;
|
||||
#else
|
||||
// If IME is opening right now, we shouldn't optimize the key and IME message
|
||||
// order because ATOK (Japanese IME of third party) has some problem with the
|
||||
// optimization. When it finishes opening completely, it eats all key
|
||||
// messages in the message queue. And it causes starting composition. So,
|
||||
// we shouldn't eat the key messages before ATOK.
|
||||
return !sIsIMEOpening;
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -1189,7 +1172,6 @@ nsIMM32Handler::HandleComposition(nsWindow* aWindow,
|
|||
nsresult rv = EnsureClauseArray(clauseArrayLength);
|
||||
NS_ENSURE_SUCCESS(rv, PR_FALSE);
|
||||
|
||||
#ifndef WINCE
|
||||
// Intelligent ABC IME (Simplified Chinese IME, the code page is 936)
|
||||
// will crash in ImmGetCompositionStringW for GCS_COMPCLAUSE (bug 424663).
|
||||
// See comment 35 of the bug for the detail. Therefore, we should use A
|
||||
|
|
@ -1199,15 +1181,12 @@ nsIMM32Handler::HandleComposition(nsWindow* aWindow,
|
|||
PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
|
||||
("IMM32: HandleComposition, GCS_COMPCLAUSE, useA_API=%s\n",
|
||||
useA_API ? "TRUE" : "FALSE"));
|
||||
#endif
|
||||
|
||||
long clauseArrayLength2 =
|
||||
#ifndef WINCE
|
||||
useA_API ?
|
||||
::ImmGetCompositionStringA(aIMEContext.get(), GCS_COMPCLAUSE,
|
||||
mClauseArray.Elements(),
|
||||
mClauseArray.Capacity() * sizeof(PRUint32)) :
|
||||
#endif
|
||||
::ImmGetCompositionStringW(aIMEContext.get(), GCS_COMPCLAUSE,
|
||||
mClauseArray.Elements(),
|
||||
mClauseArray.Capacity() * sizeof(PRUint32));
|
||||
|
|
@ -1221,7 +1200,6 @@ nsIMM32Handler::HandleComposition(nsWindow* aWindow,
|
|||
clauseArrayLength = clauseArrayLength2;
|
||||
}
|
||||
|
||||
#ifndef WINCE
|
||||
if (useA_API) {
|
||||
// Convert each values of sIMECompClauseArray. The values mean offset of
|
||||
// the clauses in ANSI string. But we need the values in Unicode string.
|
||||
|
|
@ -1239,7 +1217,6 @@ nsIMM32Handler::HandleComposition(nsWindow* aWindow,
|
|||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
// compClauseArrayLength may be negative. I.e., ImmGetCompositionStringW
|
||||
// may return an error code.
|
||||
|
|
|
|||
|
|
@ -57,9 +57,7 @@ class nsIWidget;
|
|||
class nsWindow;
|
||||
struct nsIntRect;
|
||||
|
||||
#ifndef WINCE
|
||||
#define ENABLE_IME_MOUSE_HANDLING 1
|
||||
#endif // WINCE
|
||||
|
||||
#define NS_WM_IMEFIRST WM_IME_SETCONTEXT
|
||||
#define NS_WM_IMELAST WM_IME_KEYUP
|
||||
|
|
@ -334,10 +332,8 @@ protected:
|
|||
static PRPackedBool sIsIME;
|
||||
static PRPackedBool sIsIMEOpening;
|
||||
|
||||
#ifndef WINCE
|
||||
static UINT sCodePage;
|
||||
static DWORD sIMEProperty;
|
||||
#endif // #ifndef WINCE
|
||||
};
|
||||
|
||||
#endif // nsIMM32Handler_h__
|
||||
|
|
|
|||
|
|
@ -46,7 +46,6 @@ NS_IMPL_ISUPPORTS2(nsIdleServiceWin, nsIIdleService, nsIdleService)
|
|||
bool
|
||||
nsIdleServiceWin::PollIdleTime(PRUint32 *aIdleTime)
|
||||
{
|
||||
#ifndef WINCE
|
||||
LASTINPUTINFO inputInfo;
|
||||
inputInfo.cbSize = sizeof(inputInfo);
|
||||
if (!::GetLastInputInfo(&inputInfo))
|
||||
|
|
@ -55,19 +54,10 @@ nsIdleServiceWin::PollIdleTime(PRUint32 *aIdleTime)
|
|||
*aIdleTime = SAFE_COMPARE_EVEN_WITH_WRAPPING(GetTickCount(), inputInfo.dwTime);
|
||||
|
||||
return true;
|
||||
#else
|
||||
// On WinCE we don't pull the idle time from the system.
|
||||
return false;
|
||||
#endif
|
||||
}
|
||||
|
||||
bool
|
||||
nsIdleServiceWin::UsePollMode()
|
||||
{
|
||||
#ifndef WINCE
|
||||
return true;
|
||||
#else
|
||||
// On WinCE we don't pull the idle time from the system.
|
||||
return false;
|
||||
#endif
|
||||
}
|
||||
|
|
|
|||
|
|
@ -45,8 +45,6 @@
|
|||
#include <shellapi.h>
|
||||
#include "nsWindow.h"
|
||||
#include "nsStyleConsts.h"
|
||||
|
||||
#ifndef WINCE
|
||||
#include "nsUXThemeData.h"
|
||||
#include "nsUXThemeConstants.h"
|
||||
|
||||
|
|
@ -69,7 +67,6 @@ static nsresult GetColorFromTheme(nsUXThemeClass cls,
|
|||
}
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
#endif
|
||||
|
||||
static PRInt32 GetSystemParam(long flag, PRInt32 def)
|
||||
{
|
||||
|
|
@ -79,26 +76,22 @@ static PRInt32 GetSystemParam(long flag, PRInt32 def)
|
|||
|
||||
nsLookAndFeel::nsLookAndFeel() : nsXPLookAndFeel()
|
||||
{
|
||||
#ifndef WINCE
|
||||
gShell32DLLInst = LoadLibraryW(L"Shell32.dll");
|
||||
if (gShell32DLLInst)
|
||||
{
|
||||
gSHAppBarMessage = (SHAppBarMessagePtr) GetProcAddress(gShell32DLLInst,
|
||||
"SHAppBarMessage");
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
nsLookAndFeel::~nsLookAndFeel()
|
||||
{
|
||||
#ifndef WINCE
|
||||
if (gShell32DLLInst)
|
||||
{
|
||||
FreeLibrary(gShell32DLLInst);
|
||||
gShell32DLLInst = NULL;
|
||||
gSHAppBarMessage = NULL;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
nsresult nsLookAndFeel::NativeGetColor(const nsColorID aID, nscolor &aColor)
|
||||
|
|
@ -206,7 +199,6 @@ nsresult nsLookAndFeel::NativeGetColor(const nsColorID aID, nscolor &aColor)
|
|||
idx = COLOR_HIGHLIGHT;
|
||||
break;
|
||||
case eColor__moz_menubarhovertext:
|
||||
#ifndef WINCE
|
||||
if (!nsUXThemeData::sIsVistaOrLater || !nsUXThemeData::isAppThemed())
|
||||
{
|
||||
idx = nsUXThemeData::sFlatMenus ?
|
||||
|
|
@ -214,10 +206,8 @@ nsresult nsLookAndFeel::NativeGetColor(const nsColorID aID, nscolor &aColor)
|
|||
COLOR_MENUTEXT;
|
||||
break;
|
||||
}
|
||||
#endif
|
||||
// Fall through
|
||||
case eColor__moz_menuhovertext:
|
||||
#ifndef WINCE
|
||||
if (nsUXThemeData::IsAppThemed() && nsUXThemeData::sIsVistaOrLater)
|
||||
{
|
||||
res = ::GetColorFromTheme(eUXMenu,
|
||||
|
|
@ -226,7 +216,6 @@ nsresult nsLookAndFeel::NativeGetColor(const nsColorID aID, nscolor &aColor)
|
|||
return res;
|
||||
// fall through to highlight case
|
||||
}
|
||||
#endif
|
||||
case eColor_highlighttext:
|
||||
case eColor__moz_html_cellhighlighttext:
|
||||
idx = COLOR_HIGHLIGHTTEXT;
|
||||
|
|
@ -295,19 +284,16 @@ nsresult nsLookAndFeel::NativeGetColor(const nsColorID aID, nscolor &aColor)
|
|||
idx = COLOR_3DFACE;
|
||||
break;
|
||||
case eColor__moz_win_mediatext:
|
||||
#ifndef WINCE
|
||||
if (nsUXThemeData::IsAppThemed() && nsUXThemeData::sIsVistaOrLater) {
|
||||
res = ::GetColorFromTheme(eUXMediaToolbar,
|
||||
TP_BUTTON, TS_NORMAL, TMT_TEXTCOLOR, aColor);
|
||||
if (NS_SUCCEEDED(res))
|
||||
return res;
|
||||
}
|
||||
#endif
|
||||
// if we've gotten here just return -moz-dialogtext instead
|
||||
idx = COLOR_WINDOWTEXT;
|
||||
break;
|
||||
case eColor__moz_win_communicationstext:
|
||||
#ifndef WINCE
|
||||
if (nsUXThemeData::IsAppThemed() && nsUXThemeData::sIsVistaOrLater)
|
||||
{
|
||||
res = ::GetColorFromTheme(eUXCommunicationsToolbar,
|
||||
|
|
@ -315,7 +301,6 @@ nsresult nsLookAndFeel::NativeGetColor(const nsColorID aID, nscolor &aColor)
|
|||
if (NS_SUCCEEDED(res))
|
||||
return res;
|
||||
}
|
||||
#endif
|
||||
// if we've gotten here just return -moz-dialogtext instead
|
||||
idx = COLOR_WINDOWTEXT;
|
||||
break;
|
||||
|
|
@ -330,12 +315,7 @@ nsresult nsLookAndFeel::NativeGetColor(const nsColorID aID, nscolor &aColor)
|
|||
idx = COLOR_3DDKSHADOW;
|
||||
break;
|
||||
case eColor__moz_nativehyperlinktext:
|
||||
#ifndef WINCE
|
||||
idx = COLOR_HOTLIGHT;
|
||||
#else
|
||||
aColor = NS_RGB(0, 0, 0xee);
|
||||
return NS_OK;
|
||||
#endif
|
||||
break;
|
||||
default:
|
||||
idx = COLOR_WINDOW;
|
||||
|
|
@ -373,17 +353,12 @@ NS_IMETHODIMP nsLookAndFeel::GetMetric(const nsMetricID aID, PRInt32 & aMetric)
|
|||
case eMetric_SubmenuDelay:
|
||||
// This will default to the Windows' default
|
||||
// (400ms) on error.
|
||||
#ifndef WINCE
|
||||
aMetric = GetSystemParam(SPI_GETMENUSHOWDELAY, 400);
|
||||
#else
|
||||
aMetric = 400;
|
||||
#endif
|
||||
break;
|
||||
case eMetric_MenusCanOverlapOSBar:
|
||||
// we want XUL popups to be able to overlap the task bar.
|
||||
aMetric = 1;
|
||||
break;
|
||||
#ifndef WINCE
|
||||
case eMetric_DragThresholdX:
|
||||
// The system metric is the number of pixels at which a drag should
|
||||
// start. Our look and feel metric is the number of pixels you can
|
||||
|
|
@ -404,7 +379,6 @@ NS_IMETHODIMP nsLookAndFeel::GetMetric(const nsMetricID aID, PRInt32 & aMetric)
|
|||
|
||||
aMetric = ((contrastThemeInfo.dwFlags & HCF_HIGHCONTRASTON) != 0);
|
||||
break;
|
||||
#endif
|
||||
case eMetric_ScrollArrowStyle:
|
||||
aMetric = eMetric_ScrollArrowStyleSingle;
|
||||
break;
|
||||
|
|
@ -427,28 +401,16 @@ NS_IMETHODIMP nsLookAndFeel::GetMetric(const nsMetricID aID, PRInt32 & aMetric)
|
|||
aMetric = 3;
|
||||
break;
|
||||
case eMetric_WindowsClassic:
|
||||
#ifndef WINCE
|
||||
aMetric = !nsUXThemeData::IsAppThemed();
|
||||
#else
|
||||
aMetric = 0;
|
||||
#endif
|
||||
break;
|
||||
case eMetric_TouchEnabled:
|
||||
aMetric = 0;
|
||||
#ifndef WINCE
|
||||
PRInt32 touchCapabilities;
|
||||
touchCapabilities = ::GetSystemMetrics(SM_DIGITIZER);
|
||||
if ((touchCapabilities & NID_READY) &&
|
||||
(touchCapabilities & (NID_EXTERNAL_TOUCH | NID_INTEGRATED_TOUCH))) {
|
||||
aMetric = 1;
|
||||
}
|
||||
#elif defined(WINCE_WINDOWS_MOBILE)
|
||||
WCHAR platformType[MAX_PATH];
|
||||
SystemParametersInfo(SPI_GETPLATFORMTYPE, sizeof(platformType),
|
||||
platformType, 0);
|
||||
if (!wcscmp(platformType, L"PocketPC"))
|
||||
aMetric = 1;
|
||||
#endif
|
||||
break;
|
||||
case eMetric_WindowsDefaultTheme:
|
||||
aMetric = nsUXThemeData::IsDefaultWindowTheme();
|
||||
|
|
@ -462,15 +424,10 @@ NS_IMETHODIMP nsLookAndFeel::GetMetric(const nsMetricID aID, PRInt32 & aMetric)
|
|||
res = NS_ERROR_NOT_IMPLEMENTED;
|
||||
break;
|
||||
case eMetric_DWMCompositor:
|
||||
#ifndef WINCE
|
||||
aMetric = nsUXThemeData::CheckForCompositor();
|
||||
#else
|
||||
aMetric = 0;
|
||||
#endif
|
||||
break;
|
||||
case eMetric_AlertNotificationOrigin:
|
||||
aMetric = 0;
|
||||
#ifndef WINCE
|
||||
if (gSHAppBarMessage)
|
||||
{
|
||||
// Get task bar window handle
|
||||
|
|
@ -508,7 +465,6 @@ NS_IMETHODIMP nsLookAndFeel::GetMetric(const nsMetricID aID, PRInt32 & aMetric)
|
|||
}
|
||||
}
|
||||
}
|
||||
#endif // WINCE
|
||||
break;
|
||||
case eMetric_IMERawInputUnderlineStyle:
|
||||
case eMetric_IMEConvertedTextUnderlineStyle:
|
||||
|
|
@ -553,9 +509,6 @@ NS_IMETHODIMP nsLookAndFeel::GetMetric(const nsMetricFloatID aID, float & aMetri
|
|||
PRUnichar nsLookAndFeel::GetPasswordCharacter()
|
||||
{
|
||||
#define UNICODE_BLACK_CIRCLE_CHAR 0x25cf
|
||||
#ifdef WINCE
|
||||
return UNICODE_BLACK_CIRCLE_CHAR;
|
||||
#else
|
||||
static PRUnichar passwordCharacter = 0;
|
||||
if (!passwordCharacter) {
|
||||
passwordCharacter = '*';
|
||||
|
|
@ -563,7 +516,6 @@ PRUnichar nsLookAndFeel::GetPasswordCharacter()
|
|||
passwordCharacter = UNICODE_BLACK_CIRCLE_CHAR;
|
||||
}
|
||||
return passwordCharacter;
|
||||
#endif
|
||||
}
|
||||
|
||||
#ifdef NS_DEBUG
|
||||
|
|
|
|||
|
|
@ -73,48 +73,6 @@
|
|||
|
||||
NS_IMPL_ISUPPORTS_INHERITED1(nsNativeThemeWin, nsNativeTheme, nsITheme)
|
||||
|
||||
#ifdef WINCE
|
||||
|
||||
/* These functions might or might not be present; FrameRect probably isn't,
|
||||
* but GetViewportOrgEx might be -- so #define them to avoid name collisions.
|
||||
*/
|
||||
|
||||
#define FrameRect moz_FrameRect
|
||||
#define GetViewportOrgEx moz_GetViewportOrgEx
|
||||
|
||||
static int FrameRect(HDC inDC, CONST RECT *inRect, HBRUSH inBrush)
|
||||
{
|
||||
HBRUSH oldBrush = (HBRUSH)SelectObject(inDC, inBrush);
|
||||
RECT myRect = *inRect;
|
||||
InflateRect(&myRect, 1, 1);
|
||||
|
||||
// The width and height of the border are always one
|
||||
// logical unit.
|
||||
|
||||
// move to top-left, and go clockwise.
|
||||
MoveToEx(inDC, myRect.left, myRect.top, (LPPOINT) NULL);
|
||||
// 1 -> 2
|
||||
LineTo(inDC, myRect.right, myRect.top);
|
||||
// 2 -> 3
|
||||
LineTo(inDC, myRect.right, myRect.bottom);
|
||||
// 3 -> 4
|
||||
LineTo(inDC, myRect.left, myRect.bottom);
|
||||
// 4 -> 1
|
||||
LineTo(inDC, myRect.left, myRect.top);
|
||||
|
||||
SelectObject(inDC, oldBrush);
|
||||
return 1;
|
||||
}
|
||||
|
||||
static BOOL GetViewportOrgEx(HDC hdc, LPPOINT lpPoint)
|
||||
{
|
||||
SetViewportOrgEx(hdc, 0, 0, lpPoint);
|
||||
if (lpPoint->x != 0 || lpPoint->y != 0)
|
||||
SetViewportOrgEx(hdc, lpPoint->x, lpPoint->y, NULL);
|
||||
return TRUE;
|
||||
}
|
||||
#endif
|
||||
|
||||
static inline PRBool IsHTMLContent(nsIFrame *frame)
|
||||
{
|
||||
nsIContent* content = frame->GetContent();
|
||||
|
|
@ -1470,7 +1428,6 @@ RENDER_AGAIN:
|
|||
::GetViewportOrgEx(hdc, &vpOrg);
|
||||
::SetBrushOrgEx(hdc, vpOrg.x + widgetRect.left, vpOrg.y + widgetRect.top, NULL);
|
||||
|
||||
#ifndef WINCE
|
||||
// On vista, choose our own colors and draw an XP style half focus rect
|
||||
// for focused checkboxes and a full rect when active.
|
||||
if (nsUXThemeData::sIsVistaOrLater && aWidgetType == NS_THEME_CHECKBOX) {
|
||||
|
|
@ -1497,10 +1454,6 @@ RENDER_AGAIN:
|
|||
::SetTextColor(hdc, 0);
|
||||
::DrawFocusRect(hdc, &widgetRect);
|
||||
}
|
||||
#else
|
||||
::SetTextColor(hdc, 0);
|
||||
::DrawFocusRect(hdc, &widgetRect);
|
||||
#endif
|
||||
::RestoreDC(hdc, id);
|
||||
if (hPen) {
|
||||
::DeleteObject(hPen);
|
||||
|
|
@ -2439,13 +2392,8 @@ nsNativeThemeWin::ClassicGetMinimumWidgetSize(nsRenderingContext* aContext, nsIF
|
|||
case NS_THEME_MENUCHECKBOX:
|
||||
case NS_THEME_MENURADIO:
|
||||
case NS_THEME_MENUARROW:
|
||||
#ifdef WINCE
|
||||
(*aResult).width = 16;
|
||||
(*aResult).height = 16;
|
||||
#else
|
||||
(*aResult).width = ::GetSystemMetrics(SM_CXMENUCHECK);
|
||||
(*aResult).height = ::GetSystemMetrics(SM_CYMENUCHECK);
|
||||
#endif
|
||||
break;
|
||||
case NS_THEME_SCROLLBAR_BUTTON_UP:
|
||||
case NS_THEME_SCROLLBAR_BUTTON_DOWN:
|
||||
|
|
@ -2501,24 +2449,17 @@ nsNativeThemeWin::ClassicGetMinimumWidgetSize(nsRenderingContext* aContext, nsIF
|
|||
// no minimum widget size
|
||||
break;
|
||||
case NS_THEME_RESIZER: {
|
||||
#ifndef WINCE
|
||||
NONCLIENTMETRICS nc;
|
||||
nc.cbSize = sizeof(nc);
|
||||
if (SystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(nc), &nc, 0))
|
||||
(*aResult).width = (*aResult).height = abs(nc.lfStatusFont.lfHeight) + 4;
|
||||
else
|
||||
#endif
|
||||
(*aResult).width = (*aResult).height = 15;
|
||||
*aIsOverridable = PR_FALSE;
|
||||
break;
|
||||
case NS_THEME_SCROLLBAR_THUMB_VERTICAL:
|
||||
#ifndef WINCE
|
||||
(*aResult).width = ::GetSystemMetrics(SM_CXVSCROLL);
|
||||
(*aResult).height = ::GetSystemMetrics(SM_CYVTHUMB);
|
||||
#else
|
||||
(*aResult).width = 15;
|
||||
(*aResult).height = 15;
|
||||
#endif
|
||||
// Without theming, divide the thumb size by two in order to look more
|
||||
// native
|
||||
if (!GetTheme(aWidgetType))
|
||||
|
|
@ -2526,13 +2467,8 @@ nsNativeThemeWin::ClassicGetMinimumWidgetSize(nsRenderingContext* aContext, nsIF
|
|||
*aIsOverridable = PR_FALSE;
|
||||
break;
|
||||
case NS_THEME_SCROLLBAR_THUMB_HORIZONTAL:
|
||||
#ifndef WINCE
|
||||
(*aResult).width = ::GetSystemMetrics(SM_CXHTHUMB);
|
||||
(*aResult).height = ::GetSystemMetrics(SM_CYHSCROLL);
|
||||
#else
|
||||
(*aResult).width = 15;
|
||||
(*aResult).height = 15;
|
||||
#endif
|
||||
// Without theming, divide the thumb size by two in order to look more
|
||||
// native
|
||||
if (!GetTheme(aWidgetType))
|
||||
|
|
@ -2540,11 +2476,7 @@ nsNativeThemeWin::ClassicGetMinimumWidgetSize(nsRenderingContext* aContext, nsIF
|
|||
*aIsOverridable = PR_FALSE;
|
||||
break;
|
||||
case NS_THEME_SCROLLBAR_TRACK_HORIZONTAL:
|
||||
#ifndef WINCE
|
||||
(*aResult).width = ::GetSystemMetrics(SM_CXHTHUMB) << 1;
|
||||
#else
|
||||
(*aResult).width = 10;
|
||||
#endif
|
||||
break;
|
||||
}
|
||||
case NS_THEME_MENUSEPARATOR:
|
||||
|
|
@ -2624,10 +2556,9 @@ nsresult nsNativeThemeWin::ClassicGetThemePartAndState(nsIFrame* aFrame, PRUint8
|
|||
const nsStyleUserInterface *uiData = aFrame->GetStyleUserInterface();
|
||||
// The down state is flat if the button is focusable
|
||||
if (uiData->mUserFocus == NS_STYLE_USER_FOCUS_NORMAL) {
|
||||
#ifndef WINCE
|
||||
if (!aFrame->GetContent()->IsHTML())
|
||||
aState |= DFCS_FLAT;
|
||||
#endif
|
||||
|
||||
aFocused = PR_TRUE;
|
||||
}
|
||||
}
|
||||
|
|
@ -2789,7 +2720,6 @@ nsresult nsNativeThemeWin::ClassicGetThemePartAndState(nsIFrame* aFrame, PRUint8
|
|||
return NS_OK;
|
||||
}
|
||||
|
||||
#ifndef WINCE
|
||||
if (isHTML) {
|
||||
nsIComboboxControlFrame* ccf = do_QueryFrame(aFrame);
|
||||
isOpen = (ccf && ccf->IsDroppedDown());
|
||||
|
|
@ -2805,7 +2735,6 @@ nsresult nsNativeThemeWin::ClassicGetThemePartAndState(nsIFrame* aFrame, PRUint8
|
|||
// Dropdown button active state doesn't need :hover.
|
||||
if (eventState.HasState(NS_EVENT_STATE_ACTIVE))
|
||||
aState |= DFCS_PUSHED | DFCS_FLAT;
|
||||
#endif
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
|
@ -2834,10 +2763,8 @@ nsresult nsNativeThemeWin::ClassicGetThemePartAndState(nsIFrame* aFrame, PRUint8
|
|||
if (IsDisabled(aFrame, contentState))
|
||||
aState |= DFCS_INACTIVE;
|
||||
else {
|
||||
#ifndef WINCE
|
||||
if (contentState.HasAllStates(NS_EVENT_STATE_HOVER | NS_EVENT_STATE_ACTIVE))
|
||||
aState |= DFCS_PUSHED | DFCS_FLAT;
|
||||
#endif
|
||||
}
|
||||
|
||||
return NS_OK;
|
||||
|
|
@ -2867,12 +2794,8 @@ nsresult nsNativeThemeWin::ClassicGetThemePartAndState(nsIFrame* aFrame, PRUint8
|
|||
}
|
||||
case NS_THEME_RESIZER:
|
||||
aPart = DFC_SCROLL;
|
||||
#ifndef WINCE
|
||||
aState = (IsFrameRTL(aFrame)) ?
|
||||
DFCS_SCROLLSIZEGRIPRIGHT : DFCS_SCROLLSIZEGRIP;
|
||||
#else
|
||||
aState = 0;
|
||||
#endif
|
||||
return NS_OK;
|
||||
case NS_THEME_MENUSEPARATOR:
|
||||
aPart = 0;
|
||||
|
|
@ -3016,7 +2939,6 @@ static void DrawTab(HDC hdc, const RECT& R, PRInt32 aPosition, PRBool aSelected,
|
|||
::DrawEdge(hdc, &shadeRect, EDGE_RAISED, BF_SOFT | shadeFlag);
|
||||
}
|
||||
|
||||
#ifndef WINCE
|
||||
static void DrawMenuImage(HDC hdc, const RECT& rc, PRInt32 aComponent, PRUint32 aColor)
|
||||
{
|
||||
// This procedure creates a memory bitmap to contain the check mark, draws
|
||||
|
|
@ -3063,7 +2985,6 @@ static void DrawMenuImage(HDC hdc, const RECT& rc, PRInt32 aComponent, PRUint32
|
|||
::DeleteDC(hMemoryDC);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
void nsNativeThemeWin::DrawCheckedRect(HDC hdc, const RECT& rc, PRInt32 fore, PRInt32 back,
|
||||
HBRUSH defaultBack)
|
||||
|
|
@ -3080,9 +3001,7 @@ void nsNativeThemeWin::DrawCheckedRect(HDC hdc, const RECT& rc, PRInt32 fore, PR
|
|||
COLORREF oldBackColor = ::SetBkColor(hdc, ::GetSysColor(back));
|
||||
POINT vpOrg;
|
||||
|
||||
#ifndef WINCE
|
||||
::UnrealizeObject(brush);
|
||||
#endif
|
||||
::GetViewportOrgEx(hdc, &vpOrg);
|
||||
::SetBrushOrgEx(hdc, vpOrg.x + rc.left, vpOrg.y + rc.top, NULL);
|
||||
HBRUSH oldBrush = (HBRUSH) ::SelectObject(hdc, brush);
|
||||
|
|
@ -3357,7 +3276,6 @@ RENDER_AGAIN:
|
|||
}
|
||||
}
|
||||
break;
|
||||
#ifndef WINCE
|
||||
case NS_THEME_MENUCHECKBOX:
|
||||
case NS_THEME_MENURADIO:
|
||||
if (!(state & DFCS_CHECKED))
|
||||
|
|
@ -3394,7 +3312,6 @@ RENDER_AGAIN:
|
|||
::FillRect(hdc, &widgetRect, (HBRUSH)(COLOR_3DHILIGHT+1));
|
||||
break;
|
||||
}
|
||||
#endif
|
||||
|
||||
case NS_THEME_WINDOW_TITLEBAR:
|
||||
case NS_THEME_WINDOW_TITLEBAR_MAXIMIZED:
|
||||
|
|
|
|||
|
|
@ -47,13 +47,6 @@
|
|||
|
||||
#include "nsScreenWin.h"
|
||||
|
||||
#ifdef WINCE
|
||||
#ifdef WINCE_WINDOWS_MOBILE
|
||||
#include "sipapi.h"
|
||||
#endif
|
||||
#define GetMonitorInfoW GetMonitorInfo
|
||||
#endif
|
||||
|
||||
|
||||
nsScreenWin :: nsScreenWin ( void* inScreen )
|
||||
: mScreen(inScreen)
|
||||
|
|
@ -117,18 +110,6 @@ NS_IMETHODIMP
|
|||
nsScreenWin :: GetAvailRect(PRInt32 *outLeft, PRInt32 *outTop, PRInt32 *outWidth, PRInt32 *outHeight)
|
||||
{
|
||||
BOOL success = FALSE;
|
||||
#ifdef WINCE_WINDOWS_MOBILE
|
||||
SIPINFO sipInfo;
|
||||
memset(&sipInfo, 0, sizeof(SIPINFO));
|
||||
sipInfo.cbSize = sizeof(SIPINFO);
|
||||
if (SipGetInfo(&sipInfo) && !(sipInfo.fdwFlags & SIPF_OFF)) {
|
||||
*outLeft = sipInfo.rcVisibleDesktop.left;
|
||||
*outTop = sipInfo.rcVisibleDesktop.top;
|
||||
*outWidth = sipInfo.rcVisibleDesktop.right - sipInfo.rcVisibleDesktop.left;
|
||||
*outHeight = sipInfo.rcVisibleDesktop.bottom - sipInfo.rcVisibleDesktop.top;
|
||||
return NS_OK;
|
||||
}
|
||||
#endif
|
||||
|
||||
#if _MSC_VER >= 1200
|
||||
if ( mScreen ) {
|
||||
|
|
|
|||
|
|
@ -49,9 +49,7 @@
|
|||
#include <objbase.h>
|
||||
#include <initguid.h>
|
||||
|
||||
#ifndef WINCE
|
||||
#include "nsUXThemeData.h"
|
||||
#endif
|
||||
|
||||
// unknwn.h is needed to build with WIN32_LEAN_AND_MEAN
|
||||
#include <unknwn.h>
|
||||
|
|
@ -87,9 +85,6 @@ StartAllowingD3D9(nsITimer *aTimer, void *aClosure)
|
|||
extern "C" {
|
||||
#endif
|
||||
|
||||
// Windows CE is created when nsToolkit
|
||||
// starts up, not when the dll is loaded.
|
||||
#ifndef WINCE
|
||||
BOOL APIENTRY DllMain( HINSTANCE hModule,
|
||||
DWORD reason,
|
||||
LPVOID lpReserved )
|
||||
|
|
@ -113,7 +108,6 @@ BOOL APIENTRY DllMain( HINSTANCE hModule,
|
|||
|
||||
return TRUE;
|
||||
}
|
||||
#endif //#ifndef WINCE
|
||||
|
||||
#if defined(__GNUC__)
|
||||
} // extern "C"
|
||||
|
|
@ -166,7 +160,7 @@ nsToolkit::nsToolkit()
|
|||
mGuiThread = NULL;
|
||||
mDispatchWnd = 0;
|
||||
|
||||
#if defined(MOZ_STATIC_COMPONENT_LIBS) || defined (WINCE)
|
||||
#if defined(MOZ_STATIC_COMPONENT_LIBS)
|
||||
nsToolkit::Startup(GetModuleHandle(NULL));
|
||||
#endif
|
||||
|
||||
|
|
@ -196,7 +190,7 @@ nsToolkit::~nsToolkit()
|
|||
gMouseTrailer = nsnull;
|
||||
}
|
||||
|
||||
#if defined (MOZ_STATIC_COMPONENT_LIBS) || defined(WINCE)
|
||||
#if defined (MOZ_STATIC_COMPONENT_LIBS)
|
||||
nsToolkit::Shutdown();
|
||||
#endif
|
||||
}
|
||||
|
|
@ -232,9 +226,7 @@ nsToolkit::Startup(HMODULE hModule)
|
|||
if (setDPIAware)
|
||||
setDPIAware();
|
||||
|
||||
#ifndef WINCE
|
||||
nsUXThemeData::Initialize();
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -355,7 +347,6 @@ LRESULT CALLBACK nsToolkit::WindowProc(HWND hWnd, UINT msg, WPARAM wParam,
|
|||
LPARAM lParam)
|
||||
{
|
||||
switch (msg) {
|
||||
#ifndef WINCE
|
||||
case WM_SYSCOLORCHANGE:
|
||||
{
|
||||
// WM_SYSCOLORCHANGE messages are only dispatched to top
|
||||
|
|
@ -369,7 +360,6 @@ LRESULT CALLBACK nsToolkit::WindowProc(HWND hWnd, UINT msg, WPARAM wParam,
|
|||
// the current system colors.
|
||||
nsWindow::GlobalMsgWindowProc(hWnd, msg, wParam, lParam);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
return ::DefWindowProcW(hWnd, msg, wParam, lParam);
|
||||
|
|
@ -435,7 +425,6 @@ PRBool nsToolkit::InitVersionInfo()
|
|||
{
|
||||
isInitialized = PR_TRUE;
|
||||
|
||||
#ifndef WINCE
|
||||
OSVERSIONINFO osversion;
|
||||
osversion.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
|
||||
|
||||
|
|
@ -444,7 +433,6 @@ PRBool nsToolkit::InitVersionInfo()
|
|||
if (osversion.dwMajorVersion == 5) {
|
||||
nsToolkit::mIsWinXP = (osversion.dwMinorVersion == 1);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
return PR_TRUE;
|
||||
|
|
@ -558,10 +546,8 @@ void MouseTrailer::TimerProc(nsITimer* aTimer, void* aClosure)
|
|||
mp.y = GET_Y_LPARAM(pos);
|
||||
HWND mouseWnd = ::WindowFromPoint(mp);
|
||||
if (mtrailer->mMouseTrailerWindow != mouseWnd) {
|
||||
#ifndef WINCE
|
||||
// Notify someone that a mouse exit happened.
|
||||
PostMessage(mtrailer->mMouseTrailerWindow, WM_MOUSELEAVE, 0, 0);
|
||||
#endif
|
||||
|
||||
// we are out of this window, destroy timer
|
||||
mtrailer->DestroyTimer();
|
||||
|
|
|
|||
|
|
@ -86,9 +86,6 @@ nsWinGesture::nsWinGesture() :
|
|||
|
||||
PRBool nsWinGesture::InitLibrary()
|
||||
{
|
||||
#ifdef WINCE
|
||||
return PR_FALSE;
|
||||
#else
|
||||
if (getGestureInfo) {
|
||||
return PR_TRUE;
|
||||
} else if (sLibraryHandle) {
|
||||
|
|
@ -156,7 +153,6 @@ PRBool nsWinGesture::InitLibrary()
|
|||
}
|
||||
|
||||
return PR_TRUE;
|
||||
#endif
|
||||
}
|
||||
|
||||
#define GCOUNT 5
|
||||
|
|
|
|||
Разница между файлами не показана из-за своего большого размера
Загрузить разницу
|
|
@ -65,13 +65,7 @@
|
|||
#include "gfxD2DSurface.h"
|
||||
#endif
|
||||
|
||||
#if !defined(WINCE)
|
||||
#include "nsWinGesture.h"
|
||||
#endif
|
||||
|
||||
#if defined(WINCE)
|
||||
#include "nsWindowCE.h"
|
||||
#endif
|
||||
|
||||
#include "WindowHook.h"
|
||||
#include "TaskbarWindowPreview.h"
|
||||
|
|
@ -81,9 +75,8 @@
|
|||
#include "nsAccessible.h"
|
||||
#endif
|
||||
|
||||
#if !defined(WINCE)
|
||||
#include "nsUXThemeData.h"
|
||||
#endif // !defined(WINCE)
|
||||
|
||||
/**
|
||||
* Forward class definitions
|
||||
*/
|
||||
|
|
@ -133,9 +126,7 @@ 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 ResizeClient(PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHeight, PRBool aRepaint);
|
||||
#if !defined(WINCE)
|
||||
NS_IMETHOD BeginResizeDrag(nsGUIEvent* aEvent, PRInt32 aHorizontal, PRInt32 aVertical);
|
||||
#endif
|
||||
NS_IMETHOD PlaceBehind(nsTopLevelWidgetZPlacement aPlacement, nsIWidget *aWidget, PRBool aActivate);
|
||||
NS_IMETHOD SetSizeMode(PRInt32 aMode);
|
||||
NS_IMETHOD Enable(PRBool aState);
|
||||
|
|
@ -301,10 +292,8 @@ protected:
|
|||
static BOOL CALLBACK BroadcastMsgToChildren(HWND aWnd, LPARAM aMsg);
|
||||
static BOOL CALLBACK BroadcastMsg(HWND aTopWindow, LPARAM aMsg);
|
||||
static BOOL CALLBACK DispatchStarvedPaints(HWND aTopWindow, LPARAM aMsg);
|
||||
#if !defined(WINCE)
|
||||
static BOOL CALLBACK RegisterTouchForDescendants(HWND aTopWindow, LPARAM aMsg);
|
||||
static BOOL CALLBACK UnregisterTouchForDescendants(HWND aTopWindow, LPARAM aMsg);
|
||||
#endif
|
||||
static LRESULT CALLBACK MozSpecialMsgFilter(int code, WPARAM wParam, LPARAM lParam);
|
||||
static LRESULT CALLBACK MozSpecialWndProc(int code, WPARAM wParam, LPARAM lParam);
|
||||
static LRESULT CALLBACK MozSpecialMouseProc(int code, WPARAM wParam, LPARAM lParam);
|
||||
|
|
@ -330,9 +319,7 @@ protected:
|
|||
void ResetLayout();
|
||||
void InvalidateNonClientRegion();
|
||||
HRGN ExcludeNonClientFromPaintRegion(HRGN aRegion);
|
||||
#if !defined(WINCE)
|
||||
static void InitInputWorkaroundPrefDefaults();
|
||||
#endif
|
||||
static PRBool GetInputWorkaroundPref(const char* aPrefName, PRBool aValueIfAutomatic);
|
||||
static PRBool UseTrackPointHack();
|
||||
static void PerformElantechSwipeGestureHack(UINT& aVirtualKeyCode, nsModifierKeyState& aModKeyState);
|
||||
|
|
@ -428,9 +415,7 @@ protected:
|
|||
PRBool OnMouseWheel(UINT msg, WPARAM wParam, LPARAM lParam,
|
||||
PRBool& result, PRBool& getWheelInfo,
|
||||
LRESULT *aRetValue);
|
||||
#if !defined(WINCE)
|
||||
void OnWindowPosChanging(LPWINDOWPOS& info);
|
||||
#endif // !defined(WINCE)
|
||||
|
||||
/**
|
||||
* Function that registers when the user has been active (used for detecting
|
||||
|
|
@ -490,10 +475,8 @@ protected:
|
|||
PRBool aIntersectWithExisting);
|
||||
nsIntRegion GetRegionToPaint(PRBool aForceFullRepaint,
|
||||
PAINTSTRUCT ps, HDC aDC);
|
||||
#if !defined(WINCE)
|
||||
static void ActivateOtherWindowHelper(HWND aWnd);
|
||||
static PRUint16 GetMouseInputSource();
|
||||
#endif
|
||||
#ifdef ACCESSIBILITY
|
||||
static STDMETHODIMP_(LRESULT) LresultFromObject(REFIID riid, WPARAM wParam, LPUNKNOWN pAcc);
|
||||
#endif // ACCESSIBILITY
|
||||
|
|
@ -614,9 +597,7 @@ protected:
|
|||
#endif // MOZ_XUL
|
||||
|
||||
// Win7 Gesture processing and management
|
||||
#if !defined(WINCE)
|
||||
nsWinGesture mGesture;
|
||||
#endif // !defined(WINCE)
|
||||
|
||||
#if MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_WIN7
|
||||
// Weak ref to the nsITaskbarWindowPreview associated with this window
|
||||
|
|
@ -626,10 +607,6 @@ protected:
|
|||
PRBool mHasTaskbarIconBeenCreated;
|
||||
#endif
|
||||
|
||||
#if defined(WINCE_HAVE_SOFTKB)
|
||||
static PRBool sSoftKeyboardState;
|
||||
#endif // defined(WINCE_HAVE_SOFTKB)
|
||||
|
||||
#ifdef ACCESSIBILITY
|
||||
static BOOL sIsAccessibilityOn;
|
||||
static HINSTANCE sAccLib;
|
||||
|
|
|
|||
|
|
@ -169,24 +169,11 @@
|
|||
*/
|
||||
#endif // #ifndef APPCOMMAND_BROWSER_BACKWARD
|
||||
|
||||
#if defined(WINCE)
|
||||
#ifndef RDW_NOINTERNALPAINT
|
||||
#define RDW_NOINTERNALPAINT 0
|
||||
#endif
|
||||
#ifndef ERROR
|
||||
#define ERROR 0
|
||||
#endif
|
||||
#endif // defined(WINCE)
|
||||
|
||||
//Tablet PC Mouse Input Source
|
||||
#if !defined(WINCE)
|
||||
#define TABLET_INK_SIGNATURE 0xFFFFFF00
|
||||
#define TABLET_INK_CHECK 0xFF515700
|
||||
#define TABLET_INK_TOUCH 0x00000080
|
||||
#define MOUSE_INPUT_SOURCE() GetMouseInputSource()
|
||||
#else
|
||||
#define MOUSE_INPUT_SOURCE() nsIDOMNSMouseEvent::MOZ_SOURCE_MOUSE
|
||||
#endif
|
||||
|
||||
/**************************************************************
|
||||
*
|
||||
|
|
|
|||
|
|
@ -76,10 +76,8 @@ using mozilla::plugins::PluginInstanceParent;
|
|||
#include "LayerManagerD3D10.h"
|
||||
#endif
|
||||
|
||||
#ifndef WINCE
|
||||
#include "nsUXThemeData.h"
|
||||
#include "nsUXThemeConstants.h"
|
||||
#endif
|
||||
|
||||
extern "C" {
|
||||
#include "pixman.h"
|
||||
|
|
@ -164,23 +162,11 @@ nsWindowGfx::ConvertHRGNToRegion(HRGN aRgn)
|
|||
|
||||
void nsWindowGfx::OnSettingsChangeGfx(WPARAM wParam)
|
||||
{
|
||||
#if defined(WINCE_WINDOWS_MOBILE)
|
||||
if (wParam == SETTINGCHANGE_RESET) {
|
||||
if (glpDDSecondary) {
|
||||
glpDDSecondary->Release();
|
||||
glpDDSecondary = NULL;
|
||||
}
|
||||
|
||||
if(glpDD)
|
||||
glpDD->RestoreAllSurfaces();
|
||||
}
|
||||
#endif
|
||||
// Previously contained only an ifdef WINCE_WINDOWS_MOBILE
|
||||
// TODO: Remove this and adjust references
|
||||
}
|
||||
|
||||
// GetRegionToPaint returns the invalidated region that needs to be painted
|
||||
// it's abstracted out because Windows XP/Vista/7 handles this for us, but
|
||||
// we need to keep track of it our selves for Windows CE and Windows Mobile
|
||||
|
||||
nsIntRegion nsWindow::GetRegionToPaint(PRBool aForceFullRepaint,
|
||||
PAINTSTRUCT ps, HDC aDC)
|
||||
{
|
||||
|
|
@ -190,14 +176,9 @@ nsIntRegion nsWindow::GetRegionToPaint(PRBool aForceFullRepaint,
|
|||
return nsIntRegion(nsWindowGfx::ToIntRect(paintRect));
|
||||
}
|
||||
|
||||
#if defined(WINCE_WINDOWS_MOBILE) || !defined(WINCE)
|
||||
HRGN paintRgn = ::CreateRectRgn(0, 0, 0, 0);
|
||||
if (paintRgn != NULL) {
|
||||
# ifdef WINCE
|
||||
int result = GetUpdateRgn(mWnd, paintRgn, FALSE);
|
||||
# else
|
||||
int result = GetRandomRgn(aDC, paintRgn, SYSRGN);
|
||||
# endif
|
||||
if (result == 1) {
|
||||
POINT pt = {0,0};
|
||||
::MapWindowPoints(NULL, mWnd, &pt, 1);
|
||||
|
|
@ -205,12 +186,8 @@ nsIntRegion nsWindow::GetRegionToPaint(PRBool aForceFullRepaint,
|
|||
}
|
||||
nsIntRegion rgn(nsWindowGfx::ConvertHRGNToRegion(paintRgn));
|
||||
::DeleteObject(paintRgn);
|
||||
# ifdef WINCE
|
||||
if (!rgn.IsEmpty())
|
||||
# endif
|
||||
return rgn;
|
||||
return rgn;
|
||||
}
|
||||
#endif
|
||||
return nsIntRegion(nsWindowGfx::ToIntRect(ps.rcPaint));
|
||||
}
|
||||
|
||||
|
|
@ -432,15 +409,12 @@ PRBool nsWindow::OnPaint(HDC aDC, PRUint32 aNestingLevel)
|
|||
thebesContext->Paint();
|
||||
thebesContext->SetOperator(gfxContext::OPERATOR_OVER);
|
||||
}
|
||||
#ifdef WINCE
|
||||
thebesContext->SetFlag(gfxContext::FLAG_SIMPLIFY_OPERATORS);
|
||||
#endif
|
||||
|
||||
// don't need to double buffer with anything but GDI
|
||||
BasicLayerManager::BufferMode doubleBuffering =
|
||||
BasicLayerManager::BUFFER_NONE;
|
||||
if (IsRenderMode(gfxWindowsPlatform::RENDER_GDI)) {
|
||||
# if defined(MOZ_XUL) && !defined(WINCE)
|
||||
#ifdef MOZ_XUL
|
||||
switch (mTransparencyMode) {
|
||||
case eTransparencyGlass:
|
||||
case eTransparencyBorderlessGlass:
|
||||
|
|
@ -627,7 +601,7 @@ PRBool nsWindow::OnPaint(HDC aDC, PRUint32 aNestingLevel)
|
|||
|
||||
mPaintDC = nsnull;
|
||||
|
||||
#if defined(WIDGET_DEBUG_OUTPUT) && !defined(WINCE)
|
||||
#if defined(WIDGET_DEBUG_OUTPUT)
|
||||
if (debug_WantPaintFlashing())
|
||||
{
|
||||
// Only flash paint events which have not ignored the paint message.
|
||||
|
|
@ -642,7 +616,7 @@ PRBool nsWindow::OnPaint(HDC aDC, PRUint32 aNestingLevel)
|
|||
::ReleaseDC(mWnd, debugPaintFlashDC);
|
||||
::DeleteObject(debugPaintFlashRegion);
|
||||
}
|
||||
#endif // WIDGET_DEBUG_OUTPUT && !WINCE
|
||||
#endif // WIDGET_DEBUG_OUTPUT
|
||||
|
||||
mPainting = PR_FALSE;
|
||||
|
||||
|
|
@ -735,9 +709,6 @@ PRUint8* nsWindowGfx::Data32BitTo1Bit(PRUint8* aImageData,
|
|||
|
||||
PRBool nsWindowGfx::IsCursorTranslucencySupported()
|
||||
{
|
||||
#ifdef WINCE
|
||||
return PR_FALSE;
|
||||
#else
|
||||
static PRBool didCheck = PR_FALSE;
|
||||
static PRBool isSupported = PR_FALSE;
|
||||
if (!didCheck) {
|
||||
|
|
@ -747,7 +718,6 @@ PRBool nsWindowGfx::IsCursorTranslucencySupported()
|
|||
}
|
||||
|
||||
return isSupported;
|
||||
#endif
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -770,7 +740,6 @@ HBITMAP nsWindowGfx::DataToBitmap(PRUint8* aImageData,
|
|||
PRUint32 aHeight,
|
||||
PRUint32 aDepth)
|
||||
{
|
||||
#ifndef WINCE
|
||||
HDC dc = ::GetDC(NULL);
|
||||
|
||||
if (aDepth == 32 && IsCursorTranslucencySupported()) {
|
||||
|
|
@ -831,7 +800,4 @@ HBITMAP nsWindowGfx::DataToBitmap(PRUint8* aImageData,
|
|||
HBITMAP bmp = ::CreateDIBitmap(dc, &head, CBM_INIT, aImageData, &bi, DIB_RGB_COLORS);
|
||||
::ReleaseDC(NULL, dc);
|
||||
return bmp;
|
||||
#else
|
||||
return nsnull;
|
||||
#endif
|
||||
}
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@
|
|||
#include "nsXPCOM.h"
|
||||
#include "mozilla/Services.h"
|
||||
|
||||
#if defined(XP_WIN) && !defined(WINCE)
|
||||
#if defined(XP_WIN)
|
||||
#include <ole2.h>
|
||||
#endif
|
||||
|
||||
|
|
@ -110,7 +110,7 @@ nsClipboardPrivacyHandler::Observe(nsISupports *aSubject, char const *aTopic, PR
|
|||
nsIClipboard::kGlobalClipboard,
|
||||
&haveFlavors);
|
||||
if (NS_SUCCEEDED(rv) && haveFlavors) {
|
||||
#if defined(XP_WIN) && !defined(WINCE)
|
||||
#if defined(XP_WIN)
|
||||
// Workaround for bug 518412. On Windows 7 x64, there is a bug
|
||||
// in handling clipboard data without any formats between
|
||||
// 32-bit/64-bit boundaries, which could lead Explorer to crash.
|
||||
|
|
|
|||
|
|
@ -112,7 +112,6 @@ _CHROME_FILES += native_menus_window.xul \
|
|||
endif
|
||||
|
||||
ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
|
||||
ifneq ($(OS_ARCH), WINCE)
|
||||
_CHROME_FILES += taskbar_previews.xul \
|
||||
window_state_windows.xul \
|
||||
taskbar_progress.xul \
|
||||
|
|
@ -124,7 +123,6 @@ _CHROME_FILES += taskbar_previews.xul \
|
|||
_TEST_FILES += test_bug565392.html \
|
||||
$(NULL)
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
|
||||
_TEST_FILES += plugin_scroll_invalidation.html \
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче