added wxListView class: this is going to be a wxListCtrl with human (inter)face

[wxWidgets.git] / src / msw / gdiimage.cpp

diff --git a/src/msw/gdiimage.cpp b/src/msw/gdiimage.cpp
index 215ddda18d31807a6c1f8d0916e92e658a55a23d..000238864c08013694db8fcd8aef28a870061983 100644 (file)
--- a/src/msw/gdiimage.cpp
+++ b/src/msw/gdiimage.cpp
@@ -37,7 +37,10 @@
 
 #include "wx/app.h"
 
 
 #include "wx/app.h"
 

+#ifndef __WXMICROWIN__

 #include "wx/msw/dib.h"
 #include "wx/msw/dib.h"

+#endif
+

 #include "wx/msw/bitmap.h"
 #include "wx/msw/gdiimage.h"
 #include "wx/bitmap.h"
 #include "wx/msw/bitmap.h"
 #include "wx/msw/gdiimage.h"
 #include "wx/bitmap.h"


@@ -50,6 +53,8 @@
 // private classes
 // ----------------------------------------------------------------------------
 
 // private classes
 // ----------------------------------------------------------------------------
 

+#ifndef __WXMICROWIN__
+

 // all image handlers are declared/defined in this file because the outside
 // world doesn't have to know about them (but only about wxBITMAP_TYPE_XXX ids)
 
 // all image handlers are declared/defined in this file because the outside
 // world doesn't have to know about them (but only about wxBITMAP_TYPE_XXX ids)
 


@@ -180,6 +185,8 @@ private:
 // ----------------------------------------------------------------------------
 
 static wxSize GetHiconSize(HICON hicon);
 // ----------------------------------------------------------------------------
 
 static wxSize GetHiconSize(HICON hicon);

+#endif
+    // __MICROWIN__

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -295,12 +302,16 @@ void wxGDIImage::CleanUpHandlers()
 
 void wxGDIImage::InitStandardHandlers()
 {
 
 void wxGDIImage::InitStandardHandlers()
 {

+#ifndef __WXMICROWIN__

     AddHandler(new wxBMPResourceHandler);
     AddHandler(new wxBMPFileHandler);
     AddHandler(new wxICOResourceHandler);
     AddHandler(new wxICOFileHandler);
     AddHandler(new wxBMPResourceHandler);
     AddHandler(new wxBMPFileHandler);
     AddHandler(new wxICOResourceHandler);
     AddHandler(new wxICOFileHandler);

+#endif

 }
 
 }
 

+#ifndef __WXMICROWIN__
+

 // ----------------------------------------------------------------------------
 // wxBitmap handlers
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxBitmap handlers
 // ----------------------------------------------------------------------------


@@ -533,3 +544,5 @@ static wxSize GetHiconSize(HICON hicon)
 
     return size;
 }
 
     return size;
 }

+#endif
+    // __WXMICROWIN__