From 22bd93879da9809ecb6ac5cd3bdf58c2aabf0da1 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 27 Jun 2001 13:55:28 +0000 Subject: [PATCH] fix for wxBitmapType definition problem git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10686 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/bitmap.h | 7 ++++--- src/gtk/bitmap.cpp | 3 +++ src/gtk1/bitmap.cpp | 3 +++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/include/wx/bitmap.h b/include/wx/bitmap.h index c65f419f7e..4a1d3b0296 100644 --- a/include/wx/bitmap.h +++ b/include/wx/bitmap.h @@ -23,13 +23,14 @@ #include "wx/defs.h" #include "wx/object.h" #include "wx/string.h" -#include "wx/palette.h" #include "wx/gdiobj.h" +#include "wx/gdicmn.h" // for wxBitmapType -class WXDLLEXPORT wxImage; -class WXDLLEXPORT wxMask; class WXDLLEXPORT wxBitmap; class WXDLLEXPORT wxBitmapHandler; +class WXDLLEXPORT wxImage; +class WXDLLEXPORT wxMask; +class WXDLLEXPORT wxPalette; // ---------------------------------------------------------------------------- // wxBitmapHandler: class which knows how to create/load/save bitmaps in diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp index d81d01c970..30fa4db6fa 100644 --- a/src/gtk/bitmap.cpp +++ b/src/gtk/bitmap.cpp @@ -11,6 +11,9 @@ #pragma implementation "bitmap.h" #endif +#include "wx/defs.h" + +#include "wx/palette.h" #include "wx/bitmap.h" #include "wx/icon.h" #include "wx/filefn.h" diff --git a/src/gtk1/bitmap.cpp b/src/gtk1/bitmap.cpp index d81d01c970..30fa4db6fa 100644 --- a/src/gtk1/bitmap.cpp +++ b/src/gtk1/bitmap.cpp @@ -11,6 +11,9 @@ #pragma implementation "bitmap.h" #endif +#include "wx/defs.h" + +#include "wx/palette.h" #include "wx/bitmap.h" #include "wx/icon.h" #include "wx/filefn.h" -- 2.45.2