Further wxUniv fixes

[wxWidgets.git] / include / wx / msw / dib.h

diff --git a/include/wx/msw/dib.h b/include/wx/msw/dib.h
index dce72a14046237e6817dcf86f34382279307b33e..dd68491a029810b9add169d8abd23f5b905c8f12 100644 (file)
--- a/include/wx/msw/dib.h
+++ b/include/wx/msw/dib.h
@@ -15,6 +15,9 @@
 class WXDLLEXPORT wxBitmap;
 class WXDLLEXPORT wxPalette;
 
 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
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // 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 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
 
 
 // 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
 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);
 
 // Load into existing bitmap;
 bool wxLoadIntoBitmap(wxChar *filename, wxBitmap *bitmap, wxPalette **pal = NULL);