stdpaths.h needs filefn.h

[wxWidgets.git] / include / wx / mac / carbon / private.h

diff --git a/include/wx/mac/carbon/private.h b/include/wx/mac/carbon/private.h
index 8a02973a4d53d320a51dc067739508af506860f7..3f20c400762e7ee58f614477c1f9c57c5612e85a 100644 (file)
--- a/include/wx/mac/carbon/private.h
+++ b/include/wx/mac/carbon/private.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        private.h
+// Name:        wx/mac/carbon/private.h

 // Purpose:     Private declarations: as this header is only included by
 //              wxWidgets itself, it may contain identifiers which don't start
 //              with "wx".
 // Purpose:     Private declarations: as this header is only included by
 //              wxWidgets itself, it may contain identifiers which don't start
 //              with "wx".


@@ -28,9 +28,11 @@
 #    include <ControlDefinitions.h>
 #    include <LowMem.h>
 #    include <Gestalt.h>
 #    include <ControlDefinitions.h>
 #    include <LowMem.h>
 #    include <Gestalt.h>

+#    include <FixMath.h>
+#    include <CoreServices.h>

 #endif
 
 #endif
 

-#if UNIVERSAL_INTERFACES_VERSION < 0x0340
+#if UNIVERSAL_INTERFACES_VERSION < 0x0342

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


@@ -38,16 +40,39 @@
     #define MAC_OS_X_VERSION_10_3 1030
 #endif
 
     #define MAC_OS_X_VERSION_10_3 1030
 #endif
 

+#ifndef MAC_OS_X_VERSION_10_4
+    #define MAC_OS_X_VERSION_10_4 1040
+#endif
+
+#ifdef __WXMAC_CARBON__
+#include "wx/mac/corefoundation/cfstring.h"
+#endif
+
+#ifndef FixedToInt
+// as macro in FixMath.h for 10.3
+inline Fixed    IntToFixed( int inInt )
+{
+    return (((SInt32) inInt) << 16);
+}
+
+inline int    FixedToInt( Fixed inFixed )
+{
+    return (((SInt32) inFixed) >> 16);
+}
+#endif
+

 #if wxUSE_GUI
 
 #if wxUSE_GUI
 

+#include "wx/dc.h"

 #include "wx/window.h"
 #include "wx/window.h"

+#include "wx/toplevel.h"

 
 

-class wxMacPortStateHelper 
+class wxMacPortStateHelper

 {
     DECLARE_NO_COPY_CLASS(wxMacPortStateHelper)
 {
     DECLARE_NO_COPY_CLASS(wxMacPortStateHelper)

-        
+

 public:
 public:

-    wxMacPortStateHelper( GrafPtr newport) ; 
+    wxMacPortStateHelper( GrafPtr newport) ;

     wxMacPortStateHelper() ;
     ~wxMacPortStateHelper() ;
 
     wxMacPortStateHelper() ;
     ~wxMacPortStateHelper() ;
 


@@ -70,17 +95,10 @@ private:
 class WXDLLEXPORT wxMacPortSaver
 {
     DECLARE_NO_COPY_CLASS(wxMacPortSaver)
 class WXDLLEXPORT wxMacPortSaver
 {
     DECLARE_NO_COPY_CLASS(wxMacPortSaver)

-        
+

 public:
 public:

-    wxMacPortSaver( GrafPtr port ) 
-    {
-        ::GetPort( &m_port ) ;
-        ::SetPort( port ) ;
-    }
-    ~wxMacPortSaver()
-    {
-        ::SetPort( m_port ) ;
-    }
+    wxMacPortSaver( GrafPtr port );
+    ~wxMacPortSaver();

 private :
     GrafPtr m_port ;
 } ;
 private :
     GrafPtr m_port ;
 } ;


@@ -88,7 +106,7 @@ private :
 class WXDLLEXPORT wxMacPortSetter
 {
     DECLARE_NO_COPY_CLASS(wxMacPortSetter)
 class WXDLLEXPORT wxMacPortSetter
 {
     DECLARE_NO_COPY_CLASS(wxMacPortSetter)

-        
+

 public:
     wxMacPortSetter( const wxDC* dc ) ;
     ~wxMacPortSetter() ;
 public:
     wxMacPortSetter( const wxDC* dc ) ;
     ~wxMacPortSetter() ;


@@ -100,11 +118,11 @@ private:
 /*
  Clips to the visible region of a control within the current port
  */
 /*
  Clips to the visible region of a control within the current port
  */

- 
+

 class WXDLLEXPORT wxMacWindowClipper : public wxMacPortSaver
 {
     DECLARE_NO_COPY_CLASS(wxMacWindowClipper)
 class WXDLLEXPORT wxMacWindowClipper : public wxMacPortSaver
 {
     DECLARE_NO_COPY_CLASS(wxMacWindowClipper)

-        
+

 public:
     wxMacWindowClipper( const wxWindow* win ) ;
     ~wxMacWindowClipper() ;
 public:
     wxMacWindowClipper( const wxWindow* win ) ;
     ~wxMacWindowClipper() ;


@@ -117,7 +135,7 @@ private:
 class WXDLLEXPORT wxMacWindowStateSaver : public wxMacWindowClipper
 {
     DECLARE_NO_COPY_CLASS(wxMacWindowStateSaver)
 class WXDLLEXPORT wxMacWindowStateSaver : public wxMacWindowClipper
 {
     DECLARE_NO_COPY_CLASS(wxMacWindowStateSaver)

-        
+

 public:
     wxMacWindowStateSaver( const wxWindow* win ) ;
     ~wxMacWindowStateSaver() ;
 public:
     wxMacWindowStateSaver( const wxWindow* win ) ;
     ~wxMacWindowStateSaver() ;


@@ -126,11 +144,31 @@ private:
     ThemeDrawingState m_themeDrawingState ;
 } ;
 
     ThemeDrawingState m_themeDrawingState ;
 } ;
 

+#if wxMAC_USE_CORE_GRAPHICS
+class WXDLLEXPORT wxMacCGContextStateSaver
+{
+    DECLARE_NO_COPY_CLASS(wxMacCGContextStateSaver)
+
+public:
+    wxMacCGContextStateSaver( CGContextRef cg )
+    {
+        m_cg = cg ;
+        CGContextSaveGState( cg ) ;
+    }
+    ~wxMacCGContextStateSaver()
+    {
+        CGContextRestoreGState( m_cg ) ;
+    }
+private:
+    CGContextRef m_cg ;
+} ;
+
+#endif

 /*
 class wxMacDrawingHelper
 {
     DECLARE_NO_COPY_CLASS(wxMacDrawingHelper)
 /*
 class wxMacDrawingHelper
 {
     DECLARE_NO_COPY_CLASS(wxMacDrawingHelper)

-        
+

 public:
     wxMacDrawingHelper( wxWindowMac * theWindow , bool clientArea = false ) ;
     ~wxMacDrawingHelper() ;
 public:
     wxMacDrawingHelper( wxWindowMac * theWindow , bool clientArea = false ) ;
     ~wxMacDrawingHelper() ;


@@ -155,58 +193,13 @@ bool wxMacConvertEventToRecord( EventRef event , EventRecord *rec) ;
 
 // filefn.h
 WXDLLEXPORT wxString wxMacFSSpec2MacFilename( const FSSpec *spec ) ;
 
 // filefn.h
 WXDLLEXPORT wxString wxMacFSSpec2MacFilename( const FSSpec *spec ) ;

-WXDLLEXPORT void wxMacFilename2FSSpec( const char *path , FSSpec *spec ) ;
-WXDLLEXPORT void wxMacFilename2FSSpec( const wxChar *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
+WXDLLEXPORT void wxMacFilename2FSSpec( const wxString &path , FSSpec *spec ) ;

 
 // utils.h
 WXDLLEXPORT wxString wxMacFindFolder(short vRefNum,
                                      OSType folderType,
                                      Boolean createFolder);
 
 
 // utils.h
 WXDLLEXPORT wxString wxMacFindFolder(short vRefNum,
                                      OSType folderType,
                                      Boolean createFolder);
 

-#if wxUSE_GUI
-
-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 ) ;
-void wxMacCreateBitmapButton( ControlButtonContentInfo*info , const wxBitmap& bitmap , int forceType = 0 ) ;
-
-#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)
-
-struct wxOpaqueWindowRef
-{
-    wxOpaqueWindowRef( WindowRef ref ) { m_data = ref ; }
-    operator WindowRef() { return m_data ; } 
-private :
-    WindowRef m_data ;
-} ;
-
-wxWindow *              wxFindControlFromMacControl(ControlRef inControl ) ;
-wxTopLevelWindowMac*    wxFindWinFromMacWindow( WindowRef inWindow ) ;
-wxMenu*                 wxFindMenuFromMacMenu(MenuRef inMenuRef) ;
-
-extern wxWindow* g_MacLastWindow ;
-pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) ;
-Rect wxMacGetBoundsForControl( wxWindow* window , const wxPoint& pos , const wxSize &size , bool adjustForOrigin = true ) ;
-

 template<typename T> EventParamType wxMacGetEventParamType() { wxFAIL_MSG( wxT("Unknown Param Type") ) ; return 0 ; }
 template<> inline EventParamType wxMacGetEventParamType<RgnHandle>() { return typeQDRgnHandle ; }
 template<> inline EventParamType wxMacGetEventParamType<ControlRef>() { return typeControlRef ; }
 template<typename T> EventParamType wxMacGetEventParamType() { wxFAIL_MSG( wxT("Unknown Param Type") ) ; return 0 ; }
 template<> inline EventParamType wxMacGetEventParamType<RgnHandle>() { return typeQDRgnHandle ; }
 template<> inline EventParamType wxMacGetEventParamType<ControlRef>() { return typeControlRef ; }


@@ -216,6 +209,10 @@ template<> inline EventParamType wxMacGetEventParamType<EventRef>() { return typ
 template<> inline EventParamType wxMacGetEventParamType<Point>() { return typeQDPoint ; }
 template<> inline EventParamType wxMacGetEventParamType<Rect>() { return typeQDRectangle ; }
 template<> inline EventParamType wxMacGetEventParamType<Boolean>() { return typeBoolean ; }
 template<> inline EventParamType wxMacGetEventParamType<Point>() { return typeQDPoint ; }
 template<> inline EventParamType wxMacGetEventParamType<Rect>() { return typeQDRectangle ; }
 template<> inline EventParamType wxMacGetEventParamType<Boolean>() { return typeBoolean ; }

+template<> inline EventParamType wxMacGetEventParamType<SInt16>() { return typeSInt16 ; }
+template<> inline EventParamType wxMacGetEventParamType<SInt32>() { return typeSInt32 ; }
+template<> inline EventParamType wxMacGetEventParamType<UInt32>() { return typeUInt32 ; }
+template<> inline EventParamType wxMacGetEventParamType<RGBColor>() { return typeRGBColor ; }

 #if TARGET_API_MAC_OSX
 template<> inline EventParamType wxMacGetEventParamType<HICommand>() { return typeHICommand ; }
 template<> inline EventParamType wxMacGetEventParamType<HIPoint>() { return typeHIPoint ; }
 #if TARGET_API_MAC_OSX
 template<> inline EventParamType wxMacGetEventParamType<HICommand>() { return typeHICommand ; }
 template<> inline EventParamType wxMacGetEventParamType<HIPoint>() { return typeHIPoint ; }


@@ -223,39 +220,63 @@ template<> inline EventParamType wxMacGetEventParamType<HISize>() { return typeH
 template<> inline EventParamType wxMacGetEventParamType<HIRect>() { return typeHIRect ; }
 template<> inline EventParamType wxMacGetEventParamType<void*>() { return typeVoidPtr ; }
 #endif
 template<> inline EventParamType wxMacGetEventParamType<HIRect>() { return typeHIRect ; }
 template<> inline EventParamType wxMacGetEventParamType<void*>() { return typeVoidPtr ; }
 #endif

+template<> inline EventParamType wxMacGetEventParamType<CFDictionaryRef>() { return typeCFDictionaryRef ; }

 template<> inline EventParamType wxMacGetEventParamType<Collection>() { return typeCollection ; }
 template<> inline EventParamType wxMacGetEventParamType<CGContextRef>() { return typeCGContextRef ; }
 /*
 template<> inline EventParamType wxMacGetEventParamType<Collection>() { return typeCollection ; }
 template<> inline EventParamType wxMacGetEventParamType<CGContextRef>() { return typeCGContextRef ; }
 /*

-These are ambiguous
-template<> EventParamType wxMacGetEventParamType<GrafPtr>() { return typeGrafPtr ; }
-template<> EventParamType wxMacGetEventParamType<OSStatus>() { return typeOSStatus ; }
-template<> EventParamType wxMacGetEventParamType<CFIndex>() { return typeCFIndex ; }
-template<> EventParamType wxMacGetEventParamType<GWorldPtr>() { return typeGWorldPtr ; }
-*/
+ These are ambiguous
+ template<> EventParamType wxMacGetEventParamType<GrafPtr>() { return typeGrafPtr ; }
+ template<> EventParamType wxMacGetEventParamType<OSStatus>() { return typeOSStatus ; }
+ template<> EventParamType wxMacGetEventParamType<CFIndex>() { return typeCFIndex ; }
+ template<> EventParamType wxMacGetEventParamType<GWorldPtr>() { return typeGWorldPtr ; }
+ */

 
 class wxMacCarbonEvent
 {
 
 class wxMacCarbonEvent
 {

-    
+

 public :
 public :

-    wxMacCarbonEvent( EventRef event , bool release = false ) 
+    wxMacCarbonEvent()
+    {
+        m_eventRef = 0 ;
+        m_release = false ;
+    }
+
+    wxMacCarbonEvent( EventRef event , bool release = false )

     {
         m_eventRef = event ;
         m_release = release ;
     }
     {
         m_eventRef = event ;
         m_release = release ;
     }

-    wxMacCarbonEvent(UInt32 inClassID,UInt32 inKind,EventTime inWhen = 0 /*now*/,EventAttributes inAttributes=kEventAttributeNone) 
+
+    wxMacCarbonEvent(UInt32 inClassID,UInt32 inKind,EventTime inWhen = 0 /*now*/,EventAttributes inAttributes=kEventAttributeNone)

     {
         m_eventRef = NULL ;
         verify_noerr( MacCreateEvent( NULL , inClassID, inKind,inWhen,inAttributes,&m_eventRef) ) ;
         m_release = true ;
     }
     {
         m_eventRef = NULL ;
         verify_noerr( MacCreateEvent( NULL , inClassID, inKind,inWhen,inAttributes,&m_eventRef) ) ;
         m_release = true ;
     }

+

     ~wxMacCarbonEvent()
     {
         if ( m_release )
             ReleaseEvent( m_eventRef ) ;
     }
     ~wxMacCarbonEvent()
     {
         if ( m_release )
             ReleaseEvent( m_eventRef ) ;
     }

-    
+
+    OSStatus Create(UInt32 inClassID,UInt32 inKind,EventTime inWhen = 0 /*now*/,EventAttributes inAttributes=kEventAttributeNone)
+    {
+        verify( (m_eventRef == NULL) || m_release ) ;
+        if ( m_eventRef && m_release )
+        {
+            ReleaseEvent( m_eventRef ) ;
+            m_release = false ;
+            m_eventRef = NULL ;
+        }
+        OSStatus err = MacCreateEvent( NULL , inClassID, inKind,inWhen,inAttributes,&m_eventRef) ;
+        if ( err == noErr )
+            m_release = true ;
+        return err ;
+    }
+

     OSStatus GetParameter( EventParamName inName, EventParamType inDesiredType, UInt32 inBufferSize, void * outData) ;
     OSStatus GetParameter( EventParamName inName, EventParamType inDesiredType, UInt32 inBufferSize, void * outData) ;

-    
+

     template <typename T> OSStatus GetParameter( EventParamName inName, EventParamType type , T *data )
     {
         return GetParameter( inName, type , sizeof( T ) , data ) ;
     template <typename T> OSStatus GetParameter( EventParamName inName, EventParamType type , T *data )
     {
         return GetParameter( inName, type , sizeof( T ) , data ) ;


@@ -264,7 +285,7 @@ public :
     {
         return GetParameter<T>( inName, wxMacGetEventParamType<T>() , data ) ;
     }
     {
         return GetParameter<T>( inName, wxMacGetEventParamType<T>() , data ) ;
     }

-    
+

     template <typename T> T GetParameter( EventParamName inName )
     {
         T value ;
     template <typename T> T GetParameter( EventParamName inName )
     {
         T value ;


@@ -311,44 +332,167 @@ public :
     {
         return EventTimeToTicks( GetTime() ) ;
     }
     {
         return EventTimeToTicks( GetTime() ) ;
     }

-    operator EventRef () { return m_eventRef; }   
+    OSStatus SetCurrentTime( )
+    {
+        return ::SetEventTime( m_eventRef , GetCurrentEventTime() ) ;
+    }
+    OSStatus SetTime( EventTime when )
+    {
+        return ::SetEventTime( m_eventRef , when ) ;
+    }
+    operator EventRef () { return m_eventRef; }
+
+    bool IsValid() { return m_eventRef != 0 ; }

 protected :
     EventRef m_eventRef ;
     bool     m_release ;
 } ;
 
 protected :
     EventRef m_eventRef ;
     bool     m_release ;
 } ;
 

-class wxMacControl
+//
+// helper class for allocating and deallocating Universal Proc Ptrs
+//
+
+template <typename procType, typename uppType , uppType (*newUPP)(procType) , void (*disposeUPP)(uppType) > class wxMacUPP

 {
 public :
 {
 public :

-    wxMacControl()
+    wxMacUPP( procType proc )

     {
     {

-        m_controlRef = NULL ;
+        m_upp = NULL ;
+        m_upp = (*newUPP)( NULL ) ;

     }
     }

-    
-    wxMacControl( ControlRef control ) 
+    ~wxMacUPP()
+    {
+        if ( m_upp )
+            disposeUPP( m_upp ) ;
+    }
+    operator uppType() { return m_upp ; }
+private :
+    uppType m_upp ;
+} ;
+
+typedef wxMacUPP<NMProcPtr,NMUPP,NewNMUPP,DisposeNMUPP> wxMacNMUPP ;
+
+template <typename refType> class wxMacCFRefHolder
+{
+public :
+    wxMacCFRefHolder()
+        : m_ref(NULL) , m_release(false)

     {
     {

-        m_controlRef = control ;

     }
     }

-    wxMacControl( WXWidget control )
+
+    wxMacCFRefHolder( refType ref , bool release = true )
+        : m_ref(ref) , m_release(release)

     {
     {

-        m_controlRef = (ControlRef) control ;

     }
     }

-    virtual ~wxMacControl()
+
+    ~wxMacCFRefHolder()

     {
     {

+        CFRelease( m_ref ) ;

     }
     }

-    
+
+    void Release()
+    {
+        if ( m_release && m_ref != NULL )
+            CFRelease( m_ref ) ;
+        m_ref = NULL ;
+    }
+
+    refType Detach()
+    {
+        refType val = m_ref ;
+        m_release = false ;
+        m_ref = NULL ;
+        return val ;
+    }
+
+    void Set( refType ref , bool release = true  )
+    {
+        Release() ;
+        m_release = release ;
+        m_ref = ref ;
+    }
+
+    operator refType () const { return m_ref; }
+
+private :
+    refType m_ref ;
+    bool m_release ;
+
+    DECLARE_NO_COPY_CLASS( wxMacCFRefHolder )
+} ;
+
+#if wxUSE_GUI
+/*
+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 ) ;
+*/
+void wxMacCreateBitmapButton( ControlButtonContentInfo*info , const wxBitmap& bitmap , int forceType = 0 ) ;
+void wxMacReleaseBitmapButton( ControlButtonContentInfo*info ) ;
+
+#define MAC_WXCOLORREF(a) (*((RGBColor*)&(a)))
+#define MAC_WXHBITMAP(a) (GWorldPtr(a))
+#define MAC_WXHMETAFILE(a) (PicHandle(a))
+#define MAC_WXHICON(a) (IconRef(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)
+
+struct wxOpaqueWindowRef
+{
+    wxOpaqueWindowRef( WindowRef ref ) { m_data = ref ; }
+    operator WindowRef() { return m_data ; }
+private :
+    WindowRef m_data ;
+} ;
+
+void wxMacRectToNative( const wxRect *wx , Rect *n ) ;
+void wxMacNativeToRect( const Rect *n , wxRect* wx ) ;
+void wxMacPointToNative( const wxPoint* wx , Point *n ) ;
+void wxMacNativeToPoint( const Point *n , wxPoint* wx ) ;
+
+wxWindow *              wxFindControlFromMacControl(ControlRef inControl ) ;
+wxTopLevelWindowMac*    wxFindWinFromMacWindow( WindowRef inWindow ) ;
+wxMenu*                 wxFindMenuFromMacMenu(MenuRef inMenuRef) ;
+
+int                     wxMacCommandToId( UInt32 macCommandId ) ;
+UInt32                  wxIdToMacCommand( int wxId ) ;
+wxMenu*                 wxFindMenuFromMacCommand( const HICommand &macCommandId , wxMenuItem* &item ) ;
+
+extern wxWindow* g_MacLastWindow ;
+pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) ;
+Rect wxMacGetBoundsForControl( wxWindow* window , const wxPoint& pos , const wxSize &size , bool adjustForOrigin = true ) ;
+
+ControlActionUPP GetwxMacLiveScrollbarActionProc() ;
+
+class wxMacControl
+{
+public :
+    wxMacControl( wxWindow* peer , bool isRootControl = false ) ;
+    wxMacControl( wxWindow* peer , ControlRef control ) ;
+    wxMacControl( wxWindow* peer , WXWidget control ) ;
+    virtual ~wxMacControl() ;
+
+    void Init() ;
+

     virtual void Dispose() ;
 
     bool Ok() const { return GetControlRef() != NULL ; }
     virtual void Dispose() ;
 
     bool Ok() const { return GetControlRef() != NULL ; }

-    
-    virtual ControlRef * GetControlRefAddr() { return &m_controlRef; } 
-    virtual ControlRef GetControlRef() const { return m_controlRef ; }  

 
 

-    virtual void SetReference( SInt32 data ) ; 
+    virtual ControlRef * GetControlRefAddr() { return &m_controlRef; }
+    virtual ControlRef GetControlRef() const { return m_controlRef ; }
+
+    virtual void SetReference( SInt32 data ) ;

     /*
     void operator= (ControlRef c) { m_controlRef = c ; }
     /*
     void operator= (ControlRef c) { m_controlRef = c ; }

-    operator ControlRef () { return m_controlRef; }   
-    operator ControlRef * () { return &m_controlRef; }   
+    operator ControlRef () { return m_controlRef; }
+    operator ControlRef * () { return &m_controlRef; }

     */
     // accessing data and values
 
     */
     // accessing data and values
 


@@ -363,18 +507,19 @@ public :
     virtual SInt32 GetValue() const ;
     virtual SInt32 GetMaximum() const ;
     virtual SInt32 GetMinimum() const ;
     virtual SInt32 GetValue() const ;
     virtual SInt32 GetMaximum() const ;
     virtual SInt32 GetMinimum() const ;

-    
+

     virtual void SetValue( SInt32 v ) ;
     virtual void SetMinimum( SInt32 v ) ;
     virtual void SetMaximum( SInt32 v ) ;
 
     virtual void SetValueAndRange( SInt32 value , SInt32 minimum , SInt32 maximum ) ;
     virtual void SetRange( SInt32 minimum , SInt32 maximum ) ;
     virtual void SetValue( SInt32 v ) ;
     virtual void SetMinimum( SInt32 v ) ;
     virtual void SetMaximum( SInt32 v ) ;
 
     virtual void SetValueAndRange( SInt32 value , SInt32 minimum , SInt32 maximum ) ;
     virtual void SetRange( SInt32 minimum , SInt32 maximum ) ;

-    
+

     virtual OSStatus SetFocus( ControlFocusPart focusPart ) ;
     virtual bool HasFocus() const ;
     virtual bool NeedsFocusRect() const ;
     virtual OSStatus SetFocus( ControlFocusPart focusPart ) ;
     virtual bool HasFocus() const ;
     virtual bool NeedsFocusRect() const ;

-    
+    virtual void SetNeedsFocusRect( bool needs ) ;
+

     // templated helpers
 
     Size GetDataSize( ControlPartCode inPartCode , ResType inTag ) const
     // templated helpers
 
     Size GetDataSize( ControlPartCode inPartCode , ResType inTag ) const


@@ -391,6 +536,14 @@ public :
     {
         return SetData( inPartCode , inTag , sizeof( T ) , &data ) ;
     }
     {
         return SetData( inPartCode , inTag , sizeof( T ) , &data ) ;
     }

+    template <typename T> OSStatus SetData( ResType inTag , const T *data )
+    {
+        return SetData( kControlEntireControl , inTag , sizeof( T ) , data ) ;
+    }
+    template <typename T> OSStatus SetData( ResType inTag , const T& data )
+    {
+        return SetData( kControlEntireControl , inTag , sizeof( T ) , &data ) ;
+    }

     template <typename T> OSStatus GetData( ControlPartCode inPartCode , ResType inTag , T *data ) const
     {
         Size dummy ;
     template <typename T> OSStatus GetData( ControlPartCode inPartCode , ResType inTag , T *data ) const
     {
         Size dummy ;


@@ -402,44 +555,69 @@ public :
         verify_noerr( GetData<T>( inPartCode , inTag , &value ) ) ;
         return value ;
     }
         verify_noerr( GetData<T>( inPartCode , inTag , &value ) ) ;
         return value ;
     }

-       
+    template <typename T> OSStatus GetData( ResType inTag , T *data ) const
+    {
+        Size dummy ;
+        return GetData( kControlEntireControl , inTag , sizeof( T ) , data , &dummy ) ;
+    }
+    template <typename T> T GetData( ResType inTag ) const
+    {
+        T value ;
+        verify_noerr( GetData<T>( kControlEntireControl , inTag , &value ) ) ;
+        return value ;
+    }
+    

     // Flash the control for the specified amount of time
     virtual void Flash( ControlPartCode part , UInt32 ticks = 8 ) ;
     // Flash the control for the specified amount of time
     virtual void Flash( ControlPartCode part , UInt32 ticks = 8 ) ;

+

     virtual void VisibilityChanged( bool shown ) ;
     virtual void VisibilityChanged( bool shown ) ;

+    virtual void SuperChangedPosition() ;
+
+

     virtual void SetFont( const wxFont & font , const wxColour& foreground , long windowStyle ) ;
     virtual void SetBackground( const wxBrush &brush ) ;
     virtual ControlPartCode HandleKey(  SInt16 keyCode,  SInt16 charCode, EventModifiers modifiers ) ;
     void SetActionProc( ControlActionUPP   actionProc ) ;
     void SetViewSize( SInt32 viewSize ) ;
     SInt32 GetViewSize() const ;
     virtual void SetFont( const wxFont & font , const wxColour& foreground , long windowStyle ) ;
     virtual void SetBackground( const wxBrush &brush ) ;
     virtual ControlPartCode HandleKey(  SInt16 keyCode,  SInt16 charCode, EventModifiers modifiers ) ;
     void SetActionProc( ControlActionUPP   actionProc ) ;
     void SetViewSize( SInt32 viewSize ) ;
     SInt32 GetViewSize() const ;

-    
+

     virtual bool IsVisible() const ;
     virtual void SetVisibility( bool visible , bool redraw ) ;
     virtual bool IsEnabled() const ;
     virtual bool IsActive() const ;
     virtual void Enable( bool enable ) ;
     virtual bool IsVisible() const ;
     virtual void SetVisibility( bool visible , bool redraw ) ;
     virtual bool IsEnabled() const ;
     virtual bool IsActive() const ;
     virtual void Enable( bool enable ) ;

-    
+

     // invalidates this control and all children
     virtual void InvalidateWithChildren() ;
     virtual void SetDrawingEnabled( bool enable ) ;
     // invalidates this control and all children
     virtual void InvalidateWithChildren() ;
     virtual void SetDrawingEnabled( bool enable ) ;

+#ifdef __WXMAC_OSX__

     virtual bool GetNeedsDisplay() const ;
     virtual bool GetNeedsDisplay() const ;

-    virtual void SetNeedsDisplay( bool needsDisplay , RgnHandle where = NULL ) ;
+#endif
+    // where is in native window relative coordinates
+    virtual void SetNeedsDisplay( RgnHandle where ) ;
+    // where is in native window relative coordinates
+    virtual void SetNeedsDisplay( Rect* where = NULL ) ;

 
 

-    virtual void ScrollRect( const wxRect &rect , int dx , int dy ) ;
+    // if rect = NULL, entire view
+    virtual void ScrollRect( wxRect *rect , int dx , int dy ) ;

 
 

+    // in native parent window relative coordinates

     virtual void GetRect( Rect *r ) ;
     virtual void GetRect( Rect *r ) ;

+
+    // in native parent window relative coordinates

     virtual void SetRect( Rect *r ) ;
     virtual void SetRect( Rect *r ) ;

+

     virtual void GetRectInWindowCoords( Rect *r ) ;
     virtual void GetBestRect( Rect *r ) ;
     virtual void GetRectInWindowCoords( Rect *r ) ;
     virtual void GetBestRect( Rect *r ) ;

-    virtual void SetTitle( const wxString &title ) ;
+    virtual void SetLabel( const wxString &title ) ;

     // converts from Toplevel-Content relative to local
     static void Convert( wxPoint *pt , wxMacControl *convert , wxMacControl *to ) ;
     // converts from Toplevel-Content relative to local
     static void Convert( wxPoint *pt , wxMacControl *convert , wxMacControl *to ) ;

-    
+

     virtual void GetFeatures( UInt32 *features ) ;
     virtual OSStatus GetRegion( ControlPartCode partCode , RgnHandle region ) ;
     virtual OSStatus SetZOrder( bool above , wxMacControl* other ) ;
     // to be moved into a databrowser subclass
     virtual void GetFeatures( UInt32 *features ) ;
     virtual OSStatus GetRegion( ControlPartCode partCode , RgnHandle region ) ;
     virtual OSStatus SetZOrder( bool above , wxMacControl* other ) ;
     // to be moved into a databrowser subclass

-    
+

     virtual OSStatus SetSelectionFlags( DataBrowserSelectionFlags ) ;
     virtual OSStatus AddListViewColumn( DataBrowserListViewColumnDesc *columnDesc,
         DataBrowserTableViewColumnIndex position ) ;
     virtual OSStatus SetSelectionFlags( DataBrowserSelectionFlags ) ;
     virtual OSStatus AddListViewColumn( DataBrowserListViewColumnDesc *columnDesc,
         DataBrowserTableViewColumnIndex position ) ;


@@ -449,126 +627,246 @@ public :
     virtual OSStatus SetListViewHeaderBtnHeight(UInt16 height) ;
     virtual OSStatus SetCallbacks(const DataBrowserCallbacks *  callbacks) ;
     virtual OSStatus UpdateItems( DataBrowserItemID container, UInt32 numItems,
     virtual OSStatus SetListViewHeaderBtnHeight(UInt16 height) ;
     virtual OSStatus SetCallbacks(const DataBrowserCallbacks *  callbacks) ;
     virtual OSStatus UpdateItems( DataBrowserItemID container, UInt32 numItems,

-            const DataBrowserItemID* items,                
+            const DataBrowserItemID* items,

             DataBrowserPropertyID preSortProperty,
             DataBrowserPropertyID propertyID ) ;
     virtual OSStatus AddItems( DataBrowserItemID container, UInt32 numItems,
             DataBrowserPropertyID preSortProperty,
             DataBrowserPropertyID propertyID ) ;
     virtual OSStatus AddItems( DataBrowserItemID container, UInt32 numItems,

-            const DataBrowserItemID* items,                
+            const DataBrowserItemID* items,

             DataBrowserPropertyID preSortProperty ) ;
     virtual OSStatus RemoveItems( DataBrowserItemID container, UInt32 numItems,
             DataBrowserPropertyID preSortProperty ) ;
     virtual OSStatus RemoveItems( DataBrowserItemID container, UInt32 numItems,

-            const DataBrowserItemID* items,                
+            const DataBrowserItemID* items,

             DataBrowserPropertyID preSortProperty ) ;
     virtual OSStatus RevealItem( DataBrowserItemID item,
             DataBrowserPropertyID propertyID,
             DataBrowserRevealOptions options ) ;
             DataBrowserPropertyID preSortProperty ) ;
     virtual OSStatus RevealItem( DataBrowserItemID item,
             DataBrowserPropertyID propertyID,
             DataBrowserRevealOptions options ) ;

+    virtual OSStatus GetSelectionAnchor( DataBrowserItemID * first, DataBrowserItemID * last ) ;

     virtual bool IsItemSelected( DataBrowserItemID item ) ;
     virtual OSStatus SetSelectedItems(UInt32 numItems,
             const DataBrowserItemID * items,
             DataBrowserSetOption operation ) ;
     virtual bool IsItemSelected( DataBrowserItemID item ) ;
     virtual OSStatus SetSelectedItems(UInt32 numItems,
             const DataBrowserItemID * items,
             DataBrowserSetOption operation ) ;

-            
+

     // to be moved into a tab control class
     // to be moved into a tab control class

-    
+

     virtual OSStatus SetTabEnabled( SInt16 tabNo , bool enable ) ;
     virtual OSStatus SetTabEnabled( SInt16 tabNo , bool enable ) ;

+    bool    IsCompositing() { return m_isCompositing ; }
+    bool    IsRootControl() { return m_isRootControl ; }

 protected :
     ControlRef  m_controlRef ;
     wxFont      m_font ;
 protected :
     ControlRef  m_controlRef ;
     wxFont      m_font ;

-    long        m_windowStyle ; 
+    long        m_windowStyle ;
+    wxWindow*   m_peer ;
+    bool        m_needsFocusRect ;
+    bool        m_isCompositing ;
+    bool        m_isRootControl ;

 } ;
 
 } ;
 

-#endif // wxUSE_GUI
+#if wxMAC_USE_CORE_GRAPHICS

 
 

-//---------------------------------------------------------------------------
-// wxMac string conversions
-//---------------------------------------------------------------------------
+class WXDLLEXPORT wxMacCGPath : public wxGraphicPath
+{
+    DECLARE_NO_COPY_CLASS(wxMacCGPath)
+public :
+    wxMacCGPath() ;
+    ~wxMacCGPath() ;

 
 

-void wxMacSetupConverters() ;
-void wxMacCleanupConverters() ;
+    //  Starts a new subpath at
+    void MoveToPoint( wxCoord x1 , wxCoord y1 ) ;
+    void AddLineToPoint( wxCoord x1 , wxCoord y1 ) ;
+    void AddQuadCurveToPoint( wxCoord cx1, wxCoord cy1, wxCoord x1, wxCoord y1 ) ;
+    void AddRectangle( wxCoord x, wxCoord y, wxCoord w, wxCoord h ) ;
+    void AddCircle( wxCoord x, wxCoord y , wxCoord r ) ;

 
 

-void wxMacStringToPascal( const wxString&from , StringPtr to ) ;
-wxString wxMacMakeStringFromPascal( ConstStringPtr from ) ;
+    // closes the current subpath
+    void CloseSubpath() ;

 
 

-void wxMacConvertNewlines13To10( char * data ) ;
-void wxMacConvertNewlines10To13( char * data ) ;
-void wxMacConvertNewlines13To10( wxString *data ) ;
-void wxMacConvertNewlines10To13( wxString *data ) ;
+    CGPathRef GetPath() const ;
+private :
+    CGMutablePathRef m_path ;
+} ;
+
+class WXDLLEXPORT wxMacCGContext : public wxGraphicContext
+{
+    DECLARE_NO_COPY_CLASS(wxMacCGContext)
+
+public:
+    wxMacCGContext( CGrafPtr port ) ;
+    wxMacCGContext( CGContextRef cgcontext ) ;
+    wxMacCGContext() ;
+    ~wxMacCGContext() ;
+
+    virtual void Clip( const wxRegion &region ) ;
+    virtual void StrokePath( const wxGraphicPath *p ) ;
+    virtual void DrawPath( const wxGraphicPath *p , int fillStyle = wxWINDING_RULE ) ;
+    virtual void FillPath( const wxGraphicPath *p , const wxColor &fillColor , int fillStyle = wxWINDING_RULE ) ;
+
+    virtual wxGraphicPath* CreatePath() ;
+    virtual void SetPen( const wxPen &pen )  ;
+    virtual void SetBrush( const wxBrush &brush ) ;
+    CGContextRef GetNativeContext() ;
+    void SetNativeContext( CGContextRef cg ) ;
+    CGPathDrawingMode GetDrawingMode() const { return m_mode ; }
+private:
+    CGContextRef m_cgContext ;
+    CGrafPtr m_qdPort ;
+    CGPathDrawingMode m_mode ;
+    wxPen m_pen ;
+    wxBrush m_brush ;
+} ;
+
+#endif // wxMAC_USE_CORE_GRAPHICS
+
+#ifdef __WXMAC_OSX__
+
+CGColorSpaceRef wxMacGetGenericRGBColorSpace(void) ;
+void wxMacMemoryBufferReleaseProc(void *info, const void *data, size_t size) ;

 
 

-#if wxUSE_UNICODE
-void wxMacConvertNewlines13To10( wxChar * data ) ;
-void wxMacConvertNewlines10To13( wxChar * data ) ;

 #endif
 
 #endif
 

-#if TARGET_CARBON
-
-class wxMacCFStringHolder                                                             
-{                                                                           
-public:      
-       wxMacCFStringHolder()
-       {
-       m_cfs = NULL ;
-       m_release = false ;                                                                 
-       }
-                                                                      
-    wxMacCFStringHolder(const wxString &str , wxFontEncoding encoding )                                          
-    {      
-       m_cfs = NULL ;
-       m_release = false ;  
-       Assign( str , encoding ) ;
-    }                                                                       
-                                                                            
-    wxMacCFStringHolder(CFStringRef ref , bool release = true )                                                   
-    {                                                                       
-        m_cfs = ref ;
-        m_release = release ;                                           
-    }                                                                       
-                                                                            
-    ~wxMacCFStringHolder() 
-    { 
-       Release() ;
-    }                                           
+class WXDLLEXPORT wxBitmapRefData: public wxGDIRefData
+{
+    DECLARE_NO_COPY_CLASS(wxBitmapRefData)

 
 

-    CFStringRef Detach()
-    {
-       CFStringRef retval = m_cfs ;
-       m_release = false ;
-       m_cfs = NULL ;
-       return retval ;
-    }         
-                                                                   
-    void Release()
-    {
-       if ( m_release && m_cfs)
-               CFRelease( m_cfs ) ;
-       m_cfs = NULL ;
-    }         
+    friend class WXDLLEXPORT wxIcon;
+    friend class WXDLLEXPORT wxCursor;
+public:
+    wxBitmapRefData(int width , int height , int depth);
+    wxBitmapRefData();
+    ~wxBitmapRefData();

 
 

-       void Assign( const wxString &str , wxFontEncoding encoding ) ;
+    void Free() ;
+    bool Ok() const { return m_ok ; }
+    void SetOk( bool isOk) { m_ok = isOk ; }

 
 

-    operator CFStringRef () { return m_cfs; }   
-    wxString AsString( wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ;
-             
-private:             
-                                                              
-    CFStringRef m_cfs;
-    bool m_release ;                                                        
-} ;
+    void SetWidth( int width ) { m_width = width ; }
+    void SetHeight( int height ) { m_height = height ; }
+    void SetDepth( int depth ) { m_depth = depth ; }
+
+    int GetWidth() const { return m_width ; }
+    int GetHeight() const { return m_height ; }
+    int GetDepth() const { return m_depth ; }

 
 

+    void *GetRawAccess() const ;
+    void *BeginRawAccess() ;
+    void EndRawAccess() ;
+
+    bool HasAlpha() const { return m_hasAlpha ; }
+    void UseAlpha( bool useAlpha ) ;
+
+public:
+#if wxUSE_PALETTE
+    wxPalette     m_bitmapPalette;
+#endif // wxUSE_PALETTE
+
+    wxMask *      m_bitmapMask; // Optional mask
+#ifdef __WXMAC_OSX__
+    CGImageRef    CGImageCreate() const ;

 #endif
 
 #endif
 

-// utils.cpp
+    // returns true if the bitmap has a size that
+    // can be natively transferred into a true icon
+    // if no is returned GetIconRef will still produce
+    // an icon but it will be generated via a PICT and
+    // rescaled to 16 x 16
+    bool          HasNativeSize() ;
+
+    // caller should increase ref count if needed longer
+    // than the bitmap exists
+    IconRef       GetIconRef() ;

 
 

-wxUint32 wxMacGetSystemEncFromFontEnc(wxFontEncoding encoding) ;
-wxFontEncoding wxMacGetFontEncFromSystemEnc(wxUint32 encoding) ;
-void wxMacWakeUp() ;
+    // returns a Pict from the bitmap content
+    PicHandle     GetPictHandle() ;
+    GWorldPtr     GetHBITMAP(GWorldPtr * mask = NULL ) const ;
+    void          UpdateAlphaMask() const ;
+
+private :
+    bool Create(int width , int height , int depth) ;
+    void Init() ;
+
+    int           m_width;
+    int           m_height;
+    int           m_bytesPerRow ;
+    int           m_depth;
+    bool          m_hasAlpha;
+    wxMemoryBuffer m_memBuf ;
+    int           m_rawAccessCount ;
+    bool          m_ok;
+#ifdef __WXMAC_OSX__
+    mutable CGImageRef    m_cgImageRef ;
+#endif
+    IconRef       m_iconRef ;
+    PicHandle     m_pictHandle ;
+    GWorldPtr     m_hBitmap;
+    GWorldPtr     m_hMaskBitmap ;
+    wxMemoryBuffer m_maskMemBuf ;
+    int            m_maskBytesPerRow ;
+};
+
+class WXDLLEXPORT wxIconRefData : public wxGDIRefData
+{
+public:
+    wxIconRefData() ;
+    wxIconRefData( WXHICON ) ;
+    virtual ~wxIconRefData() { Free(); }
+
+    void Init() ;
+    virtual void Free();
+
+    void SetWidth( int width ) { m_width = width ; }
+    void SetHeight( int height ) { m_height = height ; }
+
+    int GetWidth() const { return m_width ; }
+    int GetHeight() const { return m_height ; }
+
+    WXHICON GetHICON() const { return (WXHICON) m_iconRef ; }
+private :
+    IconRef m_iconRef ;
+    int m_width ;
+    int m_height ;
+};

 
 // toplevel.cpp
 
 
 // toplevel.cpp
 

-ControlRef wxMacFindControlUnderMouse( Point location , WindowRef window , ControlPartCode *outPart ) ;
+ControlRef wxMacFindControlUnderMouse( wxTopLevelWindowMac* toplevelWindow, const Point& location , WindowRef window , ControlPartCode *outPart ) ;

 
 

-#ifdef TARGET_API_MAC_OSX
-#define kDefaultPathStyle kCFURLPOSIXPathStyle
+#if WORDS_BIGENDIAN
+    inline Rect* wxMacGetPictureBounds( PicHandle pict , Rect* rect ) 
+    { 
+       *rect = (**pict).picFrame ; 
+        return rect ;
+    }

 #else
 #else

-#define kDefaultPathStyle kCFURLHFSPathStyle
+    inline Rect* wxMacGetPictureBounds( PicHandle pict , Rect* rect ) 
+    {   
+        return QDGetPictureBounds( pict , rect ) ;
+    }

 #endif
 
 #endif
 

+#endif // wxUSE_GUI
+
+#define wxMAC_DEFINE_PROC_GETTER( UPP , x ) \
+UPP Get##x()                                \
+{                                           \
+    static UPP sHandler = NULL;             \
+    if ( sHandler == NULL )                 \
+        sHandler = New##UPP( x );           \
+    return sHandler;                        \
+}
+
+//---------------------------------------------------------------------------
+// wxMac string conversions
+//---------------------------------------------------------------------------
+
+void wxMacSetupConverters() ;
+void wxMacCleanupConverters() ;
+
+void wxMacStringToPascal( const wxString&from , StringPtr to ) ;
+wxString wxMacMakeStringFromPascal( ConstStringPtr from ) ;
+
+// filefn.cpp
+
+wxString wxMacFSRefToPath( const FSRef *fsRef , CFStringRef additionalPathComponent = NULL ) ;
+OSStatus wxMacPathToFSRef( const wxString&path , FSRef *fsRef ) ;
+wxString wxMacHFSUniStrToString( ConstHFSUniStr255Param uniname ) ;
+

 #endif
     // _WX_PRIVATE_H_
 #endif
     // _WX_PRIVATE_H_