wxMSWUniv build fix.

[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 26b4452ce8acd78649866a017b802a8c4e554135..63109375ca1c67b3ce5f84303c20173e3d4d2468 100644 (file)
--- a/include/wx/mac/carbon/private.h
+++ b/include/wx/mac/carbon/private.h
@@ -29,9 +29,10 @@
 #    include <LowMem.h>
 #    include <Gestalt.h>
 #    include <FixMath.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
 


@@ -39,6 +40,10 @@
     #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
 #ifdef __WXMAC_CARBON__
 #include "wx/mac/corefoundation/cfstring.h"
 #endif


@@ -60,6 +65,7 @@ inline int    FixedToInt( Fixed inFixed )
 
 #include "wx/dc.h"
 #include "wx/window.h"
 
 #include "wx/dc.h"
 #include "wx/window.h"

+#include "wx/toplevel.h"

 
 class wxMacPortStateHelper 
 {
 
 class wxMacPortStateHelper 
 {


@@ -145,6 +151,26 @@ 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
 {
 /*
 class wxMacDrawingHelper
 {


@@ -354,7 +380,6 @@ CIconHandle     wxMacCreateCIcon(GWorldPtr image , GWorldPtr mask , short dstDep
 void                 wxMacSetColorTableEntry( CTabHandle newColors , int index , int red , int green ,  int blue ) ;
 CTabHandle         wxMacCreateColorTable( int numColors ) ;
 */
 void                 wxMacSetColorTableEntry( CTabHandle newColors , int index , int red , int green ,  int blue ) ;
 CTabHandle         wxMacCreateColorTable( int numColors ) ;
 */

-IconRef wxMacCreateIconRef(const wxBitmap& bmp) ;

 void wxMacCreateBitmapButton( ControlButtonContentInfo*info , const wxBitmap& bitmap , int forceType = 0 ) ;
 void wxMacReleaseBitmapButton( ControlButtonContentInfo*info ) ;
 
 void wxMacCreateBitmapButton( ControlButtonContentInfo*info , const wxBitmap& bitmap , int forceType = 0 ) ;
 void wxMacReleaseBitmapButton( ControlButtonContentInfo*info ) ;
 


@@ -377,6 +402,11 @@ private :
     WindowRef m_data ;
 } ;
 
     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) ;
 wxWindow *              wxFindControlFromMacControl(ControlRef inControl ) ;
 wxTopLevelWindowMac*    wxFindWinFromMacWindow( WindowRef inWindow ) ;
 wxMenu*                 wxFindMenuFromMacMenu(MenuRef inMenuRef) ;


@@ -385,25 +415,17 @@ 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 ) ;
 
 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 :
 class wxMacControl
 {
 public :

-    wxMacControl()
-    {
-        m_controlRef = NULL ;
-    }
+    wxMacControl( wxWindow* peer , bool isRootControl = false ) ;    
+    wxMacControl( wxWindow* peer , ControlRef control ) ;
+    wxMacControl( wxWindow* peer , WXWidget control ) ;
+    virtual ~wxMacControl() ;

     
     

-    wxMacControl( ControlRef control ) 
-    {
-        m_controlRef = control ;
-    }
-    wxMacControl( WXWidget control )
-    {
-        m_controlRef = (ControlRef) control ;
-    }
-    virtual ~wxMacControl()
-    {
-    }
+    void Init() ;

     
     virtual void Dispose() ;
 
     
     virtual void Dispose() ;
 


@@ -442,6 +464,7 @@ public :
     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
 
     
     // templated helpers
 


@@ -473,7 +496,11 @@ public :
        
     // 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 ) ;
     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 ) ;


@@ -490,13 +517,23 @@ public :
     // 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 SetTitle( const wxString &title ) ;
     virtual void GetRectInWindowCoords( Rect *r ) ;
     virtual void GetBestRect( Rect *r ) ;
     virtual void SetTitle( const wxString &title ) ;


@@ -538,10 +575,16 @@ public :
     // to be moved into a tab control class
     
     virtual OSStatus SetTabEnabled( SInt16 tabNo , bool enable ) ;
     // to be moved into a tab control class
     
     virtual OSStatus SetTabEnabled( SInt16 tabNo , bool enable ) ;

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

 protected :
     ControlRef  m_controlRef ;
     wxFont      m_font ;
     long        m_windowStyle ; 
 protected :
     ControlRef  m_controlRef ;
     wxFont      m_font ;
     long        m_windowStyle ; 

+    wxWindow*   m_peer ;
+    bool        m_needsFocusRect ;
+    bool        m_isCompositing ;
+    bool        m_isRootControl ;

 } ;
 
 #if wxMAC_USE_CORE_GRAPHICS
 } ;
 
 #if wxMAC_USE_CORE_GRAPHICS


@@ -596,9 +639,14 @@ private:
     wxBrush m_brush ;
 } ;
 
     wxBrush m_brush ;
 } ;
 

+#endif // wxMAC_USE_CORE_GRAPHICS
+
+#ifdef __WXMAC_OSX__
+

 CGColorSpaceRef wxMacGetGenericRGBColorSpace(void) ;
 CGColorSpaceRef wxMacGetGenericRGBColorSpace(void) ;

+void wxMacMemoryBufferReleaseProc(void *info, const void *data, size_t size) ;

 
 

-#endif // wxMAC_USE_CORE_GRAPHICS
+#endif

 
 class WXDLLEXPORT wxBitmapRefData: public wxGDIRefData
 {
 
 class WXDLLEXPORT wxBitmapRefData: public wxGDIRefData
 {


@@ -636,12 +684,26 @@ public:
 #endif // wxUSE_PALETTE
     
     wxMask *      m_bitmapMask; // Optional mask
 #endif // wxUSE_PALETTE
     
     wxMask *      m_bitmapMask; // Optional mask

-#if wxMAC_USE_CORE_GRAPHICS
+#ifdef __WXMAC_OSX__

     CGImageRef    CGImageCreate() const ;
     CGImageRef    CGImageCreate() const ;

-#else
+#endif
+     
+    // 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() ;
+    
+    // returns a Pict from the bitmap content
+    PicHandle     GetPictHandle() ;

     GWorldPtr     GetHBITMAP(GWorldPtr * mask = NULL ) const ;
     void          UpdateAlphaMask() const ;
     GWorldPtr     GetHBITMAP(GWorldPtr * mask = NULL ) const ;
     void          UpdateAlphaMask() const ;

-#endif
+

 private :
     bool Create(int width , int height , int depth) ;
     void Init() ;
 private :
     bool Create(int width , int height , int depth) ;
     void Init() ;


@@ -654,18 +716,17 @@ private :
     wxMemoryBuffer m_memBuf ;
     int           m_rawAccessCount ;
     bool          m_ok;
     wxMemoryBuffer m_memBuf ;
     int           m_rawAccessCount ;
     bool          m_ok;

-#if wxMAC_USE_CORE_GRAPHICS
+#ifdef __WXMAC_OSX__

     mutable CGImageRef    m_cgImageRef ;
     mutable CGImageRef    m_cgImageRef ;

-#else
+#endif
+    IconRef       m_iconRef ;
+    PicHandle     m_pictHandle ;

     GWorldPtr     m_hBitmap;
     GWorldPtr     m_hMaskBitmap ;
     wxMemoryBuffer m_maskMemBuf ;
     int            m_maskBytesPerRow ;
     GWorldPtr     m_hBitmap;
     GWorldPtr     m_hMaskBitmap ;
     wxMemoryBuffer m_maskMemBuf ;
     int            m_maskBytesPerRow ;

-#endif

 };
 
 };
 

-#define M_BITMAPDATA ((wxBitmapRefData *)m_refData)
-

 class WXDLLEXPORT wxIconRefData : public wxGDIRefData
 {
 public:
 class WXDLLEXPORT wxIconRefData : public wxGDIRefData
 {
 public:


@@ -675,13 +736,35 @@ public:
 
     void Init() ;
     virtual void 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 ;
     WXHICON GetHICON() const { return (WXHICON) m_iconRef ; }
 private :
     IconRef m_iconRef ;

+    int m_width ;
+    int m_height ;

 };
 
 };
 

+// toplevel.cpp
+
+ControlRef wxMacFindControlUnderMouse( wxTopLevelWindowMac* toplevelWindow, Point location , WindowRef window , ControlPartCode *outPart ) ;
+

 #endif // wxUSE_GUI
 
 #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
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
 // wxMac string conversions
 //---------------------------------------------------------------------------


@@ -692,10 +775,6 @@ void wxMacCleanupConverters() ;
 void wxMacStringToPascal( const wxString&from , StringPtr to ) ;
 wxString wxMacMakeStringFromPascal( ConstStringPtr from ) ;
 
 void wxMacStringToPascal( const wxString&from , StringPtr to ) ;
 wxString wxMacMakeStringFromPascal( ConstStringPtr from ) ;
 

-// toplevel.cpp
-
-ControlRef wxMacFindControlUnderMouse( Point location , WindowRef window , ControlPartCode *outPart ) ;
-

 // filefn.cpp
 
 wxString wxMacFSRefToPath( const FSRef *fsRef , CFStringRef additionalPathComponent = NULL ) ;
 // filefn.cpp
 
 wxString wxMacFSRefToPath( const FSRef *fsRef , CFStringRef additionalPathComponent = NULL ) ;