Removed ambiguity between deprecated and new constructor.

[wxWidgets.git] / contrib / src / deprecated / tbarsmpl.cpp

diff --git a/contrib/src/deprecated/tbarsmpl.cpp b/contrib/src/deprecated/tbarsmpl.cpp
index 4bac4dfeb531c88051724321be63386d31a2fb0b..230fd13ab2931f7f325fe6e7a30de0868f415fbd 100644 (file)
--- a/contrib/src/deprecated/tbarsmpl.cpp
+++ b/contrib/src/deprecated/tbarsmpl.cpp
@@ -145,7 +145,7 @@ void wxToolBarSimple::Init()
     m_currentTool = -1;
 
     m_xPos =
     m_currentTool = -1;
 
     m_xPos =

-    m_yPos = -1;
+    m_yPos = wxDefaultCoord;

 
     m_toolPacking = 1;
     m_toolSeparation = 5;
 
     m_toolPacking = 1;
     m_toolSeparation = 5;


@@ -155,8 +155,8 @@ void wxToolBarSimple::Init()
 
     m_xScrollPixelsPerLine = 1;
     m_yScrollPixelsPerLine = 1;
 
     m_xScrollPixelsPerLine = 1;
     m_yScrollPixelsPerLine = 1;

-    m_xScrollingEnabled = FALSE;
-    m_yScrollingEnabled = FALSE;
+    m_xScrollingEnabled = false;
+    m_yScrollingEnabled = false;

     m_xScrollPosition = 0;
     m_yScrollPosition = 0;
     m_xScrollLines = 0;
     m_xScrollPosition = 0;
     m_yScrollPosition = 0;
     m_xScrollLines = 0;


@@ -190,15 +190,15 @@ bool wxToolBarSimple::DoInsertTool(size_t WXUNUSED(pos),
 {
     wxToolBarToolSimple *tool = (wxToolBarToolSimple *)toolBase;
 
 {
     wxToolBarToolSimple *tool = (wxToolBarToolSimple *)toolBase;
 

-    wxCHECK_MSG( !tool->IsControl(), FALSE,
+    wxCHECK_MSG( !tool->IsControl(), false,

                  _T("generic wxToolBarSimple doesn't support controls") );
 
     tool->m_x = m_xPos;
                  _T("generic wxToolBarSimple doesn't support controls") );
 
     tool->m_x = m_xPos;

-    if ( tool->m_x == -1 )
+    if ( tool->m_x == wxDefaultCoord )

         tool->m_x = m_xMargin;
 
     tool->m_y = m_yPos;
         tool->m_x = m_xMargin;
 
     tool->m_y = m_yPos;

-    if ( tool->m_y == -1 )
+    if ( tool->m_y == wxDefaultCoord )

         tool->m_y = m_yMargin;
 
     tool->SetSize(GetToolSize());
         tool->m_y = m_yMargin;
 
     tool->SetSize(GetToolSize());


@@ -213,7 +213,7 @@ bool wxToolBarSimple::DoInsertTool(size_t WXUNUSED(pos),
             m_maxHeight = (wxCoord)((tool->m_y + tool->GetHeight() + m_yMargin));
     }
 
             m_maxHeight = (wxCoord)((tool->m_y + tool->GetHeight() + m_yMargin));
     }
 

-    return TRUE;
+    return true;

 }
 
 bool wxToolBarSimple::DoDeleteTool(size_t WXUNUSED(pos),
 }
 
 bool wxToolBarSimple::DoDeleteTool(size_t WXUNUSED(pos),


@@ -224,7 +224,7 @@ bool wxToolBarSimple::DoDeleteTool(size_t WXUNUSED(pos),
 
     Refresh();
 
 
     Refresh();
 

-    return TRUE;
+    return true;

 }
 
 bool wxToolBarSimple::Create(wxWindow *parent,
 }
 
 bool wxToolBarSimple::Create(wxWindow *parent,


@@ -235,7 +235,7 @@ bool wxToolBarSimple::Create(wxWindow *parent,
                              const wxString& name)
 {
     if ( !wxWindow::Create(parent, id, pos, size, style, name) )
                              const wxString& name)
 {
     if ( !wxWindow::Create(parent, id, pos, size, style, name) )

-        return FALSE;
+        return false;

 
     // Set it to grey (or other 3D face colour)
     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
 
     // Set it to grey (or other 3D face colour)
     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));


@@ -259,7 +259,7 @@ bool wxToolBarSimple::Create(wxWindow *parent,
 
     SetCursor(*wxSTANDARD_CURSOR);
 
 
     SetCursor(*wxSTANDARD_CURSOR);
 

-    return TRUE;
+    return true;

 }
 
 wxToolBarSimple::~wxToolBarSimple()
 }
 
 wxToolBarSimple::~wxToolBarSimple()


@@ -366,7 +366,7 @@ bool wxToolBarSimple::Realize()
 
     SetSize(m_maxWidth, m_maxHeight);
 
 
     SetSize(m_maxWidth, m_maxHeight);
 

-    return TRUE;
+    return true;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -398,10 +398,8 @@ void wxToolBarSimple::OnPaint (wxPaintEvent& WXUNUSED(event))
 
 void wxToolBarSimple::OnSize (wxSizeEvent& WXUNUSED(event))
 {
 
 void wxToolBarSimple::OnSize (wxSizeEvent& WXUNUSED(event))
 {

-#if wxUSE_CONSTRAINTS

     if (GetAutoLayout())
         Layout();
     if (GetAutoLayout())
         Layout();

-#endif

 
     AdjustScrollbars();
 }
 
     AdjustScrollbars();
 }


@@ -572,11 +570,11 @@ void wxToolBarSimple::DrawTool(wxDC& dc, wxToolBarToolBase *toolBase)
     // No second bitmap, so draw a thick line around bitmap, or invert if mono
     else if ( tool->IsToggled() )
     {
     // No second bitmap, so draw a thick line around bitmap, or invert if mono
     else if ( tool->IsToggled() )
     {

-        bool drawBorder = FALSE;
+        bool drawBorder = false;

 #ifdef __X__ // X doesn't invert properly on colour
         drawBorder = wxColourDisplay();
 #else       // Inversion works fine under Windows
 #ifdef __X__ // X doesn't invert properly on colour
         drawBorder = wxColourDisplay();
 #else       // Inversion works fine under Windows

-        drawBorder = FALSE;
+        drawBorder = false;

 #endif
 
         if (!drawBorder)
 #endif
 
         if (!drawBorder)


@@ -732,22 +730,22 @@ void wxToolBarSimple::SetScrollbars (int pixelsPerUnitX, int pixelsPerUnitY,
     if (m_xScrollLines > 0)
     {
         m_xScrollPosition = xPos;
     if (m_xScrollLines > 0)
     {
         m_xScrollPosition = xPos;

-        SetScrollPos (wxHORIZONTAL, m_xScrollPosition, TRUE);
+        SetScrollPos (wxHORIZONTAL, m_xScrollPosition, true);

     }
     else
     {
     }
     else
     {

-        SetScrollbar(wxHORIZONTAL, 0, 0, 0, FALSE);
+        SetScrollbar(wxHORIZONTAL, 0, 0, 0, false);

         m_xScrollPosition = 0;
     }
 
     if (m_yScrollLines > 0)
     {
         m_yScrollPosition = yPos;
         m_xScrollPosition = 0;
     }
 
     if (m_yScrollLines > 0)
     {
         m_yScrollPosition = yPos;

-        SetScrollPos (wxVERTICAL, m_yScrollPosition, TRUE);
+        SetScrollPos (wxVERTICAL, m_yScrollPosition, true);

     }
     else
     {
     }
     else
     {

-        SetScrollbar(wxVERTICAL, 0, 0, 0, FALSE);
+        SetScrollbar(wxVERTICAL, 0, 0, 0, false);

         m_yScrollPosition = 0;
     }
     AdjustScrollbars();
         m_yScrollPosition = 0;
     }
     AdjustScrollbars();


@@ -769,12 +767,12 @@ void wxToolBarSimple::OnScroll(wxScrollEvent& event)
     if (orient == wxHORIZONTAL)
     {
         int newPos = m_xScrollPosition + nScrollInc;
     if (orient == wxHORIZONTAL)
     {
         int newPos = m_xScrollPosition + nScrollInc;

-        SetScrollPos(wxHORIZONTAL, newPos, TRUE );
+        SetScrollPos(wxHORIZONTAL, newPos, true );

     }
     else
     {
         int newPos = m_yScrollPosition + nScrollInc;
     }
     else
     {
         int newPos = m_yScrollPosition + nScrollInc;

-        SetScrollPos(wxVERTICAL, newPos, TRUE );
+        SetScrollPos(wxVERTICAL, newPos, true );

     }
 
     if (orient == wxHORIZONTAL)
     }
 
     if (orient == wxHORIZONTAL)


@@ -853,7 +851,7 @@ int wxToolBarSimple::CalcScrollInc(wxScrollEvent& event)
             else
                 nScrollInc = pos - m_yScrollPosition;
     }
             else
                 nScrollInc = pos - m_yScrollPosition;
     }

-    
+

     if (orient == wxHORIZONTAL)
     {
         int w, h;
     if (orient == wxHORIZONTAL)
     {
         int w, h;


@@ -970,18 +968,18 @@ void wxToolBarSimple::Scroll (int x_pos, int y_pos)
 {
     int old_x, old_y;
     ViewStart (&old_x, &old_y);
 {
     int old_x, old_y;
     ViewStart (&old_x, &old_y);

-    if (((x_pos == -1) || (x_pos == old_x)) && ((y_pos == -1) || (y_pos == old_y)))
+    if (((x_pos == wxDefaultCoord) || (x_pos == old_x)) && ((y_pos == wxDefaultCoord) || (y_pos == old_y)))

         return;
 
         return;
 

-    if (x_pos > -1)
+    if (x_pos != wxDefaultCoord)

     {
         m_xScrollPosition = x_pos;
     {
         m_xScrollPosition = x_pos;

-        SetScrollPos (wxHORIZONTAL, x_pos, TRUE);
+        SetScrollPos (wxHORIZONTAL, x_pos, true);

     }
     }

-    if (y_pos > -1)
+    if (y_pos != wxDefaultCoord)

     {
         m_yScrollPosition = y_pos;
     {
         m_yScrollPosition = y_pos;

-        SetScrollPos (wxVERTICAL, y_pos, TRUE);
+        SetScrollPos (wxVERTICAL, y_pos, true);

     }
     Refresh();
 
     }
     Refresh();