TWIN32 compatibility added; wxMotif uses wxGTK's wxPostScriptDC;
wxByte replaces byte (can conflict with windows.h) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1428 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -48,9 +48,11 @@
|
||||
|
||||
#include "wx/msw/dib.h"
|
||||
|
||||
#ifndef __TWIN32__
|
||||
#ifdef __GNUWIN32__
|
||||
#include "wx/msw/gnuwin32/extra.h"
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifndef SEEK_CUR
|
||||
/* flags for _lseek */
|
||||
@@ -259,7 +261,7 @@ HANDLE DibFromBitmap(HBITMAP hbm, DWORD biStyle, WORD biBits, HPALETTE hpal)
|
||||
|
||||
dwLen = bi.biSize + PaletteSize(&bi);
|
||||
|
||||
hdc = GetDC(NULL);
|
||||
hdc = GetDC((HWND) NULL);
|
||||
hpal = SelectPalette(hdc, hpal, FALSE);
|
||||
RealizePalette(hdc);
|
||||
|
||||
@@ -327,7 +329,7 @@ HANDLE DibFromBitmap(HBITMAP hbm, DWORD biStyle, WORD biBits, HPALETTE hpal)
|
||||
GlobalUnlock(hdib);
|
||||
hdib = NULL;
|
||||
SelectPalette(hdc, hpal, FALSE);
|
||||
ReleaseDC(NULL, hdc);
|
||||
ReleaseDC((HWND) NULL, hdc);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user