Author: manolo
Date: 2010-03-04 09:53:50 -0800 (Thu, 04 Mar 2010)
New Revision: 7214
Log:
Moving MSWin-specific stuff at appropriate place.
Modified:
branches/branch-1.3-Fl_Printer/src/Fl_Bitmap.cxx
branches/branch-1.3-Fl_Printer/src/Fl_Pixmap.cxx
Modified: branches/branch-1.3-Fl_Printer/src/Fl_Bitmap.cxx
===================================================================
--- branches/branch-1.3-Fl_Printer/src/Fl_Bitmap.cxx 2010-03-04 17:17:04 UTC
(rev 7213)
+++ branches/branch-1.3-Fl_Printer/src/Fl_Bitmap.cxx 2010-03-04 17:53:50 UTC
(rev 7214)
@@ -264,7 +264,6 @@
return (mask);
}
-typedef BOOL (WINAPI* fl_transp_func)
(HDC,int,int,int,int,HDC,int,int,int,int,UINT);
void Fl_Bitmap::draw(int XP, int YP, int WP, int HP, int cx, int cy) {
if(fl_device->type() == Fl_Device::postscript_device) {
((Fl_Virtual_Printer*)fl_device)->draw(this, XP, YP, WP, HP, cx, cy);
@@ -307,6 +306,7 @@
static HMODULE hMod = NULL;
if (!hMod) hMod = LoadLibrary("MSIMG32.DLL");
if(hMod) {
+ typedef BOOL (WINAPI* fl_transp_func)
(HDC,int,int,int,int,HDC,int,int,int,int,UINT);
fl_transp_func fl_TransparentBlt = (fl_transp_func)GetProcAddress(hMod,
"TransparentBlt");
fl_TransparentBlt(fl_gc, X,Y,W,H, tempdc, cx, cy, w(), h(), RGB(0,0,0) );
}
Modified: branches/branch-1.3-Fl_Printer/src/Fl_Pixmap.cxx
===================================================================
--- branches/branch-1.3-Fl_Printer/src/Fl_Pixmap.cxx 2010-03-04 17:17:04 UTC
(rev 7213)
+++ branches/branch-1.3-Fl_Printer/src/Fl_Pixmap.cxx 2010-03-04 17:53:50 UTC
(rev 7214)
@@ -74,7 +74,6 @@
}
}
-typedef BOOL (WINAPI* fl_transp_func)
(HDC,int,int,int,int,HDC,int,int,int,int,UINT);
void Fl_Pixmap::draw(int XP, int YP, int WP, int HP, int cx, int cy) {
if(fl_device->type() == Fl_Device::postscript_device) {
((Fl_Virtual_Printer*)fl_device)->draw(this, XP, YP, WP, HP, cx, cy);
@@ -151,6 +150,7 @@
if (hMod) {
# define UNLIKELY_RGB_COLOR 2,3,4
# define WIN_COLOR RGB(2,3,4)
+ typedef BOOL (WINAPI* fl_transp_func)
(HDC,int,int,int,int,HDC,int,int,int,int,UINT);
Fl_Offscreen tmp_id = fl_create_offscreen(w(), h());
fl_begin_offscreen(tmp_id);
uchar *bitmap = 0;
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
