Don't create uneeded variables.

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

diff --git a/contrib/src/fl/dyntbar.cpp b/contrib/src/fl/dyntbar.cpp
index 8e9697b75b9940161ff7269c3d555fc47aec803b..f0f7d0779f480ea3afd1e7b70a62496866fff26d 100644 (file)
--- a/contrib/src/fl/dyntbar.cpp
+++ b/contrib/src/fl/dyntbar.cpp
@@ -6,13 +6,9 @@
 // Created:     ??/10/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Aleksandras Gluchovas
 // Created:     ??/10/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Aleksandras Gluchovas

-// Licence:       wxWindows license
+// Licence:     wxWindows license

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-    #pragma implementation "dyntbar.h"
-#endif
-

 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 


@@ -40,12 +36,12 @@ BEGIN_EVENT_TABLE( wxDynamicToolBar, wxToolBarBase )
 END_EVENT_TABLE()
 
 /***** Implementation for class wxToolLayoutItem *****/
 END_EVENT_TABLE()
 
 /***** Implementation for class wxToolLayoutItem *****/

-        
+

 IMPLEMENT_DYNAMIC_CLASS(wxToolLayoutItem, wxObject)
 
 
 /***** Implementation for class wxDynToolInfo *****/
 IMPLEMENT_DYNAMIC_CLASS(wxToolLayoutItem, wxObject)
 
 
 /***** Implementation for class wxDynToolInfo *****/

-        
+

 IMPLEMENT_DYNAMIC_CLASS(wxDynToolInfo, wxToolLayoutItem)
 
 /***** Implementation for class wxDynamicToolBar *****/
 IMPLEMENT_DYNAMIC_CLASS(wxDynToolInfo, wxToolLayoutItem)
 
 /***** Implementation for class wxDynamicToolBar *****/


@@ -58,7 +54,7 @@ wxDynamicToolBar::wxDynamicToolBar()
 {
 }
 
 {
 }
 

-wxDynamicToolBar::wxDynamicToolBar(wxWindow *parent, const wxWindowID id, 
+wxDynamicToolBar::wxDynamicToolBar(wxWindow *parent, const wxWindowID id,

                                    const wxPoint& pos, const wxSize& size,
                                    const long style, const int orientation,
                                    const int RowsOrColumns, const wxString& name )
                                    const wxPoint& pos, const wxSize& size,
                                    const long style, const int orientation,
                                    const int RowsOrColumns, const wxString& name )


@@ -72,27 +68,27 @@ wxDynamicToolBar::wxDynamicToolBar(wxWindow *parent, const wxWindowID id,
     SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_3DFACE) );
 }
 
     SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_3DFACE) );
 }
 

-bool wxDynamicToolBar::Create(wxWindow *parent, const wxWindowID id, 
-                              const wxPoint& pos, 
+bool wxDynamicToolBar::Create(wxWindow *parent, const wxWindowID id,
+                              const wxPoint& pos,

                               const wxSize& size,
                               const wxSize& size,

-                              const long style, 
-                              const int WXUNUSED(orientation), const int WXUNUSED(RowsOrColumns), 
+                              const long style,
+                              const int WXUNUSED(orientation), const int WXUNUSED(RowsOrColumns),

                               const wxString& name)
 {
     // cut&pasted from wxtbatsmpl.h
 
     if ( ! wxWindow::Create(parent, id, pos, size, style, name) )
                               const wxString& name)
 {
     // cut&pasted from wxtbatsmpl.h
 
     if ( ! wxWindow::Create(parent, id, pos, size, style, name) )

-        return FALSE;
+        return false;

 
     SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_3DFACE ));
 
 
     SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_3DFACE ));
 

-    return TRUE;
+    return true;

 }
 
 bool wxDynamicToolBar::Realize(void)
 {
     // FOR NOW:: nothing
 }
 
 bool wxDynamicToolBar::Realize(void)
 {
     // FOR NOW:: nothing

-    return TRUE;
+    return true;

 }
 
 wxDynamicToolBar::~wxDynamicToolBar(void)
 }
 
 wxDynamicToolBar::~wxDynamicToolBar(void)


@@ -107,8 +103,8 @@ wxDynamicToolBar::~wxDynamicToolBar(void)
     }
 }
 
     }
 }
 

-void wxDynamicToolBar::AddTool( int toolIndex, 
-                                wxWindow* pToolWindow, 
+void wxDynamicToolBar::AddTool( int toolIndex,
+                                wxWindow* pToolWindow,

                                 const wxSize& WXUNUSED(size)
                               )
 {
                                 const wxSize& WXUNUSED(size)
                               )
 {


@@ -116,7 +112,7 @@ void wxDynamicToolBar::AddTool( int toolIndex,
 
     pInfo->mpToolWnd    = pToolWindow;
     pInfo->mIndex       = toolIndex;
 
     pInfo->mpToolWnd    = pToolWindow;
     pInfo->mIndex       = toolIndex;

-    pInfo->mIsSeparator    = FALSE;
+    pInfo->mIsSeparator    = false;

 
     int x,y;
     pToolWindow->GetSize( &x, &y );
 
     int x,y;
     pToolWindow->GetSize( &x, &y );


@@ -128,18 +124,18 @@ void wxDynamicToolBar::AddTool( int toolIndex,
     mTools.Add( pInfo );
 }
 
     mTools.Add( pInfo );
 }
 

-void wxDynamicToolBar::AddTool( int toolIndex, 
+void wxDynamicToolBar::AddTool( int toolIndex,

                                 const wxString& imageFileName,
                                 const wxString& imageFileName,

-                                wxBitmapType imageFileType, 
+                                wxBitmapType imageFileType,

                                 const wxString& labelText, bool alignTextRight,
                                 bool isFlat )
 {
     wxNewBitmapButton* pBtn =
 
       new wxNewBitmapButton( imageFileName, imageFileType,
                                 const wxString& labelText, bool alignTextRight,
                                 bool isFlat )
 {
     wxNewBitmapButton* pBtn =
 
       new wxNewBitmapButton( imageFileName, imageFileType,

-                             labelText, 
-                             ( alignTextRight ) 
-                             ? NB_ALIGN_TEXT_RIGHT 
+                             labelText,
+                             ( alignTextRight )
+                             ? NB_ALIGN_TEXT_RIGHT

                              : NB_ALIGN_TEXT_BOTTOM,
                              isFlat
                            );
                              : NB_ALIGN_TEXT_BOTTOM,
                              isFlat
                            );


@@ -147,7 +143,7 @@ void wxDynamicToolBar::AddTool( int toolIndex,
     pBtn->Create( this, toolIndex );
 
     pBtn->Reshape();
     pBtn->Create( this, toolIndex );
 
     pBtn->Reshape();

-    
+

     AddTool( toolIndex, pBtn );
 }
 void wxDynamicToolBar::AddTool( int toolIndex, wxBitmap labelBmp,
     AddTool( toolIndex, pBtn );
 }
 void wxDynamicToolBar::AddTool( int toolIndex, wxBitmap labelBmp,


@@ -157,9 +153,9 @@ void wxDynamicToolBar::AddTool( int toolIndex, wxBitmap labelBmp,
     wxNewBitmapButton* pBtn =
 
       new wxNewBitmapButton( labelBmp,
     wxNewBitmapButton* pBtn =
 
       new wxNewBitmapButton( labelBmp,

-                             labelText, 
-                             ( alignTextRight ) 
-                             ? NB_ALIGN_TEXT_RIGHT 
+                             labelText,
+                             ( alignTextRight )
+                             ? NB_ALIGN_TEXT_RIGHT

                              : NB_ALIGN_TEXT_BOTTOM,
                              isFlat
                            );
                              : NB_ALIGN_TEXT_BOTTOM,
                              isFlat
                            );


@@ -167,15 +163,15 @@ void wxDynamicToolBar::AddTool( int toolIndex, wxBitmap labelBmp,
     pBtn->Create( this, toolIndex );
 
     pBtn->Reshape();
     pBtn->Create( this, toolIndex );
 
     pBtn->Reshape();

-    
+

     AddTool( toolIndex, pBtn );
 }
 
 
     AddTool( toolIndex, pBtn );
 }
 
 

-wxToolBarToolBase* 
-      wxDynamicToolBar::AddTool(const int toolIndex, const wxBitmap& bitmap, 
+wxToolBarToolBase*
+      wxDynamicToolBar::AddTool(const int toolIndex, const wxBitmap& bitmap,

                                 const wxBitmap& WXUNUSED(pushedBitmap),
                                 const wxBitmap& WXUNUSED(pushedBitmap),

-                                const bool WXUNUSED(toggle), const long WXUNUSED(xPos), 
+                                const bool WXUNUSED(toggle), const long WXUNUSED(xPos),

                                 const long WXUNUSED(yPos), wxObject *WXUNUSED(clientData),
                                 const wxString& helpString1, const wxString& WXUNUSED(helpString2))
 {
                                 const long WXUNUSED(yPos), wxObject *WXUNUSED(clientData),
                                 const wxString& helpString1, const wxString& WXUNUSED(helpString2))
 {


@@ -187,6 +183,8 @@ wxToolBarToolBase*
 
 #if wxUSE_TOOLTIPS
     pBmpBtn->SetToolTip( helpString1 );
 
 #if wxUSE_TOOLTIPS
     pBmpBtn->SetToolTip( helpString1 );

+#else
+    wxUnusedVar( helpString1 );

 #endif  // wxUSE_TOOLTIPS
 
     AddTool( toolIndex, pBmpBtn );
 #endif  // wxUSE_TOOLTIPS
 
     AddTool( toolIndex, pBmpBtn );


@@ -212,7 +210,7 @@ void wxDynamicToolBar::RemveTool( int toolIndex )
     size_t i;
     for( i = 0; i != mTools.Count(); ++i )
     {
     size_t i;
     for( i = 0; i != mTools.Count(); ++i )
     {

-        if ( mTools[i]->mIndex == toolIndex ) 
+        if ( mTools[i]->mIndex == toolIndex )

         {
             if ( mTools[i]->mpToolWnd )
             {
         {
             if ( mTools[i]->mpToolWnd )
             {


@@ -238,7 +236,7 @@ void wxDynamicToolBar::AddSeparator( wxWindow* pSepartorWnd )
 
     pInfo->mpToolWnd    = pSepartorWnd;
     pInfo->mIndex       = -1;
 
     pInfo->mpToolWnd    = pSepartorWnd;
     pInfo->mIndex       = -1;

-    pInfo->mIsSeparator = TRUE;
+    pInfo->mIsSeparator = true;

 
     // Do we draw a separator or is a other object?
     if ( pSepartorWnd )
 
     // Do we draw a separator or is a other object?
     if ( pSepartorWnd )


@@ -318,7 +316,7 @@ void wxDynamicToolBar::OnPaint( wxPaintEvent& WXUNUSED(event) )
     size_t i;
     for( i = 0; i != mTools.Count(); ++i )
     {
     size_t i;
     for( i = 0; i != mTools.Count(); ++i )
     {

-        if ( mTools[i]->mIsSeparator ) 
+        if ( mTools[i]->mIsSeparator )

         {
             // check if separator doesn't have it's own window
             // if so, then draw it using built-in drawing method
         {
             // check if separator doesn't have it's own window
             // if so, then draw it using built-in drawing method


@@ -333,8 +331,8 @@ void wxDynamicToolBar::OnPaint( wxPaintEvent& WXUNUSED(event) )
 
 void wxDynamicToolBar::SizeToolWindows()
 {
 
 void wxDynamicToolBar::SizeToolWindows()
 {

-    bool bStateCheckDone = FALSE;
-    bool bHorzSeparator  = FALSE;
+    bool bStateCheckDone = false;
+    bool bHorzSeparator  = false;

     int maxWidth         = 0;
     int maxHeight        = 0;
 
     int maxWidth         = 0;
     int maxHeight        = 0;
 


@@ -343,9 +341,9 @@ void wxDynamicToolBar::SizeToolWindows()
     {
         wxDynToolInfo& info = *mTools[i];
 
     {
         wxDynToolInfo& info = *mTools[i];
 

-        if ( !info.mIsSeparator ) 
+        if ( !info.mIsSeparator )

         {
         {

-            // center real rectangle within the rectangle 
+            // center real rectangle within the rectangle

             // provided by the layout manager
 
             int x = info.mRect.x;
             // provided by the layout manager
 
             int x = info.mRect.x;


@@ -354,36 +352,36 @@ void wxDynamicToolBar::SizeToolWindows()
             // FOR NOW FOR NOW:: quick & dirty fix
             if ( info.mpToolWnd->IsKindOf( CLASSINFO( wxChoice ) ) )
             {
             // FOR NOW FOR NOW:: quick & dirty fix
             if ( info.mpToolWnd->IsKindOf( CLASSINFO( wxChoice ) ) )
             {

-                info.mpToolWnd->SetSize( x, y, 
-                                         info.mRealSize.x - 3, 
+                info.mpToolWnd->SetSize( x, y,
+                                         info.mRealSize.x - 3,

                                          info.mRealSize.y);
             }
             else
             {
                                          info.mRealSize.y);
             }
             else
             {

-                info.mpToolWnd->SetSize( x, y, 
-                                         info.mRealSize.x, 
+                info.mpToolWnd->SetSize( x, y,
+                                         info.mRealSize.x,

                                          info.mRealSize.y );
             }
         }
         else
         {
                                          info.mRealSize.y );
             }
         }
         else
         {

-            // We performer this code here, so we only execute it when we have 
+            // We performer this code here, so we only execute it when we have

             // separators and we do it only once (all to do with performance...)
             if (!bStateCheckDone)
             {
             // separators and we do it only once (all to do with performance...)
             if (!bStateCheckDone)
             {

-                bStateCheckDone = TRUE;
-                
+                bStateCheckDone = true;
+

                 size_t j;
                 size_t j;

-                wxDynToolInfo *pInfo = NULL;
+                wxDynToolInfo *pInfo;

                 wxDynToolInfo *pPrevInfo = NULL;
                 int nVertSeparators = 0;
 
                 for( j = 0; j != mTools.Count(); ++j )
                 {
                     pInfo = mTools[j];
                 wxDynToolInfo *pPrevInfo = NULL;
                 int nVertSeparators = 0;
 
                 for( j = 0; j != mTools.Count(); ++j )
                 {
                     pInfo = mTools[j];

-                    
+

                     // Count all Vert Separators.
                     // Count all Vert Separators.

-                    if ( pInfo->mIsSeparator ) 
+                    if ( pInfo->mIsSeparator )

                         nVertSeparators++;
 
                     // Check if the new row starts with a Separator.
                         nVertSeparators++;
 
                     // Check if the new row starts with a Separator.


@@ -391,8 +389,8 @@ void wxDynamicToolBar::SizeToolWindows()
                          // pPrevInfo->mRect.x >= pInfo->mRect.x &&
                          pPrevInfo->mRect.y < pInfo->mRect.y)
                     {
                          // pPrevInfo->mRect.x >= pInfo->mRect.x &&
                          pPrevInfo->mRect.y < pInfo->mRect.y)
                     {

-                        // If the Separator is shown on the next row and it's 
-                        // the only object on the row it would mean that the 
+                        // If the Separator is shown on the next row and it's
+                        // the only object on the row it would mean that the

                         // Separator should be shown as Horizontal one.
                         if (j+1 != mTools.Count())
                         {
                         // Separator should be shown as Horizontal one.
                         if (j+1 != mTools.Count())
                         {


@@ -410,10 +408,10 @@ void wxDynamicToolBar::SizeToolWindows()
                     maxWidth = wxMax(pInfo->mRect.width, maxWidth);
                     maxHeight = wxMax(pInfo->mRect.height, maxHeight);
                 }
                     maxWidth = wxMax(pInfo->mRect.width, maxWidth);
                     maxHeight = wxMax(pInfo->mRect.height, maxHeight);
                 }

-                
+

                 bHorzSeparator = nVertSeparators == 0;
             }
                 bHorzSeparator = nVertSeparators == 0;
             }

-            
+

             // Check if we should draw Horz or Vert...
             if ( !bHorzSeparator )
             {
             // Check if we should draw Horz or Vert...
             if ( !bHorzSeparator )
             {


@@ -426,12 +424,12 @@ void wxDynamicToolBar::SizeToolWindows()
                 info.mRect.height = mSepartorSize;
             }
 
                 info.mRect.height = mSepartorSize;
             }
 

-            // Do we need to set a new size to a seperator object?
+            // Do we need to set a new size to a separator object?

             if ( info.mpToolWnd )
             {
                 info.mpToolWnd->SetSize( info.mRect.x,
             if ( info.mpToolWnd )
             {
                 info.mpToolWnd->SetSize( info.mRect.x,

-                                         info.mRect.y, 
-                                         info.mRect.width, 
+                                         info.mRect.y,
+                                         info.mRect.width,

                                          info.mRect.height);
             }
 
                                          info.mRect.height);
             }
 


@@ -452,8 +450,8 @@ bool wxDynamicToolBar::Layout()
     for( i = 0; i != mTools.Count(); ++i )
     {
         pInfo = mTools[i];
     for( i = 0; i != mTools.Count(); ++i )
     {
         pInfo = mTools[i];

-        
-        if ( pInfo->mIsSeparator ) 
+
+        if ( pInfo->mIsSeparator )

         {
             pInfo->mRect.width  = mSepartorSize;
             pInfo->mRect.height = mSepartorSize;
         {
             pInfo->mRect.width  = mSepartorSize;
             pInfo->mRect.height = mSepartorSize;


@@ -464,7 +462,7 @@ bool wxDynamicToolBar::Layout()
     GetPreferredDim( wndDim, result );
 
     SizeToolWindows();
     GetPreferredDim( wndDim, result );
 
     SizeToolWindows();

-    return TRUE;
+    return true;

 }
 
 void wxDynamicToolBar::GetPreferredDim( const wxSize& givenDim, wxSize& prefDim )
 }
 
 void wxDynamicToolBar::GetPreferredDim( const wxSize& givenDim, wxSize& prefDim )


@@ -507,11 +505,11 @@ void wxDynamicToolBar::EnableTool(int toolIndex, bool enable )
 
 /***** Implementation for class BagLayout *****/
 
 
 /***** Implementation for class BagLayout *****/
 

-void BagLayout::Layout(  const wxSize&       parentDim, 
+void BagLayout::Layout(  const wxSize&       parentDim,

                          wxSize&             resultingDim,
                          wxLayoutItemArrayT& items,
                          int                 horizGap,
                          wxSize&             resultingDim,
                          wxLayoutItemArrayT& items,
                          int                 horizGap,

-                         int                 vertGap  
+                         int                 vertGap

                       )
 {
     int maxWidth = 0;
                       )
 {
     int maxWidth = 0;


@@ -543,7 +541,7 @@ void BagLayout::Layout(  const wxSize&       parentDim,
 
             if ( curX + r.width > parentDim.x )
             {
 
             if ( curX + r.width > parentDim.x )
             {

-                if ( itemsInRow > 0 ) 
+                if ( itemsInRow > 0 )

                     break;
             }
             r.x = curX;
                     break;
             }
             r.x = curX;


@@ -576,12 +574,12 @@ wxToolBarToolBase* wxDynamicToolBar::FindToolForPosition( wxCoord WXUNUSED(x), w
 
 bool wxDynamicToolBar::DoInsertTool( size_t WXUNUSED(pos), wxToolBarToolBase* WXUNUSED(tool) )
 {
 
 bool wxDynamicToolBar::DoInsertTool( size_t WXUNUSED(pos), wxToolBarToolBase* WXUNUSED(tool) )
 {

-    return TRUE;
+    return true;

 }
 
 bool wxDynamicToolBar::DoDeleteTool( size_t WXUNUSED(pos), wxToolBarToolBase* WXUNUSED(tool) )
 {
 }
 
 bool wxDynamicToolBar::DoDeleteTool( size_t WXUNUSED(pos), wxToolBarToolBase* WXUNUSED(tool) )
 {

-    return TRUE;
+    return true;

 }
 
 void wxDynamicToolBar::DoEnableTool( wxToolBarToolBase* WXUNUSED(tool), bool WXUNUSED(enable) )
 }
 
 void wxDynamicToolBar::DoEnableTool( wxToolBarToolBase* WXUNUSED(tool), bool WXUNUSED(enable) )


@@ -596,13 +594,13 @@ void wxDynamicToolBar::DoSetToggle( wxToolBarToolBase* WXUNUSED(tool), bool WXUN
 {
 }
 
 {
 }
 

-wxToolBarToolBase* wxDynamicToolBar::CreateTool( int WXUNUSED(id), 
-                                                 const wxString& WXUNUSED(label), 
-                                                 const wxBitmap& WXUNUSED(bmpNormal), 
-                                                 const wxBitmap& WXUNUSED(bmpDisabled), 
-                                                 wxItemKind WXUNUSED(kind), 
-                                                 wxObject *WXUNUSED(clientData), 
-                                                 const wxString& WXUNUSED(shortHelp), 
+wxToolBarToolBase* wxDynamicToolBar::CreateTool( int WXUNUSED(id),
+                                                 const wxString& WXUNUSED(label),
+                                                 const wxBitmap& WXUNUSED(bmpNormal),
+                                                 const wxBitmap& WXUNUSED(bmpDisabled),
+                                                 wxItemKind WXUNUSED(kind),
+                                                 wxObject *WXUNUSED(clientData),
+                                                 const wxString& WXUNUSED(shortHelp),

                                                  const wxString& WXUNUSED(longHelp)
                                                 )
 {
                                                  const wxString& WXUNUSED(longHelp)
                                                 )
 {