corrected scoping

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

diff --git a/src/mac/carbon/control.cpp b/src/mac/carbon/control.cpp
index b56dee0d186b0f1114d6571817b4063df8ecb024..6570c1303bca0af2695fd3539e4bc967c49af35e 100644 (file)
--- a/src/mac/carbon/control.cpp
+++ b/src/mac/carbon/control.cpp
@@ -68,15 +68,17 @@ pascal OSStatus wxMacSetupControlBackground( ControlRef iControl , SInt16 iMessa
        switch( iMessage )
        {
                case kControlMsgSetUpBackground :
        switch( iMessage )
        {
                case kControlMsgSetUpBackground :

-               wxControl*  wx = (wxControl*) GetControlReference( iControl ) ;
-               if ( wx != NULL && wx->IsKindOf( CLASSINFO( wxControl ) ) )
-               {
-                       wxDC::MacSetupBackgroundForCurrentPort( wx->MacGetBackgroundBrush() ) ;
-//                             SetThemeBackground( iDepth , iIsColor ) ;
-                       }
-                       else

                        {
                        {

-                               status = paramErr ;
+                       wxControl*  wx = (wxControl*) GetControlReference( iControl ) ;
+                       if ( wx != NULL && wx->IsKindOf( CLASSINFO( wxControl ) ) )
+                       {
+                               wxDC::MacSetupBackgroundForCurrentPort( wx->MacGetBackgroundBrush() ) ;
+       //                              SetThemeBackground( iDepth , iIsColor ) ;
+                               }
+                               else
+                               {
+                                       status = paramErr ;
+                               }

                        }
                        break ;
                default :
                        }
                        break ;
                default :

diff --git a/src/mac/control.cpp b/src/mac/control.cpp
index b56dee0d186b0f1114d6571817b4063df8ecb024..6570c1303bca0af2695fd3539e4bc967c49af35e 100644 (file)
--- a/src/mac/control.cpp
+++ b/src/mac/control.cpp
@@ -68,15 +68,17 @@ pascal OSStatus wxMacSetupControlBackground( ControlRef iControl , SInt16 iMessa
        switch( iMessage )
        {
                case kControlMsgSetUpBackground :
        switch( iMessage )
        {
                case kControlMsgSetUpBackground :

-               wxControl*  wx = (wxControl*) GetControlReference( iControl ) ;
-               if ( wx != NULL && wx->IsKindOf( CLASSINFO( wxControl ) ) )
-               {
-                       wxDC::MacSetupBackgroundForCurrentPort( wx->MacGetBackgroundBrush() ) ;
-//                             SetThemeBackground( iDepth , iIsColor ) ;
-                       }
-                       else

                        {
                        {

-                               status = paramErr ;
+                       wxControl*  wx = (wxControl*) GetControlReference( iControl ) ;
+                       if ( wx != NULL && wx->IsKindOf( CLASSINFO( wxControl ) ) )
+                       {
+                               wxDC::MacSetupBackgroundForCurrentPort( wx->MacGetBackgroundBrush() ) ;
+       //                              SetThemeBackground( iDepth , iIsColor ) ;
+                               }
+                               else
+                               {
+                                       status = paramErr ;
+                               }

                        }
                        break ;
                default :
                        }
                        break ;
                default :