From 83eabba429ab076322fbdddd1d011c73af814fe2 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Wed, 17 May 2006 10:42:03 +0000 Subject: [PATCH] Fixes for compile breakage with no PCH git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39187 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/mac/carbon/menuitem.h | 1 + src/mac/carbon/font.cpp | 1 + src/mac/carbon/listbox.cpp | 1 + src/mac/carbon/mediactrl.cpp | 1 + src/mac/carbon/menuitem.cpp | 1 - src/mac/carbon/tooltip.cpp | 3 +-- 6 files changed, 5 insertions(+), 3 deletions(-) diff --git a/include/wx/mac/carbon/menuitem.h b/include/wx/mac/carbon/menuitem.h index 17e5362089..7f89ee9420 100644 --- a/include/wx/mac/carbon/menuitem.h +++ b/include/wx/mac/carbon/menuitem.h @@ -17,6 +17,7 @@ // ---------------------------------------------------------------------------- #include "wx/defs.h" +#include "wx/bitmap.h" // ---------------------------------------------------------------------------- // wxMenuItem: an item in the menu, optionally implements owner-drawn behaviour diff --git a/src/mac/carbon/font.cpp b/src/mac/carbon/font.cpp index 666b85b5f7..b905f5bd09 100644 --- a/src/mac/carbon/font.cpp +++ b/src/mac/carbon/font.cpp @@ -21,6 +21,7 @@ #include "wx/fontutil.h" #include "wx/gdicmn.h" #include "wx/fontutil.h" +#include "wx/intl.h" #include "wx/mac/private.h" diff --git a/src/mac/carbon/listbox.cpp b/src/mac/carbon/listbox.cpp index 6076e3400a..48eecddac0 100644 --- a/src/mac/carbon/listbox.cpp +++ b/src/mac/carbon/listbox.cpp @@ -25,6 +25,7 @@ #include "wx/settings.h" #include "wx/toplevel.h" +#include "wx/intl.h" IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl) diff --git a/src/mac/carbon/mediactrl.cpp b/src/mac/carbon/mediactrl.cpp index 23ad82a570..9a6a0f075c 100644 --- a/src/mac/carbon/mediactrl.cpp +++ b/src/mac/carbon/mediactrl.cpp @@ -41,6 +41,7 @@ // uma is for wxMacFSSpec #include "wx/mac/uma.h" #include "wx/timer.h" +#include "wx/log.h" // standard QT stuff #ifndef __DARWIN__ diff --git a/src/mac/carbon/menuitem.cpp b/src/mac/carbon/menuitem.cpp index 44b80b1319..0eb888060b 100644 --- a/src/mac/carbon/menuitem.cpp +++ b/src/mac/carbon/menuitem.cpp @@ -18,7 +18,6 @@ #endif // WX_PRECOMP #include "wx/menu.h" - #include "wx/mac/uma.h" IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject) diff --git a/src/mac/carbon/tooltip.cpp b/src/mac/carbon/tooltip.cpp index 1adb42296a..3c9eb37081 100644 --- a/src/mac/carbon/tooltip.cpp +++ b/src/mac/carbon/tooltip.cpp @@ -11,14 +11,13 @@ #if wxUSE_TOOLTIPS -#include "wx/tooltip.h" - #ifndef WX_PRECOMP #include "wx/app.h" #include "wx/window.h" #include "wx/dc.h" #endif // WX_PRECOMP +#include "wx/tooltip.h" #include "wx/timer.h" #include "wx/geometry.h" #include "wx/mac/uma.h" -- 2.45.2