From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 26 Nov 1999 16:29:54 +0000 (+0000)
Subject: attempt at more compilation fixes
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/fef15b42f36ea19d7162f4ff2750423cc954e7e3

attempt at more compilation fixes


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4699 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/include/wx/msw/dib.h b/include/wx/msw/dib.h
index 251150fddb..dce72a1404 100644
--- a/include/wx/msw/dib.h
+++ b/include/wx/msw/dib.h
@@ -41,7 +41,7 @@ bool wxSaveBitmap(wxChar *filename, wxBitmap *bitmap, wxPalette *colourmap = NUL
 wxBitmap         *wxLoadBitmap(wxChar *filename, wxPalette **colourmap = NULL);
 
 // Load into existing bitmap;
-bool wxLoadIntoBitmap(wxChar *filename, wxBitmap *bitmap, wxColourMap **pal = NULL);
+bool wxLoadIntoBitmap(wxChar *filename, wxBitmap *bitmap, wxPalette **pal = NULL);
 
 HANDLE wxBitmapToDIB (HBITMAP hBitmap, HPALETTE hPal);
 BOOL   wxReadDIB(LPTSTR lpFileName, HBITMAP *bitmap, HPALETTE *palette);
diff --git a/src/msw/cursor.cpp b/src/msw/cursor.cpp
index 706b97fb92..4cea893b6b 100644
--- a/src/msw/cursor.cpp
+++ b/src/msw/cursor.cpp
@@ -32,8 +32,9 @@
     #include "wx/list.h"
     #include "wx/utils.h"
     #include "wx/app.h"
-    #include "wx/cursor.h"
+    #include "wx/bitmap.h"
     #include "wx/icon.h"
+    #include "wx/cursor.h"
 #endif
 
 #include "wx/msw/private.h"