cleanup for 10.5 minimum

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

diff --git a/src/osx/carbon/app.cpp b/src/osx/carbon/app.cpp
index aa37c9e249ff453337c0e554ef3f6cbfd3c0e18e..72602a844edfa072960ae2388824204e19919cc7 100644 (file)
--- a/src/osx/carbon/app.cpp
+++ b/src/osx/carbon/app.cpp
@@ -1062,133 +1062,6 @@ void wxApp::MacHandleUnhandledEvent( WXEVENTREF WXUNUSED(evr) )
 
 #if wxOSX_USE_COCOA_OR_CARBON
 
 
 #if wxOSX_USE_COCOA_OR_CARBON
 

-#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5
-
-// adding forward compatible defines for keys that are different on different keyboard layouts
-// see Inside Mac Volume V
-
-enum {
-    kVK_ANSI_A = 0x00,
-    kVK_ANSI_S = 0x01,
-    kVK_ANSI_D = 0x02,
-    kVK_ANSI_F = 0x03,
-    kVK_ANSI_H = 0x04,
-    kVK_ANSI_G = 0x05,
-    kVK_ANSI_Z = 0x06,
-    kVK_ANSI_X = 0x07,
-    kVK_ANSI_C = 0x08,
-    kVK_ANSI_V = 0x09,
-    kVK_ANSI_B = 0x0B,
-    kVK_ANSI_Q = 0x0C,
-    kVK_ANSI_W = 0x0D,
-    kVK_ANSI_E = 0x0E,
-    kVK_ANSI_R = 0x0F,
-    kVK_ANSI_Y = 0x10,
-    kVK_ANSI_T = 0x11,
-    kVK_ANSI_1 = 0x12,
-    kVK_ANSI_2 = 0x13,
-    kVK_ANSI_3 = 0x14,
-    kVK_ANSI_4 = 0x15,
-    kVK_ANSI_6 = 0x16,
-    kVK_ANSI_5 = 0x17,
-    kVK_ANSI_Equal = 0x18,
-    kVK_ANSI_9 = 0x19,
-    kVK_ANSI_7 = 0x1A,
-    kVK_ANSI_Minus = 0x1B,
-    kVK_ANSI_8 = 0x1C,
-    kVK_ANSI_0 = 0x1D,
-    kVK_ANSI_RightBracket = 0x1E,
-    kVK_ANSI_O = 0x1F,
-    kVK_ANSI_U = 0x20,
-    kVK_ANSI_LeftBracket = 0x21,
-    kVK_ANSI_I = 0x22,
-    kVK_ANSI_P = 0x23,
-    kVK_ANSI_L = 0x25,
-    kVK_ANSI_J = 0x26,
-    kVK_ANSI_Quote = 0x27,
-    kVK_ANSI_K = 0x28,
-    kVK_ANSI_Semicolon = 0x29,
-    kVK_ANSI_Backslash = 0x2A,
-    kVK_ANSI_Comma = 0x2B,
-    kVK_ANSI_Slash = 0x2C,
-    kVK_ANSI_N = 0x2D,
-    kVK_ANSI_M = 0x2E,
-    kVK_ANSI_Period = 0x2F,
-    kVK_ANSI_Grave = 0x32,
-    kVK_ANSI_KeypadDecimal = 0x41,
-    kVK_ANSI_KeypadMultiply = 0x43,
-    kVK_ANSI_KeypadPlus = 0x45,
-    kVK_ANSI_KeypadClear = 0x47,
-    kVK_ANSI_KeypadDivide = 0x4B,
-    kVK_ANSI_KeypadEnter = 0x4C,
-    kVK_ANSI_KeypadMinus = 0x4E,
-    kVK_ANSI_KeypadEquals = 0x51,
-    kVK_ANSI_Keypad0 = 0x52,
-    kVK_ANSI_Keypad1 = 0x53,
-    kVK_ANSI_Keypad2 = 0x54,
-    kVK_ANSI_Keypad3 = 0x55,
-    kVK_ANSI_Keypad4 = 0x56,
-    kVK_ANSI_Keypad5 = 0x57,
-    kVK_ANSI_Keypad6 = 0x58,
-    kVK_ANSI_Keypad7 = 0x59,
-    kVK_ANSI_Keypad8 = 0x5B,
-    kVK_ANSI_Keypad9 = 0x5C
-};
-
-// defines for keys that are the same on all layouts
-
-enum {
-    kVK_Return = 0x24,
-    kVK_Tab = 0x30,
-    kVK_Space = 0x31,
-    kVK_Delete = 0x33,
-    kVK_Escape = 0x35,
-    kVK_Command = 0x37,
-    kVK_Shift = 0x38,
-    kVK_CapsLock = 0x39,
-    kVK_Option = 0x3A,
-    kVK_Control = 0x3B,
-    kVK_RightShift = 0x3C,
-    kVK_RightOption = 0x3D,
-    kVK_RightControl = 0x3E,
-    kVK_Function = 0x3F,
-    kVK_F17 = 0x40,
-    kVK_VolumeUp = 0x48,
-    kVK_VolumeDown = 0x49,
-    kVK_Mute = 0x4A,
-    kVK_F18 = 0x4F,
-    kVK_F19 = 0x50,
-    kVK_F20 = 0x5A,
-    kVK_F5 = 0x60,
-    kVK_F6 = 0x61,
-    kVK_F7 = 0x62,
-    kVK_F3 = 0x63,
-    kVK_F8 = 0x64,
-    kVK_F9 = 0x65,
-    kVK_F11 = 0x67,
-    kVK_F13 = 0x69,
-    kVK_F16 = 0x6A,
-    kVK_F14 = 0x6B,
-    kVK_F10 = 0x6D,
-    kVK_F12 = 0x6F,
-    kVK_F15 = 0x71,
-    kVK_Help = 0x72,
-    kVK_Home = 0x73,
-    kVK_PageUp = 0x74,
-    kVK_ForwardDelete = 0x75,
-    kVK_F4 = 0x76,
-    kVK_End = 0x77,
-    kVK_F2 = 0x78,
-    kVK_PageDown = 0x79,
-    kVK_F1 = 0x7A,
-    kVK_LeftArrow = 0x7B,
-    kVK_RightArrow = 0x7C,
-    kVK_DownArrow = 0x7D,
-    kVK_UpArrow = 0x7E
-};
-
-#endif    
-

 CGKeyCode wxCharCodeWXToOSX(wxKeyCode code)
 {
     CGKeyCode keycode;
 CGKeyCode wxCharCodeWXToOSX(wxKeyCode code)
 {
     CGKeyCode keycode;

diff --git a/src/osx/carbon/graphics.cpp b/src/osx/carbon/graphics.cpp
index 90a6d6446c0beec494b087674ad326ec115c3f0b..a1f994748960f38fe6fb36c20aa0f22038fed08e 100644 (file)
--- a/src/osx/carbon/graphics.cpp
+++ b/src/osx/carbon/graphics.cpp
@@ -148,26 +148,14 @@ OSStatus wxMacDrawCGImage(
 CGColorRef wxMacCreateCGColor( const wxColour& col )
 {
     CGColorRef retval = 0;
 CGColorRef wxMacCreateCGColor( const wxColour& col )
 {
     CGColorRef retval = 0;

-#ifdef __WXMAC__
+

     retval = col.CreateCGColor();
     retval = col.CreateCGColor();

-#else
-// TODO add conversion NSColor - CGColorRef (obj-c)
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
-    if ( CGColorCreateGenericRGB )
-        retval = CGColorCreateGenericRGB( col.Red() / 255.0 , col.Green() / 255.0, col.Blue() / 255.0, col.Alpha() / 255.0 );
-    else
-#endif
-    {
-        CGFloat components[4] = { col.Red() / 255.0, col.Green() / 255.0, col.Blue()  / 255.0, col.Alpha() / 255.0 } ;
-        retval = CGColorCreate( wxMacGetGenericRGBColorSpace() , components ) ;
-    }

 
 

-#endif

     wxASSERT(retval != NULL);
     return retval;
 }
 
     wxASSERT(retval != NULL);
     return retval;
 }
 

-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 && wxOSX_USE_CORE_TEXT
+#if wxOSX_USE_CORE_TEXT

 
 CTFontRef wxMacCreateCTFont( const wxFont& font )
 {
 
 CTFontRef wxMacCreateCTFont( const wxFont& font )
 {


@@ -2285,11 +2273,11 @@ void wxMacCoreGraphicsContext::DrawIcon( const wxIcon &icon, wxDouble x, wxDoubl
     if (m_composition == wxCOMPOSITION_DEST)
         return;
 
     if (m_composition == wxCOMPOSITION_DEST)
         return;
 

-    CGRect r = CGRectMake( (CGFloat) 0.0 , (CGFloat) 0.0 , (CGFloat) w , (CGFloat) h );

     CGContextSaveGState( m_cgContext );
     CGContextTranslateCTM( m_cgContext,(CGFloat) x ,(CGFloat) (y + h) );
     CGContextScaleCTM( m_cgContext, 1, -1 );
 #if wxOSX_USE_COCOA_OR_CARBON
     CGContextSaveGState( m_cgContext );
     CGContextTranslateCTM( m_cgContext,(CGFloat) x ,(CGFloat) (y + h) );
     CGContextScaleCTM( m_cgContext, 1, -1 );
 #if wxOSX_USE_COCOA_OR_CARBON

+    CGRect r = CGRectMake( (CGFloat) 0.0 , (CGFloat) 0.0 , (CGFloat) w , (CGFloat) h );

     PlotIconRefInContext( m_cgContext , &r , kAlignNone , kTransformNone ,
         NULL , kPlotIconRefNormalFlags , icon.GetHICON() );
 #endif
     PlotIconRefInContext( m_cgContext , &r , kAlignNone , kTransformNone ,
         NULL , kPlotIconRefNormalFlags , icon.GetHICON() );
 #endif

diff --git a/src/osx/carbon/region.cpp b/src/osx/carbon/region.cpp
index f19be2230cf3d03ff6bdae3a042dc9c7b0e674b1..38191093670efa56e21802fa66e6958a79d50506 100644 (file)
--- a/src/osx/carbon/region.cpp
+++ b/src/osx/carbon/region.cpp
@@ -406,40 +406,6 @@ public :
     long m_current ;
 };
 
     long m_current ;
 };
 

-#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5
-
-OSStatus wxMacRegionToRectsCounterCallback(
-    UInt16 message, RgnHandle WXUNUSED(region), const Rect *WXUNUSED(rect), void *data )
-{
-    long *m_numRects = (long*) data ;
-    if ( message == kQDRegionToRectsMsgInit )
-    {
-        (*m_numRects) = 0 ;
-    }
-    else if (message == kQDRegionToRectsMsgParse)
-    {
-        (*m_numRects) += 1 ;
-    }
-
-    return noErr;
-}
-
-OSStatus wxMacRegionToRectsSetterCallback(
-    UInt16 message, RgnHandle WXUNUSED(region), const Rect *rect, void *data )
-{
-    if (message == kQDRegionToRectsMsgParse)
-    {
-        RegionToRectsCallbackData *cb = (RegionToRectsCallbackData*) data ;
-        cb->m_rects[cb->m_current++] = wxRect( rect->left , rect->top , rect->right - rect->left , rect->bottom - rect->top ) ;
-    }
-
-    return noErr;
-}
-
-#endif
-
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
-

 OSStatus wxOSXRegionToRectsCounterCallback(
     int message, HIShapeRef WXUNUSED(region), const CGRect *WXUNUSED(rect), void *data )
 {
 OSStatus wxOSXRegionToRectsCounterCallback(
     int message, HIShapeRef WXUNUSED(region), const CGRect *WXUNUSED(rect), void *data )
 {


@@ -468,8 +434,6 @@ OSStatus wxOSXRegionToRectsSetterCallback(
     return noErr;
 }
 
     return noErr;
 }
 

-#endif
-

 void wxRegionIterator::Reset(const wxRegion& region)
 {
     m_current = 0;
 void wxRegionIterator::Reset(const wxRegion& region)
 {
     m_current = 0;


@@ -490,51 +454,20 @@ void wxRegionIterator::Reset(const wxRegion& region)
         m_rects = new wxRect[m_numRects];
         m_rects[0] = m_region.GetBox();
 #endif
         m_rects = new wxRect[m_numRects];
         m_rects[0] = m_region.GetBox();
 #endif

-
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
-        if ( HIShapeEnumerate != NULL )
+        OSStatus err = HIShapeEnumerate (OTHER_M_REGION(region), kHIShapeParseFromTopLeft, wxOSXRegionToRectsCounterCallback,
+            (void*)&m_numRects);
+        if (err == noErr)

         {
         {

-            OSStatus err = HIShapeEnumerate (OTHER_M_REGION(region), kHIShapeParseFromTopLeft, wxOSXRegionToRectsCounterCallback,
-                (void*)&m_numRects);
-            if (err == noErr)
-            {
-                m_rects = new wxRect[m_numRects];
-                RegionToRectsCallbackData data ;
-                data.m_rects = m_rects ;
-                data.m_current = 0 ;
-                HIShapeEnumerate( OTHER_M_REGION(region), kHIShapeParseFromTopLeft, wxOSXRegionToRectsSetterCallback,
-                    (void*)&data );
-            }
-            else
-            {
-                m_numRects = 0;
-            }
+            m_rects = new wxRect[m_numRects];
+            RegionToRectsCallbackData data ;
+            data.m_rects = m_rects ;
+            data.m_current = 0 ;
+            HIShapeEnumerate( OTHER_M_REGION(region), kHIShapeParseFromTopLeft, wxOSXRegionToRectsSetterCallback,
+                (void*)&data );

         }
         else
         }
         else

-#endif

         {
         {

-#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5
-            OSStatus err = noErr;
-            RgnHandle rgn = NewRgn();
-            HIShapeGetAsQDRgn(OTHER_M_REGION(region), rgn);
-
-            err = QDRegionToRects (rgn, kQDParseRegionFromTopLeft, wxMacRegionToRectsCounterCallback
-                , (void*)&m_numRects);
-            if (err == noErr)
-            {
-                m_rects = new wxRect[m_numRects];
-                RegionToRectsCallbackData data ;
-                data.m_rects = m_rects ;
-                data.m_current = 0 ;
-                QDRegionToRects( rgn , kQDParseRegionFromTopLeft, wxMacRegionToRectsSetterCallback,
-                    (void*)&data );
-            }
-            else
-            {
-                m_numRects = 0;
-            }
-            DisposeRgn( rgn );
-#endif
+            m_numRects = 0;

         }
     }
 }
         }
     }
 }

diff --git a/src/osx/core/colour.cpp b/src/osx/core/colour.cpp
index cb148d9db44ea0761ac460411aa8d29dd7d6f601..77789f7a63081f861042f3cb038f12e80e997421 100644 (file)
--- a/src/osx/core/colour.cpp
+++ b/src/osx/core/colour.cpp
@@ -70,7 +70,7 @@ void wxColour::InitRGBA (ChannelType r, ChannelType g, ChannelType b, ChannelTyp
     m_alpha = a ;
 
     CGColorRef col = 0 ;
     m_alpha = a ;
 
     CGColorRef col = 0 ;

-#if wxOSX_USE_COCOA_OR_CARBON && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
+#if wxOSX_USE_COCOA_OR_CARBON 

     if ( CGColorCreateGenericRGB != NULL )
         col = CGColorCreateGenericRGB( (CGFloat)(r / 255.0), (CGFloat) (g / 255.0), (CGFloat) (b / 255.0), (CGFloat) (a / 255.0) );
     else
     if ( CGColorCreateGenericRGB != NULL )
         col = CGColorCreateGenericRGB( (CGFloat)(r / 255.0), (CGFloat) (g / 255.0), (CGFloat) (b / 255.0), (CGFloat) (a / 255.0) );
     else


@@ -91,17 +91,8 @@ void wxColour::InitRGBColor( const RGBColor& col )
     m_green = col.green >> 8;
     m_alpha = wxALPHA_OPAQUE;
     CGColorRef cfcol;
     m_green = col.green >> 8;
     m_alpha = wxALPHA_OPAQUE;
     CGColorRef cfcol;

-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
-    if ( CGColorCreateGenericRGB != NULL )
-        cfcol = CGColorCreateGenericRGB((CGFloat)(col.red / 65535.0), (CGFloat)(col.green / 65535.0),
+    cfcol = CGColorCreateGenericRGB((CGFloat)(col.red / 65535.0), (CGFloat)(col.green / 65535.0),

                                         (CGFloat)(col.blue / 65535.0), (CGFloat) 1.0 );
                                         (CGFloat)(col.blue / 65535.0), (CGFloat) 1.0 );

-    else
-#endif
-    {
-        CGFloat components[4] = {   (CGFloat)(col.red / 65535.0), (CGFloat)(col.green / 65535.0),
-                                    (CGFloat)(col.blue / 65535.0), (CGFloat) 1.0 } ;
-        cfcol = CGColorCreate( wxMacGetGenericRGBColorSpace() , components ) ;
-    }

     wxASSERT_MSG(cfcol != NULL, "Invalid CoreGraphics Color");
     m_cgColour.reset( cfcol );
 }
     wxASSERT_MSG(cfcol != NULL, "Invalid CoreGraphics Color");
     m_cgColour.reset( cfcol );
 }

diff --git a/src/osx/core/evtloop_cf.cpp b/src/osx/core/evtloop_cf.cpp
index fac4858a10a0d2b757f0712d317fd99c53ab9983..57fa767abaf9446fe6ea6df57afd4768f383ff90 100644 (file)
--- a/src/osx/core/evtloop_cf.cpp
+++ b/src/osx/core/evtloop_cf.cpp
@@ -48,7 +48,6 @@
 // wxCFEventLoopSource and wxCFEventLoop implementation
 // ============================================================================
 
 // wxCFEventLoopSource and wxCFEventLoop implementation
 // ============================================================================
 

-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5

 namespace
 {
 
 namespace
 {
 


@@ -136,18 +135,6 @@ wxCFEventLoopSource::~wxCFEventLoopSource()
         CFRelease(m_cffd);
 }
 
         CFRelease(m_cffd);
 }
 

-#else // OS X < 10.5
-
-wxEventLoopSource *
-wxCFEventLoop::AddSourceForFD(int WXUNUSED(fd),
-                              wxEventLoopSourceHandler * WXUNUSED(handler),
-                              int WXUNUSED(flags))
-{
-    return NULL;
-}
-
-#endif // MAC_OS_X_VERSION_MAX_ALLOWED
-

 #endif // wxUSE_EVENTLOOP_SOURCE
 
 void wxCFEventLoop::OSXCommonModeObserverCallBack(CFRunLoopObserverRef observer, int activity, void *info)
 #endif // wxUSE_EVENTLOOP_SOURCE
 
 void wxCFEventLoop::OSXCommonModeObserverCallBack(CFRunLoopObserverRef observer, int activity, void *info)

diff --git a/src/osx/utils_osx.cpp b/src/osx/utils_osx.cpp
index 0cd8cda71339cbad392d44fb57fa47c7b49bf37e..7eb431ad8660ca5f12c82e7ce1c57733ce4942ed 100644 (file)
--- a/src/osx/utils_osx.cpp
+++ b/src/osx/utils_osx.cpp
@@ -35,9 +35,7 @@
 
 // #include "MoreFilesX.h"
 
 
 // #include "MoreFilesX.h"
 

-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
-    #include <AudioToolbox/AudioServices.h>
-#endif
+#include <AudioToolbox/AudioServices.h>

 
 #include "wx/osx/private.h"
 #include "wx/osx/private/timer.h"
 
 #include "wx/osx/private.h"
 #include "wx/osx/private/timer.h"