mingw32 compilation fixes

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

include/wx/msw/control.h

@@ -16,6 +16,8 @@
     #pragma interface "control.h"
 #endif
 
+#include "wx/dynarray.h"
+
 // General item class
 class WXDLLEXPORT wxControl : public wxControlBase
 {

include/wx/msw/gdiimage.h

@@ -21,6 +21,8 @@
 #endif
 
 #include "wx/gdiobj.h"          // base class
+#include "wx/gdicmn.h"          // wxBITMAP_TYPE_INVALID
+#include "wx/list.h"
 
 class WXDLLEXPORT wxGDIImageRefData;
 class WXDLLEXPORT wxGDIImageHandler;

src/msw/bmpbuttn.cpp

@@ -21,7 +21,7 @@
 #endif
 
 #ifndef WX_PRECOMP
-#include "wx/bmpbuttn.h"
+    #include "wx/bmpbuttn.h"
 #endif
 
 #include "wx/msw/private.h"

src/msw/xpmhand.cpp

@@ -10,41 +10,39 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
-#pragma implementation "xpmhand.h"
+    #pragma implementation "xpmhand.h"
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
 #ifndef WX_PRECOMP
-#include <stdio.h>
+    #include "wx/list.h"
-#include "wx/setup.h"
+    #include "wx/utils.h"
-#include "wx/list.h"
+    #include "wx/app.h"
-#include "wx/utils.h"
+    #include "wx/palette.h"
-#include "wx/app.h"
+    #include "wx/dcmemory.h"
-#include "wx/palette.h"
+    #include "wx/bitmap.h"
-#include "wx/dcmemory.h"
+    #include "wx/icon.h"
-#include "wx/bitmap.h"
-#include "wx/icon.h"
 #endif
 
 #include "wx/msw/private.h"
 #include "wx/log.h"
 
-#include "assert.h"
-
 #if wxUSE_XPM_IN_MSW
-#define FOR_MSW 1
+    #define FOR_MSW 1
-#include "../xpm/xpm34.h"
+    #include "../xpm/xpm34.h"
 #endif
 
 #include "wx/xpmhand.h"
 #include "wx/msw/dib.h"
 
+#if wxUSE_XPM_IN_MSW
+
 static void XpmToBitmap(wxBitmap *bitmap,
                         const XImage *ximage,
                         const XpmAttributes& xpmAttr)
@@ -64,10 +62,14 @@ static void XpmToBitmap(wxBitmap *bitmap,
     refData->m_numColors = xpmAttr.npixels;
 }
 
+#endif // wxUSE_XPM_IN_MSW
+
 IMPLEMENT_DYNAMIC_CLASS(wxXPMFileHandler, wxBitmapHandler)
 
-bool wxXPMFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
+bool wxXPMFileHandler::LoadFile(wxBitmap *bitmap,
-    int desiredWidth, int desiredHeight)
+                                const wxString& name,
+                                long flags,
+                                int desiredWidth, int desiredHeight)
 {
 #if wxUSE_XPM_IN_MSW
     XImage *ximage;
@@ -99,7 +101,10 @@ bool wxXPMFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long fla
     return FALSE;
 }
 
-bool wxXPMFileHandler::SaveFile(wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette)
+bool wxXPMFileHandler::SaveFile(wxBitmap *bitmap,
+                                const wxString& name,
+                                int type,
+                                const wxPalette *palette)
 {
 #if wxUSE_XPM_IN_MSW
     HDC     dc = NULL;
@@ -138,7 +143,12 @@ bool wxXPMFileHandler::SaveFile(wxBitmap *bitmap, const wxString& name, int type
 
 IMPLEMENT_DYNAMIC_CLASS(wxXPMDataHandler, wxBitmapHandler)
 
-bool wxXPMDataHandler::Create(wxBitmap *bitmap, void *data, long flags, int width, int height, int depth)
+bool wxXPMDataHandler::Create(wxBitmap *bitmap,
+                              void *data,
+                              long flags,
+                              int width,
+                              int height,
+                              int depth)
 {
 #if wxUSE_XPM_IN_MSW
   XImage *ximage;