set WXWIN_COMPATIBILITY_2_2 to 1 by default

[wxWidgets.git] / contrib / src / fl / controlbar.cpp

diff --git a/contrib/src/fl/controlbar.cpp b/contrib/src/fl/controlbar.cpp
index c1a3af514bddccba5ea27cb2bc405557500a4ee5..029d39f6c1eb883f9b5808c51fea94734c87afdf 100644 (file)
--- a/contrib/src/fl/controlbar.cpp
+++ b/contrib/src/fl/controlbar.cpp
@@ -749,6 +749,11 @@ void wxFrameLayout::SetBarState( cbBarInfo* pBar, int newState, bool updateNow )
         }
     }
 
         }
     }
 

+    if ( pBar->mDimInfo.GetDimHandler() )
+    {
+        pBar->mDimInfo.GetDimHandler()->OnChangeBarState( pBar, newState );
+    }
+

     pBar->mState = newState;
 
     DoSetBarState( pBar );
     pBar->mState = newState;
 
     DoSetBarState( pBar );


@@ -2043,7 +2048,7 @@ cbCommonPaneProperties::cbCommonPaneProperties(void)
     : mRealTimeUpdatesOn    ( TRUE  ),
       mOutOfPaneDragOn      ( TRUE  ),
       mExactDockPredictionOn( FALSE ),
     : mRealTimeUpdatesOn    ( TRUE  ),
       mOutOfPaneDragOn      ( TRUE  ),
       mExactDockPredictionOn( FALSE ),

-      mNonDestructFirctionOn( FALSE ),
+      mNonDestructFrictionOn( FALSE ),

       mShow3DPaneBorderOn   ( TRUE  ),
       mBarFloatingOn        ( FALSE ),
       mRowProportionsOn     ( FALSE ),
       mShow3DPaneBorderOn   ( TRUE  ),
       mBarFloatingOn        ( FALSE ),
       mRowProportionsOn     ( FALSE ),


@@ -2303,7 +2308,7 @@ int cbDockPane::GetNotFixedBarsCount( cbRowInfo* pRow )
 
 void cbDockPane::RemoveBar( cbBarInfo* pBar )
 {
 
 void cbDockPane::RemoveBar( cbBarInfo* pBar )
 {

-    bool needsRestoring = mProps.mNonDestructFirctionOn && 
+    bool needsRestoring = mProps.mNonDestructFrictionOn && 

                           mpStoredRow == pBar->mpRow;
 
     cbRemoveBarEvent evt( pBar, this );
                           mpStoredRow == pBar->mpRow;
 
     cbRemoveBarEvent evt( pBar, this );


@@ -2751,7 +2756,7 @@ void cbDockPane::DoInsertBar( cbBarInfo* pBar, int rowNo )
     {
         pRow = mRows[rowNo];
 
     {
         pRow = mRows[rowNo];
 

-        if ( mProps.mNonDestructFirctionOn == TRUE )
+        if ( mProps.mNonDestructFrictionOn == TRUE )

         {
             // store original shape of the row (before the bar is inserted)
 
         {
             // store original shape of the row (before the bar is inserted)