Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove unneeded includes from mac/carbon/private.h

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39244 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2006-05-20 05:47:39 +00:00
parent 813b6b3f88
commit dd0d56f5c7
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/wx/mac/carbon/private.h
View File

@@ -15,7 +15,6 @@
#define _WX_PRIVATE_H_ #define _WX_PRIVATE_H_
#include "wx/defs.h" #include "wx/defs.h"
#include "wx/app.h"
#ifdef __DARWIN__ #ifdef __DARWIN__
# include <Carbon/Carbon.h> # include <Carbon/Carbon.h>
@@ -33,7 +32,7 @@
#endif #endif
#if UNIVERSAL_INTERFACES_VERSION < 0x0342 #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 #endif
#ifndef MAC_OS_X_VERSION_10_3 #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/listbox.h"
#include "wx/window.h"
#include "wx/toplevel.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 ); GWorldPtr wxMacCreateGWorld( int width , int height , int depth );
void wxMacDestroyGWorld( GWorldPtr gw ); void wxMacDestroyGWorld( GWorldPtr gw );

4
include/wx/mac/corefoundation/cfstring.h
View File

@@ -18,6 +18,10 @@
#include <CFString.h> #include <CFString.h>
#endif #endif
#include "wx/fontenc.h"
class WXDLLIMPEXP_BASE wxString;
void wxMacConvertNewlines13To10( char * data ) ; void wxMacConvertNewlines13To10( char * data ) ;
void wxMacConvertNewlines10To13( char * data ) ; void wxMacConvertNewlines10To13( char * data ) ;
void wxMacConvertNewlines13To10( wxString *data ) ; void wxMacConvertNewlines13To10( wxString *data ) ;