removing dependancy on mac headers from public wx headers

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

include/wx/mac/private.h

@@ -1,11 +1,13 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        private.h
-// Purpose:     Private declarations
-// Author:      AUTHOR
+// Purpose:     Private declarations: as this header is only included by
+//              wxWindows itself, it may contain identifiers which don't start
+//              with "wx".
+// Author:      Stefan Csomor
 // Modified by:
 // Created:     ??/??/98
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
+// Copyright:   (c) Stefan Csomor
 // Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -14,8 +16,98 @@
 
 #include "wx/defs.h"
 
-/* TODO: put any private declarations here.
- */
+#if defined(__POWERPC__) && defined(__DARWIN__)
+        #include <Carbon/Carbon.h>
+#else
+    #include "MacHeaders.c"
+#endif
+#if UNIVERSAL_INTERFACES_VERSION < 0x0340
+    #error "please update to Apple's lastest universal headers from http://developer.apple.com/sdk/"
+#endif
 
+class wxMacPortStateHelper 
+{
+public :
+	wxMacPortStateHelper( GrafPtr newport) ; 
+	wxMacPortStateHelper() ;
+	~wxMacPortStateHelper() ;
+
+	void Setup( GrafPtr newport ) ;
+	void Clear() ;
+	bool IsCleared() { return m_clip == NULL ; }
+	GrafPtr GetCurrentPort() { return m_currentPort ; }
+
+private :
+	GrafPtr			m_currentPort ;
+	GrafPtr			m_oldPort ;
+	RgnHandle		m_clip ;
+	ThemeDrawingState m_drawingState ;
+	short			m_textFont ;
+	short			m_textSize ;
+	short			m_textStyle ;
+	short 		m_textMode ;
+} ;
+
+class WXDLLEXPORT wxMacPortSetter
+{
+public :
+	wxMacPortSetter( const wxDC* dc ) ;
+	~wxMacPortSetter() ;
+private :
+	wxMacPortStateHelper m_ph ;
+} ;
+
+class wxMacDrawingHelper
+{
+public :
+	wxMacDrawingHelper( wxWindowMac * theWindow , bool clientArea = false ) ;
+	~wxMacDrawingHelper() ;
+	bool Ok() { return m_ok ; }
+	void LocalToWindow( Rect *rect) { OffsetRect( rect , m_origin.h , m_origin.v ) ; }
+	void LocalToWindow( Point *pt ) { AddPt( m_origin , pt ) ; }
+	void LocalToWindow( RgnHandle rgn ) { OffsetRgn( rgn , m_origin.h , m_origin.v ) ; }
+  const Point& GetOrigin() { return m_origin ; }
+private :
+  Point     m_origin ;
+	GrafPtr 	m_formerPort ;
+	GrafPtr		m_currentPort ;
+	PenState 	m_savedPenState ;
+	bool			m_ok ;
+} ;
+
+
+// filefn.h
+WXDLLEXPORT wxString wxMacFSSpec2MacFilename( const FSSpec *spec ) ;
+WXDLLEXPORT void wxMacFilename2FSSpec( const char *path , FSSpec *spec ) ;
+#  ifndef __DARWIN__
+// Mac file names are POSIX (Unix style) under Darwin, so these are not needed
+WXDLLEXPORT wxString wxMacFSSpec2UnixFilename( const FSSpec *spec ) ;
+WXDLLEXPORT void wxUnixFilename2FSSpec( const char *path , FSSpec *spec ) ;
+WXDLLEXPORT wxString wxMac2UnixFilename( const char *s) ;
+WXDLLEXPORT wxString wxUnix2MacFilename( const char *s);
+#  endif
+
+// utils.h
+WXDLLEXPORT wxString wxMacFindFolder(short vRefNum,
+                                     OSType folderType,
+                                     Boolean createFolder);
+
+GWorldPtr 	    wxMacCreateGWorld( int width , int height , int depth ) ;
+void 		        wxMacDestroyGWorld( GWorldPtr gw ) ;
+PicHandle 	    wxMacCreatePict( GWorldPtr gw , GWorldPtr mask = NULL ) ;
+CIconHandle     wxMacCreateCIcon(GWorldPtr image , GWorldPtr mask , short dstDepth , short iconSize  ) ;
+void 		        wxMacSetColorTableEntry( CTabHandle newColors , int index , int red , int green ,  int blue ) ;
+CTabHandle 	    wxMacCreateColorTable( int numColors ) ;
+
+#define MAC_WXCOLORREF(a) (*((RGBColor*)&(a)))
+#define MAC_WXHBITMAP(a) (GWorldPtr(a))
+#define MAC_WXHMETAFILE(a) (PicHandle(a))
+#define MAC_WXHICON(a) (CIconHandle(a))
+#define MAC_WXHCURSOR(a) (CursHandle(a))
+#define MAC_WXHRGN(a) (RgnHandle(a))
+#define MAC_WXHWND(a) (WindowPtr(a))
+#define MAC_WXRECPTR(a) ((Rect*)a)
+#define MAC_WXPOINTPTR(a) ((Point*)a)
+#define MAC_WXHMENU(a) ((MenuHandle)a)
 #endif
     // _WX_PRIVATE_H_