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

*** empty log message ***

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2776 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Patrick Albert
1999-06-14 07:12:16 +00:00
parent 006162a9e9
commit 27a9bd487b
12 changed files with 43 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/defs.h
View File

@@ -84,6 +84,11 @@
# pragma warning(disable:4100) // unreferenced formal parameter
# pragma warning(disable:4511) // copy ctor couldn't be generated
# pragma warning(disable:4512) // operator=() couldn't be generated
#ifndef WIN32
# pragma warning(disable:4134) // conversion between pointers to members of same class
# pragma warning(disable:4135) // conversion between different integral types
# pragma warning(disable:4769) // assignment of near pointer to long integer
#endif
#endif // __VISUALC__
// suppress some Salford C++ warnings

6
include/wx/msw/dib.h
View File

@@ -19,8 +19,8 @@ wxBitmap *wxLoadBitmap(wxChar *filename, wxColourMap **colourmap = NULL)
bool wxLoadIntoBitmap(wxChar *filename, wxBitmap *bitmap, wxColourMap **pal = NULL);
HANDLE BitmapToDIB (HBITMAP hBitmap, HPALETTE hPal);
BOOL ReadDIB(LPTSTR lpFileName, HBITMAP *bitmap, HPALETTE *palette);
HANDLE ReadDIB2(LPTSTR lpFileName);
LPSTR FindDIBBits (LPTSTR lpbi);
BOOL ReadDIB(LPSTR lpFileName, HBITMAP *bitmap, HPALETTE *palette);
HANDLE ReadDIB2(LPSTR lpFileName);
LPSTR FindDIBBits (LPSTR lpbi);
HPALETTE MakeDIBPalette(LPBITMAPINFOHEADER lpInfo);

10
include/wx/msw/private.h
View File

@@ -77,8 +77,12 @@ WXDLLEXPORT_DATA(extern HFONT) wxSTATUS_LINE_FONT;
typedef int (pascal * WndProcCast) ();
# define CASTWNDPROC (WndProcCast)
# else
typedef int (PASCAL * WndProcCast) ();
# define CASTWNDPROC (WndProcCast)
# if defined(__VISUALC__) && defined(STRICT)
# define CASTWNDPROC (WNDPROC)
# else
typedef int (PASCAL * WndProcCast) ();
# define CASTWNDPROC (WndProcCast)
# endif
# endif
# else
# define CASTWNDPROC
@@ -105,8 +109,10 @@ WXDLLEXPORT_DATA(extern HFONT) wxSTATUS_LINE_FONT;
#endif
#if !defined(__WIN32__) // 3.x uses FARPROC for dialogs
#ifndef STRICT
#define DLGPROC FARPROC
#endif
#endif
#if wxUSE_PENWIN
WXDLLEXPORT void wxRegisterPenWin();