fixed an unused parameter warning

[wxWidgets.git] / src / msw / dibutils.cpp

diff --git a/src/msw/dibutils.cpp b/src/msw/dibutils.cpp
index 8837d90751eb573cd8b2c471d5121ef6ae1ccefd..0e10e7b029a1f617bca499c154623b06bfaf5745 100644 (file)
--- a/src/msw/dibutils.cpp
+++ b/src/msw/dibutils.cpp
@@ -32,10 +32,6 @@
 
 #include "wx/msw/dibutils.h"
 
 
 #include "wx/msw/dibutils.h"
 

-#ifdef __WXWINE__
-  #include <module.h>
-#endif
-

 #if defined(__WIN32__)
 #if !defined(__MWERKS__) && !defined(__SALFORDC__)
     #include <memory.h>             // for _fmemcpy()
 #if defined(__WIN32__)
 #if !defined(__MWERKS__) && !defined(__SALFORDC__)
     #include <memory.h>             // for _fmemcpy()


@@ -113,11 +109,7 @@ void wxClearSystemPalette(void)
   }
 
   // *** Create, select, realize, deselect, and delete the palette
   }
 
   // *** Create, select, realize, deselect, and delete the palette

-#ifdef __WXWINE__
-  ScreenDC = GetDC((HWND)NULL);
-#else

   ScreenDC = GetDC(NULL);
   ScreenDC = GetDC(NULL);

-#endif

   ScreenPalette = CreatePalette((LOGPALETTE *)&Palette);
 
   if (ScreenPalette)
   ScreenPalette = CreatePalette((LOGPALETTE *)&Palette);
 
   if (ScreenPalette)


@@ -128,11 +120,7 @@ void wxClearSystemPalette(void)
     bOK = DeleteObject(ScreenPalette);
   }
 
     bOK = DeleteObject(ScreenPalette);
   }
 

-#ifdef __WXWINE__
-  nOK = ReleaseDC((HWND)NULL, ScreenDC);
-#else

   nOK = ReleaseDC(NULL, ScreenDC);
   nOK = ReleaseDC(NULL, ScreenDC);

-#endif

 
   return;
 }
 
   return;
 }


@@ -195,7 +183,7 @@ PDIB wxDibOpenFile(LPTSTR szFile)
    LPVOID              p;
    OFSTRUCT            of;
 
    LPVOID              p;
    OFSTRUCT            of;
 

-#if defined(WIN32) || defined(_WIN32)
+#if defined(__WIN32__)

    #define GetCurrentInstance()    GetModuleHandle(NULL)
 #else
    #define GetCurrentInstance()    (HINSTANCE)SELECTOROF((LPVOID)&of)
    #define GetCurrentInstance()    GetModuleHandle(NULL)
 #else
    #define GetCurrentInstance()    (HINSTANCE)SELECTOROF((LPVOID)&of)


@@ -293,7 +281,7 @@ PDIB wxDibReadBitmapInfo(HFILE fh)
     off = _llseek(fh,0L,SEEK_CUR);
 
     if (sizeof(bf) != _lread(fh,(LPSTR)&bf,sizeof(bf)))
     off = _llseek(fh,0L,SEEK_CUR);
 
     if (sizeof(bf) != _lread(fh,(LPSTR)&bf,sizeof(bf)))

-        return FALSE;
+        return NULL;

 
     /*
      *  do we have a RC HEADER?
 
     /*
      *  do we have a RC HEADER?


@@ -305,7 +293,7 @@ PDIB wxDibReadBitmapInfo(HFILE fh)
     }
 
     if (sizeof(bi) != _lread(fh,(LPSTR)&bi,sizeof(bi)))
     }
 
     if (sizeof(bi) != _lread(fh,(LPSTR)&bi,sizeof(bi)))

-        return FALSE;
+        return NULL;

 
     /*
      *  what type of bitmap info is this?
 
     /*
      *  what type of bitmap info is this?


@@ -321,8 +309,8 @@ PDIB wxDibReadBitmapInfo(HFILE fh)
             bi.biSize               = sizeof(BITMAPINFOHEADER);
             bi.biWidth              = (DWORD)bc.bcWidth;
             bi.biHeight             = (DWORD)bc.bcHeight;
             bi.biSize               = sizeof(BITMAPINFOHEADER);
             bi.biWidth              = (DWORD)bc.bcWidth;
             bi.biHeight             = (DWORD)bc.bcHeight;

-            bi.biPlanes             =  (UINT)bc.bcPlanes;
-            bi.biBitCount           =  (UINT)bc.bcBitCount;
+            bi.biPlanes             = (WORD)bc.bcPlanes;
+            bi.biBitCount           = (WORD)bc.bcBitCount;

             bi.biCompression        = BI_RGB;
             bi.biSizeImage          = 0;
             bi.biXPelsPerMeter      = 0;
             bi.biCompression        = BI_RGB;
             bi.biSizeImage          = 0;
             bi.biXPelsPerMeter      = 0;


@@ -549,7 +537,7 @@ static void xlatClut4(BYTE FAR *pb, DWORD dwSize, BYTE FAR *xlat)
 #define RLE_EOF     1
 #define RLE_JMP     2
 
 #define RLE_EOF     1
 #define RLE_JMP     2
 

-static void xlatRle8(BYTE FAR *pb, DWORD dwSize, BYTE FAR *xlat)
+static void xlatRle8(BYTE FAR *pb, DWORD WXUNUSED(dwSize), BYTE FAR *xlat)

 {
     BYTE    cnt;
     BYTE    b;
 {
     BYTE    cnt;
     BYTE    b;


@@ -595,7 +583,7 @@ static void xlatRle8(BYTE FAR *pb, DWORD dwSize, BYTE FAR *xlat)
     }
 }
 
     }
 }
 

-static void xlatRle4(BYTE FAR *pb, DWORD dwSize, BYTE FAR *xlat)
+static void xlatRle4(BYTE FAR *WXUNUSED(pb), DWORD WXUNUSED(dwSize), BYTE FAR *WXUNUSED(xlat))

 {
 }
 
 {
 }
 


@@ -708,7 +696,7 @@ HPALETTE wxMakePalette(const BITMAPINFO FAR* Info, UINT flags)
   HPALETTE hPalette;
   const RGBQUAD FAR* rgb = Info->bmiColors;
 
   HPALETTE hPalette;
   const RGBQUAD FAR* rgb = Info->bmiColors;
 

-  WORD nColors = Info->bmiHeader.biClrUsed;
+  WORD nColors = (WORD)Info->bmiHeader.biClrUsed;

   if (nColors) {
    LOGPALETTE* logPal = (LOGPALETTE*)
      new BYTE[sizeof(LOGPALETTE) + (nColors-1)*sizeof(PALETTEENTRY)];
   if (nColors) {
    LOGPALETTE* logPal = (LOGPALETTE*)
      new BYTE[sizeof(LOGPALETTE) + (nColors-1)*sizeof(PALETTEENTRY)];