[vba-commit] VisualBoyAdvance/src/win32 BitmapControl.cpp,1.1,1.2 MemoryViewer.cpp,1.4,1.5 PaletteViewControl.cpp,1.1,1.2 skinButton.cpp,1.4,1.5 ZoomControl.cpp,1.2,1.3

[<for...@us...>]

Update of /cvsroot/vba/VisualBoyAdvance/src/win32
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29052

Modified Files:
	BitmapControl.cpp MemoryViewer.cpp PaletteViewControl.cpp 
	skinButton.cpp ZoomControl.cpp 
Log Message:
Fix GDI problems on Win98

Index: BitmapControl.cpp
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/BitmapControl.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** BitmapControl.cpp	4 Nov 2003 14:09:52 -0000	1.1
--- BitmapControl.cpp	17 Feb 2004 11:27:36 -0000	1.2
***************
*** 87,93 ****
        h1 = h;
    }
!   CBitmap bitmap;
    bitmap.CreateCompatibleBitmap(dc, w1, h1);
!   memDC.SelectObject(&bitmap);
    if(stretch) {
      bmpInfo->bmiHeader.biWidth = w;
--- 87,93 ----
        h1 = h;
    }
!   CBitmap bitmap, *pOldBitmap;
    bitmap.CreateCompatibleBitmap(dc, w1, h1);
!   pOldBitmap = memDC.SelectObject(&bitmap);
    if(stretch) {
      bmpInfo->bmiHeader.biWidth = w;
***************
*** 128,131 ****
--- 128,132 ----
    dc->BitBlt(0,0,w1,h1,
               &memDC,0,0,SRCCOPY);
+   memDC.SelectObject(pOldBitmap);
  
    bitmap.DeleteObject();

Index: MemoryViewer.cpp
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/MemoryViewer.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** MemoryViewer.cpp	4 Nov 2003 14:09:52 -0000	1.4
--- MemoryViewer.cpp	17 Feb 2004 11:27:36 -0000	1.5
***************
*** 158,164 ****
    CDC memDC;
    memDC.CreateCompatibleDC(&dc);
!   CBitmap bitmap;
    bitmap.CreateCompatibleBitmap(&dc, w, rect.bottom - rect.top);
!   memDC.SelectObject(&bitmap);
    
    memDC.FillRect(&rect, CBrush::FromHandle((HBRUSH)GetStockObject(WHITE_BRUSH)));
--- 158,164 ----
    CDC memDC;
    memDC.CreateCompatibleDC(&dc);
!   CBitmap bitmap, *pOldBitmap;
    bitmap.CreateCompatibleBitmap(&dc, w, rect.bottom - rect.top);
!   pOldBitmap = memDC.SelectObject(&bitmap);
    
    memDC.FillRect(&rect, CBrush::FromHandle((HBRUSH)GetStockObject(WHITE_BRUSH)));
***************
*** 263,266 ****
--- 263,267 ----
    dc.BitBlt(0, 0, w, rect.bottom - rect.top, &memDC, 0, 0, SRCCOPY);
    
+   memDC.SelectObject(pOldBitmap);
    memDC.DeleteDC();
    bitmap.DeleteObject();

Index: PaletteViewControl.cpp
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/PaletteViewControl.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PaletteViewControl.cpp	4 Nov 2003 14:09:52 -0000	1.1
--- PaletteViewControl.cpp	17 Feb 2004 11:27:36 -0000	1.2
***************
*** 328,334 ****
    CDC memDC;
    memDC.CreateCompatibleDC(&dc);
!   CBitmap bitmap;
    bitmap.CreateCompatibleBitmap(&dc, w, h);
!   memDC.SelectObject(bitmap);
    
    StretchDIBits(memDC.GetSafeHdc(),
--- 328,334 ----
    CDC memDC;
    memDC.CreateCompatibleDC(&dc);
!   CBitmap bitmap, *pOldBitmap;
    bitmap.CreateCompatibleBitmap(&dc, w, h);
!   pOldBitmap = memDC.SelectObject(&bitmap);
    
    StretchDIBits(memDC.GetSafeHdc(),
***************
*** 387,390 ****
--- 387,391 ----
              &memDC,0,0,SRCCOPY);
  
+   memDC.SelectObject(pOldBitmap);
    bitmap.DeleteObject();
    memDC.DeleteDC();

Index: skinButton.cpp
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/skinButton.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** skinButton.cpp	4 Nov 2003 14:09:53 -0000	1.4
--- skinButton.cpp	17 Feb 2004 11:27:36 -0000	1.5
***************
*** 99,113 ****
    HDC memDC = ::CreateCompatibleDC(hDC);
    UINT state = ::SendMessage(m_hWnd, BM_GETSTATE, 0, 0);
!   
    if(state & BST_PUSHED)
!     SelectObject(memDC, downBmp);
    else if(mouseOver && overBmp != NULL)
!     SelectObject(memDC, overBmp);
    else
!     SelectObject(memDC, normalBmp);
    SelectClipRgn(hDC, region);
    BitBlt(hDC, 0, 0, theApp.rect.right - theApp.rect.left,
           theApp.rect.bottom - theApp.rect.top, memDC, 0, 0, SRCCOPY);
    SelectClipRgn(hDC, NULL);
    DeleteDC(memDC);
  
--- 99,114 ----
    HDC memDC = ::CreateCompatibleDC(hDC);
    UINT state = ::SendMessage(m_hWnd, BM_GETSTATE, 0, 0);
!   HBITMAP oldBitmap;
    if(state & BST_PUSHED)
!     oldBitmap = (HBITMAP)SelectObject(memDC, downBmp);
    else if(mouseOver && overBmp != NULL)
!     oldBitmap = (HBITMAP)SelectObject(memDC, overBmp);
    else
!     oldBitmap = (HBITMAP)SelectObject(memDC, normalBmp);
    SelectClipRgn(hDC, region);
    BitBlt(hDC, 0, 0, theApp.rect.right - theApp.rect.left,
           theApp.rect.bottom - theApp.rect.top, memDC, 0, 0, SRCCOPY);
    SelectClipRgn(hDC, NULL);
+   SelectObject(memDC, oldBitmap);
    DeleteDC(memDC);
  

Index: ZoomControl.cpp
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/ZoomControl.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ZoomControl.cpp	18 Jan 2004 14:54:22 -0000	1.2
--- ZoomControl.cpp	17 Feb 2004 11:27:36 -0000	1.3
***************
*** 89,96 ****
    CDC memDC ;
    memDC.CreateCompatibleDC(&dc);
!   CBitmap bitmap;
    bitmap.CreateCompatibleBitmap(&dc, w, h);
  
!   memDC.SelectObject(&bitmap);
    
    int multX = w / 8;
--- 89,96 ----
    CDC memDC ;
    memDC.CreateCompatibleDC(&dc);
!   CBitmap bitmap, *pOldBitmap;
    bitmap.CreateCompatibleBitmap(&dc, w, h);
  
!   pOldBitmap = memDC.SelectObject(&bitmap);
    
    int multX = w / 8;
***************
*** 148,151 ****
--- 148,152 ----
              &memDC,0,0, SRCCOPY);
  
+   memDC.SelectObject(pOldBitmap);
    bitmap.DeleteObject();
    memDC.DeleteDC();