BASE, NET and CORE separation in PalmOS build.

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

diff --git a/contrib/src/fl/rowlayoutpl.cpp b/contrib/src/fl/rowlayoutpl.cpp
index 84bdc7e111b4c0b94ccb0926d6c93d3f4f245351..1c0f5140f458821a1190d86bba93802b5cf8a69a 100644 (file)
--- a/contrib/src/fl/rowlayoutpl.cpp
+++ b/contrib/src/fl/rowlayoutpl.cpp
@@ -219,8 +219,8 @@ void cbRowLayoutPlugin::AdjustLengthOfInserted( cbRowInfo* WXUNUSED(pRow), cbBar
 void cbRowLayoutPlugin::FitBarsToRange( int from, int till,
                                         cbBarInfo* pTheBar, cbRowInfo* pRow )
 {
 void cbRowLayoutPlugin::FitBarsToRange( int from, int till,
                                         cbBarInfo* pTheBar, cbRowInfo* pRow )
 {

-    cbBarInfo* pFromBar = NULL;
-    cbBarInfo* pTillBar = NULL;
+    cbBarInfo* pFromBar;
+    cbBarInfo* pTillBar;

 
     if ( pTheBar->mBounds.x > from )
     {
 
     if ( pTheBar->mBounds.x > from )
     {


@@ -260,7 +260,7 @@ void cbRowLayoutPlugin::FitBarsToRange( int from, int till,
       {
             pBar->mBounds.width =
                 wxMax( mpPane->mProps.mMinCBarDim.x,
       {
             pBar->mBounds.width =
                 wxMax( mpPane->mProps.mMinCBarDim.x,

-                       int( double(freeSpc) * (pBar->mLenRatio/pcntSum) )
+                       (int)( double(freeSpc) * (pBar->mLenRatio/pcntSum) )

                      );
       }
         pBar = pBar->mpNext;
                      );
       }
         pBar = pBar->mpNext;


@@ -270,7 +270,7 @@ void cbRowLayoutPlugin::FitBarsToRange( int from, int till,
 
     pBar      = pFromBar;
     int prevX = from;
 
     pBar      = pFromBar;
     int prevX = from;

-    bool hasNotFixedBars = FALSE;
+    bool hasNotFixedBars = false;

 
     while ( pBar != pTillBar )
     {
 
     while ( pBar != pTillBar )
     {


@@ -278,7 +278,7 @@ void cbRowLayoutPlugin::FitBarsToRange( int from, int till,
 
         if ( !pBar->IsFixed() )
         {
 
         if ( !pBar->IsFixed() )
         {

-            hasNotFixedBars = TRUE;
+            hasNotFixedBars = true;

 
             freeSpc -= bounds.width;
         }
 
             freeSpc -= bounds.width;
         }


@@ -400,11 +400,11 @@ void cbRowLayoutPlugin::RecalcLengthRatios( cbRowInfo* pRow )
 
 void cbRowLayoutPlugin::ApplyLengthRatios( cbRowInfo* pRow )
 {
 
 void cbRowLayoutPlugin::ApplyLengthRatios( cbRowInfo* pRow )
 {

+    size_t i;

     double pcntSum = 0;
 
     // FOR NOW:: all-in-one
 
     double pcntSum = 0;
 
     // FOR NOW:: all-in-one
 

-    size_t i = 0;

     for ( i = 0; i != pRow->mBars.Count(); ++i )
     {
         if ( !pRow->mBars[i]->IsFixed() )
     for ( i = 0; i != pRow->mBars.Count(); ++i )
     {
         if ( !pRow->mBars[i]->IsFixed() )


@@ -449,7 +449,7 @@ void cbRowLayoutPlugin::ApplyLengthRatios( cbRowInfo* pRow )
 
     double unit = freeSpc / pcntSum;
 
 
     double unit = freeSpc / pcntSum;
 

-    bool haveSquished = FALSE;
+    bool haveSquished = false;

 
     for ( i = 0; i != pRow->mBars.Count(); ++i )
     {
 
     for ( i = 0; i != pRow->mBars.Count(); ++i )
     {


@@ -459,7 +459,7 @@ void cbRowLayoutPlugin::ApplyLengthRatios( cbRowInfo* pRow )
             
             if ( int( unit * bar.mLenRatio ) < mpPane->mProps.mMinCBarDim.x )
             {
             
             if ( int( unit * bar.mLenRatio ) < mpPane->mProps.mMinCBarDim.x )
             {

-                haveSquished = TRUE;
+                haveSquished = true;

 
                 bar.mBounds.width = -1; // mark as "squished"
 
 
                 bar.mBounds.width = -1; // mark as "squished"
 


@@ -507,14 +507,14 @@ void cbRowLayoutPlugin::DetectBarHandles( cbRowInfo* pRow )
 {
     // first pass from left to right (detect left-side handles)
 
 {
     // first pass from left to right (detect left-side handles)
 

-    bool foundNotFixed = FALSE;
+    bool foundNotFixed = false;

 
     size_t i;
     for ( i = 0; i != pRow->mBars.Count(); ++i )
     {
         cbBarInfo& bar = *pRow->mBars[i];
         
 
     size_t i;
     for ( i = 0; i != pRow->mBars.Count(); ++i )
     {
         cbBarInfo& bar = *pRow->mBars[i];
         

-        bar.mHasLeftHandle = FALSE;
+        bar.mHasLeftHandle = false;

 
         if ( !bar.IsFixed() )
         {
 
         if ( !bar.IsFixed() )
         {


@@ -523,21 +523,21 @@ void cbRowLayoutPlugin::DetectBarHandles( cbRowInfo* pRow )
                 if ( bar.mpPrev &&
                      bar.mpPrev->IsFixed() )
                 
                 if ( bar.mpPrev &&
                      bar.mpPrev->IsFixed() )
                 

-                    bar.mHasLeftHandle = TRUE;
+                    bar.mHasLeftHandle = true;

 
 

-            foundNotFixed = TRUE;
+            foundNotFixed = true;

         }
     }
 
     // pass from right to left (detect right-side handles)
 
         }
     }
 
     // pass from right to left (detect right-side handles)
 

-    foundNotFixed = FALSE;
+    foundNotFixed = false;

 
     cbBarInfo* pBar = pRow->mBars[ pRow->mBars.Count() - 1 ];
 
     while( pBar )
     {
 
     cbBarInfo* pBar = pRow->mBars[ pRow->mBars.Count() - 1 ];
 
     while( pBar )
     {

-        pBar->mHasRightHandle = FALSE;
+        pBar->mHasRightHandle = false;

 
         if ( !pBar->IsFixed() )
         {
 
         if ( !pBar->IsFixed() )
         {


@@ -545,9 +545,9 @@ void cbRowLayoutPlugin::DetectBarHandles( cbRowInfo* pRow )
 
                 if ( pBar->mpNext )
 
 
                 if ( pBar->mpNext )
 

-                     pBar->mHasRightHandle = TRUE;
+                     pBar->mHasRightHandle = true;

 
 

-            foundNotFixed = TRUE;
+            foundNotFixed = true;

         }
 
         pBar = pBar->mpPrev;
         }
 
         pBar = pBar->mpPrev;


@@ -962,8 +962,8 @@ void cbRowLayoutPlugin::OnRemoveBar ( cbRemoveBarEvent& event )
 
     // rest bar information after removing it from the row
     pBar->mpRow           = NULL;
 
     // rest bar information after removing it from the row
     pBar->mpRow           = NULL;

-    pBar->mHasLeftHandle  = FALSE;
-    pBar->mHasRightHandle = FALSE;
+    pBar->mHasLeftHandle  = false;
+    pBar->mHasRightHandle = false;

 
     mpPane->InitLinksForRow( pRow ); // relink "mpNext/mpPrev"s
 
 
     mpPane->InitLinksForRow( pRow ); // relink "mpNext/mpPrev"s
 


@@ -982,7 +982,7 @@ void cbRowLayoutPlugin::OnRemoveBar ( cbRemoveBarEvent& event )
         // force repainting of bars, in the row, from which the bar was removed
 
         // FIXME:: really needed?
         // force repainting of bars, in the row, from which the bar was removed
 
         // FIXME:: really needed?

-        pRow->mBars[0]->mUMgrData.SetDirty(TRUE);
+        pRow->mBars[0]->mUMgrData.SetDirty(true);

 
         // re-setup mHasOnlyFixedBars flag for the row information
         event.mpPane->SyncRowFlags( pRow );
 
         // re-setup mHasOnlyFixedBars flag for the row information
         event.mpPane->SyncRowFlags( pRow );


@@ -1059,22 +1059,22 @@ void cbRowLayoutPlugin::OnLayoutRows( cbLayoutRowsEvent& event )
             if ( mpPane->mAlignment == FL_ALIGN_TOP ||
                  mpPane->mAlignment == FL_ALIGN_LEFT   )
             {
             if ( mpPane->mAlignment == FL_ALIGN_TOP ||
                  mpPane->mAlignment == FL_ALIGN_LEFT   )
             {

-                row.mHasLowerHandle = TRUE;
+                row.mHasLowerHandle = true;

 
 

-                row.mHasUpperHandle = FALSE; 
+                row.mHasUpperHandle = false; 

             }
             else
             {
             }
             else
             {

-                row.mHasUpperHandle = TRUE;
+                row.mHasUpperHandle = true;

 
 

-                row.mHasLowerHandle = FALSE; 
+                row.mHasLowerHandle = false; 

             }
         }
         else
         {
             // otherwise, rows with fixed-bars only, have no height-resizing handles
             }
         }
         else
         {
             // otherwise, rows with fixed-bars only, have no height-resizing handles

-            row.mHasUpperHandle = FALSE; 
-            row.mHasLowerHandle = FALSE; 
+            row.mHasUpperHandle = false; 
+            row.mHasLowerHandle = false; 

         }
 
         // setup vertical positions for items in the row
         }
 
         // setup vertical positions for items in the row


@@ -1109,8 +1109,6 @@ void cbRowLayoutPlugin::OnResizeRow( cbResizeRowEvent& event )
     // FIXME:: Next line not used.
     //int     newHeight      = pTheRow->mRowHeight;
 
     // FIXME:: Next line not used.
     //int     newHeight      = pTheRow->mRowHeight;
 

-    int     freeSpc        = 0;
-

     if ( forUpperHandle )
     {
         // calculate available free space from above,
     if ( forUpperHandle )
     {
         // calculate available free space from above,


@@ -1120,8 +1118,6 @@ void cbRowLayoutPlugin::OnResizeRow( cbResizeRowEvent& event )
 
         while( pRow ) 
         {
 
         while( pRow ) 
         {

-            freeSpc += pRow->mRowHeight - event.mpPane->GetMinimalRowHeight( pRow );
-

             pRow = pRow->mpPrev;
         }
     }
             pRow = pRow->mpPrev;
         }
     }


@@ -1134,8 +1130,6 @@ void cbRowLayoutPlugin::OnResizeRow( cbResizeRowEvent& event )
 
         while( pRow ) 
         {
 
         while( pRow ) 
         {

-            freeSpc += pRow->mRowHeight - mpPane->GetMinimalRowHeight( pRow );
-

             pRow = pRow->mpNext;
         }
     }
             pRow = pRow->mpNext;
         }
     }


@@ -1222,7 +1216,7 @@ void cbRowLayoutPlugin::OnResizeRow( cbResizeRowEvent& event )
     else
         event.mpPane->SetRowHeight( pTheRow, pTheRow->mRowHeight +   ofs  );
 
     else
         event.mpPane->SetRowHeight( pTheRow, pTheRow->mRowHeight +   ofs  );
 

-    mpLayout->RecalcLayout(FALSE);
+    mpLayout->RecalcLayout(false);

 
     mpLayout->GetUpdatesManager().OnFinishChanges();
     mpLayout->GetUpdatesManager().UpdateNow();
 
     mpLayout->GetUpdatesManager().OnFinishChanges();
     mpLayout->GetUpdatesManager().UpdateNow();