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 909a3ae5c90a4c5cec1529d54ec570ab7ea55dc7..4cfc3d058b7e2232df9cef6772cfc773ac9c9197 100644 (file)
--- 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 242f508193b6f0ecdaf19547d2b23240c18123c1..7fa15578a6da238a15609fcb8d8d9d219bcc1dbb 100644 (file)
--- 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 8ebf138ace42cc51fe8c22d4f51ffd1651717c73..83d879ce26ea2067c2ba56a3d3d6f9f831401e26 100644 (file)
--- 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"