Fixed code that should have been enclosed in brackets but wasn't, causing the program...

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

diff --git a/contrib/src/fl/controlbar.cpp b/contrib/src/fl/controlbar.cpp
index 6e87a6ed33bb069e1d2f1fef7cff25536153e4b4..fd02e78c2914c2c071f717ce49a91c7f67096bce 100644 (file)
--- a/contrib/src/fl/controlbar.cpp
+++ b/contrib/src/fl/controlbar.cpp
@@ -1194,34 +1194,35 @@ void wxFrameLayout::UnhookFromFrame()
        // FOR NOW::
 
        if ( mpFrame->GetEventHandler() == this )
        // FOR NOW::
 
        if ( mpFrame->GetEventHandler() == this )

-
+    {

                mpFrame->PopEventHandler();
                mpFrame->PopEventHandler();

+       return;
+    }

 
 

-       return;
-
-       // TBD ???:  Cannot reach this code

        if ( mpFrame )
        {
                if ( this == mpFrame->GetEventHandler() )
        if ( mpFrame )
        {
                if ( this == mpFrame->GetEventHandler() )

-               
+        {

                        mpFrame->SetEventHandler( this->GetNextHandler() );
                        mpFrame->SetEventHandler( this->GetNextHandler() );

+        }

                else
                else

-                       {
-                               wxEvtHandler* pCur = mpFrame->GetEventHandler();
-
-                               while( pCur )
-                               {
-                                       if ( pCur == this ) break;
+               {
+                       wxEvtHandler* pCur = mpFrame->GetEventHandler();

 
 

-                                       pCur = pCur->GetNextHandler();
-                               }
+                       while ( pCur )
+                       {
+                               if ( pCur == this )
+                    break;

 
 

-                               // do not try to unhook ourselves if we're not hooked yet
-                               if ( !pCur ) return;
+                               pCur = pCur->GetNextHandler();

                        }
 
                        }
 

-               if ( GetPreviousHandler() )
+                       // do not try to unhook ourselves if we're not hooked yet
+                       if ( !pCur )
+                return;
+               }

 
 

+               if ( GetPreviousHandler() )

                        GetPreviousHandler()->SetNextHandler( GetNextHandler() );
                else
                {
                        GetPreviousHandler()->SetNextHandler( GetNextHandler() );
                else
                {


@@ -1229,9 +1230,7 @@ void wxFrameLayout::UnhookFromFrame()
                        return;
                }
 
                        return;
                }
 

-

                if ( GetNextHandler() )
                if ( GetNextHandler() )

-

                        GetNextHandler()->SetPreviousHandler( GetPreviousHandler() );
 
                SetNextHandler( NULL );
                        GetNextHandler()->SetPreviousHandler( GetPreviousHandler() );
 
                SetNextHandler( NULL );