From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 26 Jan 2010 09:01:13 +0000 (+0000)
Subject: Compilation fixes for PCH-less build after ownerdraw-refactor branch merge.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/9d043a922718bc9852f2db620b6eba21722083f7

Compilation fixes for PCH-less build after ownerdraw-refactor branch merge.

Forward declare more classes, in particular use tagRECT which can be forward
declared, instead of RECT typedef in public headers.

Also include more header in #ifndef WX_PRECOMP case.

See #11595.

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

diff --git a/include/wx/msw/menuitem.h b/include/wx/msw/menuitem.h
index 909a3ae5c9..4cfc3d058b 100644
--- a/include/wx/msw/menuitem.h
+++ b/include/wx/msw/menuitem.h
@@ -19,6 +19,8 @@
 #if wxUSE_OWNER_DRAWN
     #include "wx/ownerdrw.h"
     #include "wx/bitmap.h"
+
+    struct tagRECT;
 #endif
 
 // ----------------------------------------------------------------------------
@@ -120,7 +122,7 @@ protected:
 
 private:
     // helper function for draw std menu check mark
-    void DrawStdCheckMark(WXHDC hdc, const RECT* rc, wxODStatus stat);
+    void DrawStdCheckMark(WXHDC hdc, const tagRECT* rc, wxODStatus stat);
 
 #endif // wxUSE_OWNER_DRAWN
 
diff --git a/include/wx/ownerdrw.h b/include/wx/ownerdrw.h
index 242f508193..7fa15578a6 100644
--- a/include/wx/ownerdrw.h
+++ b/include/wx/ownerdrw.h
@@ -19,6 +19,8 @@
 #include "wx/font.h"
 #include "wx/colour.h"
 
+class WXDLLIMPEXP_FWD_CORE wxDC;
+
 // ----------------------------------------------------------------------------
 // wxOwnerDrawn - a mix-in base class, derive from it to implement owner-drawn
 //                behaviour
diff --git a/src/msw/menuitem.cpp b/src/msw/menuitem.cpp
index 8ebf138ace..83d879ce26 100644
--- a/src/msw/menuitem.cpp
+++ b/src/msw/menuitem.cpp
@@ -30,6 +30,8 @@
 #include "wx/stockitem.h"
 
 #ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/dcmemory.h"
     #include "wx/font.h"
     #include "wx/bitmap.h"
     #include "wx/settings.h"