Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Doc & Symantec C++ fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1325 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1999-01-07 08:43:47 +00:00
parent 06cfab1738
commit 2432b92dd7
97 changed files with 576 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/msw/dib.cpp
View File

@@ -35,6 +35,7 @@
#ifndef WX_PRECOMP
#include "wx/setup.h"
#include "wx/defs.h"
#include "wx/bitmap.h"
#endif
#include <windows.h>
@@ -688,7 +689,7 @@ HPALETTE MakeDIBPalette(LPBITMAPINFOHEADER lpInfo)
return((HPALETTE) GetStockObject(DEFAULT_PALETTE));
}
bool wxLoadIntoBitmap(char *filename, wxBitmap *bitmap, wxColourMap **pal)
bool wxLoadIntoBitmap(char *filename, wxBitmap *bitmap, wxPalette **pal)
{
HBITMAP hBitmap;
HPALETTE hPalette;
@@ -705,7 +706,7 @@ bool wxLoadIntoBitmap(char *filename, wxBitmap *bitmap, wxColourMap **pal)
{
if (pal)
{
*pal = new wxColourMap;
*pal = new wxPalette;
(*pal)->SetHPALETTE((WXHPALETTE) hPalette);
}
else
@@ -729,7 +730,7 @@ bool wxLoadIntoBitmap(char *filename, wxBitmap *bitmap, wxColourMap **pal)
else return FALSE;
}
wxBitmap *wxLoadBitmap(char *filename, wxColourMap **pal)
wxBitmap *wxLoadBitmap(char *filename, wxPalette **pal)
{
wxBitmap *bitmap = new wxBitmap;
if (wxLoadIntoBitmap(filename, bitmap, pal))
@@ -918,7 +919,7 @@ HANDLE BitmapToDIB (HBITMAP hBitmap, HPALETTE hPal)
return hDIB;
}
bool wxSaveBitmap(char *filename, wxBitmap *bitmap, wxColourMap *colourmap)
bool wxSaveBitmap(char *filename, wxBitmap *bitmap, wxPalette *colourmap)
{
HPALETTE hPalette = 0;
if (colourmap)