remove unneeded includes from mac/carbon/private.h

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

diff --git a/include/wx/mac/carbon/private.h b/include/wx/mac/carbon/private.h
index 5af6bc06639ba512aeac8ac534c36b5293976981..41e936264a13a4101eeb12e3e1cce7fface22025 100644 (file)
--- a/include/wx/mac/carbon/private.h
+++ b/include/wx/mac/carbon/private.h
@@ -15,7 +15,6 @@
 #define _WX_PRIVATE_H_
 
 #include "wx/defs.h"
 #define _WX_PRIVATE_H_
 
 #include "wx/defs.h"

-#include "wx/app.h"

 
 #ifdef __DARWIN__
 #    include <Carbon/Carbon.h>
 
 #ifdef __DARWIN__
 #    include <Carbon/Carbon.h>


@@ -33,7 +32,7 @@
 #endif
 
 #if UNIVERSAL_INTERFACES_VERSION < 0x0342
 #endif
 
 #if UNIVERSAL_INTERFACES_VERSION < 0x0342

-    #error "please update to Apple's lastest universal headers from http://developer.apple.com/sdk/"
+    #error "please update to Apple's latest universal headers from http://developer.apple.com/sdk/"

 #endif
 
 #ifndef MAC_OS_X_VERSION_10_3
 #endif
 
 #ifndef MAC_OS_X_VERSION_10_3


@@ -63,9 +62,7 @@ inline int    FixedToInt( Fixed inFixed )
 
 #if wxUSE_GUI
 
 
 #if wxUSE_GUI
 

-#include "wx/dc.h"
-#include "wx/window.h"
-#include "wx/toplevel.h"
+#include "wx/listbox.h"

 
 class wxMacPortStateHelper
 {
 
 class wxMacPortStateHelper
 {


@@ -428,8 +425,6 @@ private :
 
 #if wxUSE_GUI
 
 
 #if wxUSE_GUI
 

-#include "wx/listbox.h"
-

 /*
 GWorldPtr         wxMacCreateGWorld( int width , int height , int depth );
 void                 wxMacDestroyGWorld( GWorldPtr gw );
 /*
 GWorldPtr         wxMacCreateGWorld( int width , int height , int depth );
 void                 wxMacDestroyGWorld( GWorldPtr gw );

diff --git a/include/wx/mac/corefoundation/cfstring.h b/include/wx/mac/corefoundation/cfstring.h
index 526f5791a52b23595617ab10570f38cc983b23d6..5e9f2ffc2642390af9feccfed48b74846a1ca1ad 100644 (file)
--- a/include/wx/mac/corefoundation/cfstring.h
+++ b/include/wx/mac/corefoundation/cfstring.h
@@ -18,6 +18,10 @@
     #include <CFString.h>
 #endif
 
     #include <CFString.h>
 #endif
 

+#include "wx/fontenc.h"
+
+class WXDLLIMPEXP_BASE wxString;
+

 void wxMacConvertNewlines13To10( char * data ) ;
 void wxMacConvertNewlines10To13( char * data ) ;
 void wxMacConvertNewlines13To10( wxString *data ) ;
 void wxMacConvertNewlines13To10( char * data ) ;
 void wxMacConvertNewlines10To13( char * data ) ;
 void wxMacConvertNewlines13To10( wxString *data ) ;