X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/66e23ad2081689dad6e829b9667cdbc93ac45154..328bfc22243e3d4672ddf626db4f78e4269c7275:/src/msw/gdiimage.cpp diff --git a/src/msw/gdiimage.cpp b/src/msw/gdiimage.cpp index 215ddda18d..000238864c 100644 --- a/src/msw/gdiimage.cpp +++ b/src/msw/gdiimage.cpp @@ -37,7 +37,10 @@ #include "wx/app.h" +#ifndef __WXMICROWIN__ #include "wx/msw/dib.h" +#endif + #include "wx/msw/bitmap.h" #include "wx/msw/gdiimage.h" #include "wx/bitmap.h" @@ -50,6 +53,8 @@ // 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) @@ -180,6 +185,8 @@ private: // ---------------------------------------------------------------------------- static wxSize GetHiconSize(HICON hicon); +#endif + // __MICROWIN__ // ============================================================================ // implementation @@ -295,12 +302,16 @@ void wxGDIImage::CleanUpHandlers() void wxGDIImage::InitStandardHandlers() { +#ifndef __WXMICROWIN__ AddHandler(new wxBMPResourceHandler); AddHandler(new wxBMPFileHandler); AddHandler(new wxICOResourceHandler); AddHandler(new wxICOFileHandler); +#endif } +#ifndef __WXMICROWIN__ + // ---------------------------------------------------------------------------- // wxBitmap handlers // ---------------------------------------------------------------------------- @@ -533,3 +544,5 @@ static wxSize GetHiconSize(HICON hicon) return size; } +#endif + // __WXMICROWIN__