simplifying

[wxWidgets.git] / src / mac / carbon / utils.cpp

diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp
index 757920cd03763390c8ef2b911a29a6b837b9b777..4204e40b33196090c5900a7f806513f609203a64 100644 (file)
--- a/src/mac/carbon/utils.cpp
+++ b/src/mac/carbon/utils.cpp
@@ -735,11 +735,7 @@ void wxMacControl::SetVisibility( bool visible , bool redraw )
 
 bool wxMacControl::IsEnabled() const
 {
 
 bool wxMacControl::IsEnabled() const
 {

-#if TARGET_API_MAC_OSX

     return IsControlEnabled( m_controlRef );
     return IsControlEnabled( m_controlRef );

-#else
-    return IsControlActive( m_controlRef );
-#endif

 }
 
 bool wxMacControl::IsActive() const
 }
 
 bool wxMacControl::IsActive() const


@@ -852,15 +848,10 @@ OSStatus wxMacControl::GetRegion( ControlPartCode partCode , RgnHandle region )
 
 OSStatus wxMacControl::SetZOrder( bool above , wxMacControl* other )
 {
 
 OSStatus wxMacControl::SetZOrder( bool above , wxMacControl* other )
 {

-#if TARGET_API_MAC_OSX

     return HIViewSetZOrder( m_controlRef,above ? kHIViewZOrderAbove : kHIViewZOrderBelow,
        (other != NULL) ? other->m_controlRef : NULL);
     return HIViewSetZOrder( m_controlRef,above ? kHIViewZOrderAbove : kHIViewZOrderBelow,
        (other != NULL) ? other->m_controlRef : NULL);

-#else
-    return 0;
-#endif

 }
 
 }
 

-#if TARGET_API_MAC_OSX

 // SetNeedsDisplay would not invalidate the children
 static void InvalidateControlAndChildren( HIViewRef control )
 {
 // SetNeedsDisplay would not invalidate the children
 static void InvalidateControlAndChildren( HIViewRef control )
 {


@@ -883,13 +874,10 @@ static void InvalidateControlAndChildren( HIViewRef control )
         InvalidateControlAndChildren( child );
     }
 }
         InvalidateControlAndChildren( child );
     }
 }

-#endif

 
 void wxMacControl::InvalidateWithChildren()
 {
 
 void wxMacControl::InvalidateWithChildren()
 {

-#if TARGET_API_MAC_OSX

     InvalidateControlAndChildren( m_controlRef );
     InvalidateControlAndChildren( m_controlRef );

-#endif

 }
 
 void wxMacControl::ScrollRect( wxRect *r , int dx , int dy )
 }
 
 void wxMacControl::ScrollRect( wxRect *r , int dx , int dy )


@@ -997,11 +985,7 @@ wxMacDataBrowserControl::wxMacDataBrowserControl( wxWindow* peer,
     if ( gDataBrowserItemNotificationUPP == NULL )
     {
         gDataBrowserItemNotificationUPP =
     if ( gDataBrowserItemNotificationUPP == NULL )
     {
         gDataBrowserItemNotificationUPP =

-#if TARGET_API_MAC_OSX

             (DataBrowserItemNotificationUPP) NewDataBrowserItemNotificationWithItemUPP(DataBrowserItemNotificationProc);
             (DataBrowserItemNotificationUPP) NewDataBrowserItemNotificationWithItemUPP(DataBrowserItemNotificationProc);

-#else
-            NewDataBrowserItemNotificationUPP(DataBrowserItemNotificationProc);
-#endif

     }
 
     DataBrowserCallbacks callbacks;
     }
 
     DataBrowserCallbacks callbacks;