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

more compilation fixes


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

diff --git a/include/wx/msw/dib.h b/include/wx/msw/dib.h
index b84eb86046..251150fddb 100644
--- a/include/wx/msw/dib.h
+++ b/include/wx/msw/dib.h
@@ -38,7 +38,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, wxColourMap **colourmap = NULL);
+wxBitmap         *wxLoadBitmap(wxChar *filename, wxPalette **colourmap = NULL);
 
 // Load into existing bitmap;
 bool wxLoadIntoBitmap(wxChar *filename, wxBitmap *bitmap, wxColourMap **pal = NULL);
diff --git a/src/msw/radiobox.cpp b/src/msw/radiobox.cpp
index d33f534cf2..547dd8b7b4 100644
--- a/src/msw/radiobox.cpp
+++ b/src/msw/radiobox.cpp
@@ -32,6 +32,7 @@
     #include "wx/bitmap.h"
     #include "wx/brush.h"
     #include "wx/radiobox.h"
+    #include "wx/log.h"
 #endif
 
 #include "wx/msw/private.h"
diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp
index aa2ce7f683..5982c8b8b7 100644
--- a/src/msw/tbar95.cpp
+++ b/src/msw/tbar95.cpp
@@ -33,6 +33,7 @@
     #include "wx/intl.h"
     #include "wx/dynarray.h"
     #include "wx/settings.h"
+    #include "wx/bitmap.h"
 #endif
 
 #if wxUSE_BUTTONBAR && wxUSE_TOOLBAR && defined(__WIN95__)
diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp
index e3930803b0..86967c3add 100644
--- a/src/msw/textctrl.cpp
+++ b/src/msw/textctrl.cpp
@@ -33,11 +33,12 @@
     #include "wx/settings.h"
     #include "wx/brush.h"
     #include "wx/utils.h"
+    #include "wx/intl.h"
     #include "wx/log.h"
+    #include "wx/app.h"
 #endif
 
 #if wxUSE_CLIPBOARD
-    #include "wx/app.h"
     #include "wx/clipbrd.h"
 #endif