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 b84eb86046af12a9ee5aa34c8bb682c3e51ef696..251150fddbfee9a80268d1f4ff0d8d0b0812f9bf 100644 (file)
--- 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
 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);
 
 // 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 d33f534cf228e1de8a6d8e3cc53a21ea1ad8a5cd..547dd8b7b4cc96d8ae92641d4e2776de9c9e86e2 100644 (file)
--- 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/bitmap.h"
     #include "wx/brush.h"
     #include "wx/radiobox.h"

+    #include "wx/log.h"

 #endif
 
 #include "wx/msw/private.h"
 #endif
 
 #include "wx/msw/private.h"

diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp
index aa2ce7f68306045cda3fd4bfc74e7567d70542ba..5982c8b8b7cdeae961f5ddf4ffd1648465098787 100644 (file)
--- 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/intl.h"
     #include "wx/dynarray.h"
     #include "wx/settings.h"

+    #include "wx/bitmap.h"

 #endif
 
 #if wxUSE_BUTTONBAR && wxUSE_TOOLBAR && defined(__WIN95__)
 #endif
 
 #if wxUSE_BUTTONBAR && wxUSE_TOOLBAR && defined(__WIN95__)

diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp
index e3930803b0502d00ee6993000b1ad208b98c7b06..86967c3addf82400e9efaa1eb9c83270229c3739 100644 (file)
--- 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/settings.h"
     #include "wx/brush.h"
     #include "wx/utils.h"

+    #include "wx/intl.h"

     #include "wx/log.h"
     #include "wx/log.h"

+    #include "wx/app.h"

 #endif
 
 #if wxUSE_CLIPBOARD
 #endif
 
 #if wxUSE_CLIPBOARD

-    #include "wx/app.h"

     #include "wx/clipbrd.h"
 #endif
 
     #include "wx/clipbrd.h"
 #endif