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

applied patch 417699 (remove WXDLLEXPORT from inline functions)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9891 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-04-26 16:38:11 +00:00
parent 7d88e2447e
commit 6d56eb5c56
6 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,6 +15,9 @@
class WXDLLEXPORT wxBitmap;
class WXDLLEXPORT wxPalette;
// WARNING: these functions are private to wxWindows and shouldn't be used
// by the user code, they risk to disappear in the next versions!
// ----------------------------------------------------------------------------
// Functions for working with DIBs
// ----------------------------------------------------------------------------
@@ -29,8 +32,8 @@ extern bool wxCreateDIB(long xSize, long ySize, long bitsPerPixel,
extern void wxFreeDIB(LPBITMAPINFO lpDIBHeader);
// defined in ole/dataobj.cpp
extern size_t wxConvertBitmapToDIB(LPBITMAPINFO pbi, const wxBitmap& bitmap);
extern wxBitmap wxConvertDIBToBitmap(const LPBITMAPINFO pbi);
extern WXDLLEXPORT size_t wxConvertBitmapToDIB(LPBITMAPINFO pbi, const wxBitmap& bitmap);
extern WXDLLEXPORT wxBitmap wxConvertDIBToBitmap(const LPBITMAPINFO pbi);
// the rest is defined in dib.cpp
@@ -38,7 +41,7 @@ extern wxBitmap wxConvertDIBToBitmap(const LPBITMAPINFO pbi);
bool wxSaveBitmap(wxChar *filename, wxBitmap *bitmap, wxPalette *colourmap = NULL);
// Load device independent bitmap into device dependent bitmap
wxBitmap *wxLoadBitmap(wxChar *filename, wxPalette **colourmap = NULL);
wxBitmap *wxLoadBitmap(wxChar *filename, wxPalette **colourmap = NULL);
// Load into existing bitmap;
bool wxLoadIntoBitmap(wxChar *filename, wxBitmap *bitmap, wxPalette **pal = NULL);