removed not implemented anyhow SetIcons()

[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 53aaa10dc53e8271bd3a77c414f9ae8439e06062..19d4470e575d38c40086da3e9ba4e119c3beed1e 100644 (file)
--- a/include/wx/mac/carbon/private.h
+++ b/include/wx/mac/carbon/private.h
@@ -16,54 +16,10 @@
 
 #include "wx/defs.h"
 
 
 #include "wx/defs.h"
 

-#ifdef __DARWIN__
-#    include <Carbon/Carbon.h>
-#else
-#    include <Debugging.h>
-#    include <Quickdraw.h>
-#    include <Appearance.h>
-#    include <Folders.h>
-#    include <Controls.h>
-#    include <ControlDefinitions.h>
-#    include <LowMem.h>
-#    include <Gestalt.h>
-#    include <FixMath.h>
-#    include <CoreServices.h>
-#endif
-
-#if UNIVERSAL_INTERFACES_VERSION < 0x0342
-    #error "please update to Apple's latest universal headers from http://developer.apple.com/sdk/"
-#endif
-
-#ifndef MAC_OS_X_VERSION_10_3
-    #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
+#include <Carbon/Carbon.h>

 
 

-#ifndef MAC_OS_X_VERSION_10_5
-    #define MAC_OS_X_VERSION_10_5 1050
-#endif
-
-#ifdef __WXMAC_CARBON__

 #include "wx/mac/corefoundation/cfstring.h"
 #include "wx/mac/corefoundation/cfdataref.h"
 #include "wx/mac/corefoundation/cfstring.h"
 #include "wx/mac/corefoundation/cfdataref.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 MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5
 typedef UInt32 URefCon;
 
 #if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5
 typedef UInt32 URefCon;


@@ -227,16 +183,12 @@ template<> inline EventParamType wxMacGetEventParamType<SInt16>() { return typeS
 template<> inline EventParamType wxMacGetEventParamType<SInt32>() { return typeSInt32; }
 template<> inline EventParamType wxMacGetEventParamType<UInt32>() { return typeUInt32; }
 template<> inline EventParamType wxMacGetEventParamType<RGBColor>() { return typeRGBColor; }
 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; }
 template<> inline EventParamType wxMacGetEventParamType<HISize>() { return typeHISize; }
 template<> inline EventParamType wxMacGetEventParamType<HIRect>() { return typeHIRect; }
 template<> inline EventParamType wxMacGetEventParamType<void*>() { return typeVoidPtr; }
 template<> inline EventParamType wxMacGetEventParamType<HICommand>() { return typeHICommand; }
 template<> inline EventParamType wxMacGetEventParamType<HIPoint>() { return typeHIPoint; }
 template<> inline EventParamType wxMacGetEventParamType<HISize>() { return typeHISize; }
 template<> inline EventParamType wxMacGetEventParamType<HIRect>() { return typeHIRect; }
 template<> inline EventParamType wxMacGetEventParamType<void*>() { return typeVoidPtr; }

-#endif
-#if TARGET_API_MAC_OSX && ( MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2 )

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

-#endif

 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; }
 /*


@@ -473,9 +425,7 @@ private :
 #if wxUSE_TIMER 
     wxMacToolTipTimer* m_timer ;
 #endif
 #if wxUSE_TIMER 
     wxMacToolTipTimer* m_timer ;
 #endif

-#if TARGET_CARBON

     wxMacCFStringHolder m_helpTextRef ;
     wxMacCFStringHolder m_helpTextRef ;

-#endif

 } ;
 
 /*
 } ;
 
 /*


@@ -514,17 +464,17 @@ void wxMacNativeToRect( const Rect *n , wxRect* wx );
 void wxMacPointToNative( const wxPoint* wx , Point *n );
 void wxMacNativeToPoint( const Point *n , wxPoint* 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);
+WXDLLIMPEXP_CORE wxWindow * wxFindControlFromMacControl(ControlRef inControl );
+WXDLLIMPEXP_CORE wxTopLevelWindowMac* wxFindWinFromMacWindow( WindowRef inWindow );
+WXDLLIMPEXP_CORE wxMenu* wxFindMenuFromMacMenu(MenuRef inMenuRef);

 
 

-int                     wxMacCommandToId( UInt32 macCommandId );
-UInt32                  wxIdToMacCommand( int wxId );
-wxMenu*                 wxFindMenuFromMacCommand( const HICommand &macCommandId , wxMenuItem* &item );
+WXDLLIMPEXP_CORE int wxMacCommandToId( UInt32 macCommandId );
+WXDLLIMPEXP_CORE UInt32 wxIdToMacCommand( int wxId );
+WXDLLIMPEXP_CORE wxMenu* wxFindMenuFromMacCommand( const HICommand &macCommandId , wxMenuItem* &item );

 
 extern wxWindow* g_MacLastWindow;
 
 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 );
+WXDLLIMPEXP_CORE pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , EventRef event , void *data );
+WXDLLIMPEXP_CORE Rect wxMacGetBoundsForControl( wxWindow* window , const wxPoint& pos , const wxSize &size , bool adjustForOrigin = true );

 
 ControlActionUPP GetwxMacLiveScrollbarActionProc();
 
 
 ControlActionUPP GetwxMacLiveScrollbarActionProc();
 


@@ -654,9 +604,8 @@ 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;

-#endif
+

     // where is in native window relative coordinates
     virtual void SetNeedsDisplay( RgnHandle where );
     // where is in native window relative coordinates
     // where is in native window relative coordinates
     virtual void SetNeedsDisplay( RgnHandle where );
     // where is in native window relative coordinates


@@ -1225,13 +1174,9 @@ private:
 
 #endif // wxMAC_USE_CORE_GRAPHICS
 
 
 #endif // wxMAC_USE_CORE_GRAPHICS
 

-#ifdef __WXMAC_OSX__
-

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

-#endif
-

 class WXDLLEXPORT wxBitmapRefData: public wxGDIRefData
 {
     friend class WXDLLIMPEXP_FWD_CORE wxIcon;
 class WXDLLEXPORT wxBitmapRefData: public wxGDIRefData
 {
     friend class WXDLLIMPEXP_FWD_CORE wxIcon;


@@ -1269,9 +1214,7 @@ public:
 #endif // wxUSE_PALETTE
 
     wxMask *      m_bitmapMask; // Optional mask
 #endif // wxUSE_PALETTE
 
     wxMask *      m_bitmapMask; // Optional mask

-#ifdef __WXMAC_OSX__

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

-#endif

 
     // returns true if the bitmap has a size that
     // can be natively transferred into a true icon
 
     // returns true if the bitmap has a size that
     // can be natively transferred into a true icon


@@ -1305,9 +1248,8 @@ private :
     wxMemoryBuffer m_memBuf;
     int           m_rawAccessCount;
     bool          m_ok;
     wxMemoryBuffer m_memBuf;
     int           m_rawAccessCount;
     bool          m_ok;

-#ifdef __WXMAC_OSX__

     mutable CGImageRef    m_cgImageRef;
     mutable CGImageRef    m_cgImageRef;

-#endif
+

     IconRef       m_iconRef;
     PicHandle     m_pictHandle;
 #if wxMAC_USE_CORE_GRAPHICS
     IconRef       m_iconRef;
     PicHandle     m_pictHandle;
 #if wxMAC_USE_CORE_GRAPHICS


@@ -1355,8 +1297,6 @@ protected :
     WindowRef m_macWindow ;
 } ;
 
     WindowRef m_macWindow ;
 } ;
 

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

 #ifndef __LP64__
 
 #ifdef WORDS_BIGENDIAN
 #ifndef __LP64__
 
 #ifdef WORDS_BIGENDIAN