X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fibex%2Fplat%2FWin32.cc;h=8e0caaeb37f5b1b45d2f5f96f88930166ed6990a;hb=76b21655a0710caf4f972c107a3ab991032d7e10;hp=4c0369f7aec3ae97e0c050c8a300799733a4bba6;hpb=07f137d5694c7d52a6a2c28e051546232b353f5d;p=org.ibex.core.git diff --git a/src/org/ibex/plat/Win32.cc b/src/org/ibex/plat/Win32.cc index 4c0369f..8e0caae 100644 --- a/src/org/ibex/plat/Win32.cc +++ b/src/org/ibex/plat/Win32.cc @@ -1,4 +1,7 @@ -// Copyright 2002 Adam Megacz, see the COPYING file for licensing [LGPL] +// Copyright 2000-2005 the Contributors, as shown in the revision logs. +// Licensed under the GNU General Public License version 2 ("the License"). +// You may not use this file except in compliance with the License. + #include "GCJ.cc" // we have to do this because the jpeg libraries use the symbol 'INT32' @@ -373,7 +376,7 @@ static jint scratch_h = 0; #define max(a,b) ((a)>(b)?(a):(b)) #define min(a,b) ((a)<(b)?(a):(b)) -void org::ibex::plat::Win32$Win32PixelBuffer::drawPicture(org::ibex::Picture* source0, +void org::ibex::plat::Win32$Win32PixelBuffer::drawPicture(org::ibex::graphics::Picture* source0, jint dx, jint dy, jint cx1, jint cy1, jint cx2, jint cy2, jint rgb, jboolean alphaOnly) { @@ -456,7 +459,7 @@ void org::ibex::plat::Win32$Win32PixelBuffer::fillRect(jint x, jint y, jint x2, DeleteObject(brush); } -void org::ibex::plat::Win32$Win32Surface::blit(org::ibex::PixelBuffer* s, jint sx, jint sy, jint dx, jint dy, jint dx2, jint dy2) { +void org::ibex::plat::Win32$Win32Surface::blit(org::ibex::graphics::PixelBuffer* s, jint sx, jint sy, jint dx, jint dy, jint dx2, jint dy2) { // we create the DC lazily to get around some strange race condition in WinXP if (hdc == 0) hdc = (jint)GetDC((HWND)hwnd); BitBlt((HDC)hdc, dx, dy, dx2 - dx, dy2 - dy, (HDC)(((org::ibex::plat::Win32$Win32PixelBuffer*)s)->hdc), sx, sy, SRCCOPY); @@ -579,7 +582,7 @@ void org::ibex::plat::Win32$Win32Surface::setTitleBarText(java::lang::String* ti SetWindowText((HWND)hwnd, buf); } -void org::ibex::plat::Win32$Win32Surface::setIcon(org::ibex::Picture* p0) { +void org::ibex::plat::Win32$Win32Surface::setIcon(org::ibex::graphics::Picture* p0) { org::ibex::plat::Win32$Win32Picture* p = (org::ibex::plat::Win32$Win32Picture*)p0; int icon_width = GetSystemMetrics(SM_CXSMICON);