Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 19:35:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Implements DataToBitmap. We do not handle the cursor translucency, but it is

Browse Source 
more then what we do currently.  Basically we are moving around ifdef's here.

Fixes GetSysFontInfo.  For windows CE we correctly return the System Font.

r=emaijala, sr=dveditz, a=asa, b=297683 WINCE ONLY.
This commit is contained in:
dougt%meer.net 2005-07-18 16:04:45 +00:00
parent 65d8b79fe0
commit f998e5ffc8
2 changed files with 46 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gfx/src/windows/nsDeviceContextWin.cpp
View File

@ -422,15 +422,22 @@ nsresult nsDeviceContextWin::CopyLogFontToNSFont(HDC* aHDC, const LOGFONT* ptrLo
nsresult nsDeviceContextWin :: GetSysFontInfo(HDC aHDC, nsSystemFontID anID, nsFont* aFont) const
{
#ifdef WINCE
return NS_ERROR_NOT_IMPLEMENTED;
#else
NONCLIENTMETRICS ncm;
HGDIOBJ hGDI;
LOGFONT logFont;
LOGFONT* ptrLogFont = NULL;
#ifdef WINCE
hGDI = ::GetStockObject(SYSTEM_FONT);
if (hGDI == NULL)
return NS_ERROR_UNEXPECTED;
if (::GetObject(hGDI, sizeof(logFont), &logFont) > 0)
ptrLogFont = &logFont;
#else
NONCLIENTMETRICS ncm;
BOOL status;
if (anID == eSystemFont_Icon)
{
@ -505,6 +512,8 @@ nsresult nsDeviceContextWin :: GetSysFontInfo(HDC aHDC, nsSystemFontID anID, nsF
break;
} // switch
#endif // WINCE
if (nsnull == ptrLogFont)
{
return NS_ERROR_FAILURE;
@ -513,7 +522,6 @@ nsresult nsDeviceContextWin :: GetSysFontInfo(HDC aHDC, nsSystemFontID anID, nsF
aFont->systemFont = PR_TRUE;
return CopyLogFontToNSFont(&aHDC, ptrLogFont, aFont);
#endif
}
NS_IMETHODIMP nsDeviceContextWin :: GetSystemFont(nsSystemFontID anID, nsFont *aFont) const

43
widget/src/windows/nsWindow.cpp
View File

@ -1471,6 +1471,7 @@ nsWindow::StandardWindowCreate(nsIWidget *aParent,
mHas3DBorder = (extendedStyle & WS_EX_CLIENTEDGE) > 0;
#ifndef WINCE
if (mWindowType == eWindowType_dialog) {
struct {
DLGTEMPLATE t;
@ -1496,7 +1497,11 @@ nsWindow::StandardWindowCreate(nsIWidget *aParent,
parent,
(DLGPROC)DummyDialogProc,
NULL);
} else {
}
else
#endif //WINCE
{
mWnd = nsToolkit::mCreateWindowEx(extendedStyle,
aInitData && aInitData->mDropShadow ?
@ -2620,9 +2625,6 @@ HBITMAP nsWindow::DataToBitmap(PRUint8* aImageData,
PRUint32 aHeight,
PRUint32 aDepth)
{
#ifdef WINCE
return NULL;
#else
if (aDepth == 8 || aDepth == 4) {
NS_WARNING("nsWindow::DataToBitmap can't handle 4 or 8 bit images");
return NULL;
@ -2639,6 +2641,7 @@ HBITMAP nsWindow::DataToBitmap(PRUint8* aImageData,
HBITMAP tBitmap = ::CreateBitmap(1, 1, planes, bpp, NULL);
HBITMAP oldbits = (HBITMAP)::SelectObject(dc, tBitmap);
#ifndef WINCE
if (aDepth == 32 && IsCursorTranslucencySupported()) {
// Alpha channel. We need the new header.
BITMAPV4HEADER head = { 0 };
@ -2671,6 +2674,7 @@ HBITMAP nsWindow::DataToBitmap(PRUint8* aImageData,
::DeleteDC(dc);
return bmp;
}
#endif
BITMAPINFOHEADER head = { 0 };
@ -2705,7 +2709,6 @@ HBITMAP nsWindow::DataToBitmap(PRUint8* aImageData,
::DeleteObject(tBitmap);
::DeleteDC(dc);
return bmp;
#endif // WINCE
}
// static
@ -5261,10 +5264,26 @@ DWORD nsWindow::WindowStyle()
DWORD style;
#ifdef WINCE
if (mWindowType == eWindowType_popup)
style = WS_POPUP;
else
style = WS_CHILD;
switch (mWindowType) {
case eWindowType_child:
style = WS_CHILD;
break;
case eWindowType_dialog:
case eWindowType_popup:
style = WS_BORDER | WS_POPUP;
break;
default:
NS_ASSERTION(0, "unknown border style");
// fall through
case eWindowType_toplevel:
case eWindowType_invisible:
style = WS_BORDER;
break;
}
#else
switch (mWindowType) {
@ -5351,7 +5370,7 @@ DWORD nsWindow::WindowExStyle()
return WS_EX_WINDOWEDGE;
case eWindowType_popup:
return WS_EX_TOPMOST | WS_EX_TOOLWINDOW;
return WS_EX_TOOLWINDOW;
default:
NS_ASSERTION(0, "unknown border style");
@ -5359,7 +5378,11 @@ DWORD nsWindow::WindowExStyle()
case eWindowType_toplevel:
case eWindowType_invisible:
#ifndef WINCE
return WS_EX_APPWINDOW | WS_EX_WINDOWEDGE;
#else
return WS_EX_WINDOWEDGE;
#endif
}
}