Apply parts of patch #1719888 to fix compilation on Mac and with

[wxWidgets.git] / src / stc / PlatWX.cpp

diff --git a/src/stc/PlatWX.cpp b/src/stc/PlatWX.cpp
index 111230d8de597fb935f077eb0c3e11487d0b2831..6d5e4a622b864a112730088b8b1e500a023320ba 100644 (file)
--- a/src/stc/PlatWX.cpp
+++ b/src/stc/PlatWX.cpp
@@ -11,8 +11,12 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_STC
 
 #ifndef WX_PRECOMP
+    #include "wx/menu.h"
+    #include "wx/dcmemory.h"
+    #include "wx/settings.h"
 #endif // WX_PRECOMP
 
 #include <ctype.h>
@@ -779,7 +783,7 @@ END_EVENT_TABLE()
 
 
 #if wxUSE_POPUPWIN //-----------------------------------
-#include <wx/popupwin.h>
+#include "wx/popupwin.h"
 
 
 //
@@ -909,6 +913,7 @@ END_EVENT_TABLE()
 
 
 #else // !wxUSE_POPUPWIN -----------------------------------
+#include "wx/frame.h"
 
 // A normal window to place the wxSTCListBox upon, but make it behave as much
 // like a wxPopupWindow as possible
@@ -1568,3 +1573,5 @@ const wxWX2MBbuf wx2stc(const wxString& str)
 }
 
 #endif
+
+#endif // wxUSE_STC