The mmedia contrib requires sys/soundcard.h on unix, so disable it on unix

[wxWidgets.git] / src / univ / ctrlrend.cpp

diff --git a/src/univ/ctrlrend.cpp b/src/univ/ctrlrend.cpp
index d9ca852deee185a76cf98f99a71091394b74fea8..ba9b9510506b3aead14166bd4dfdd449a16ea087 100644 (file)
--- a/src/univ/ctrlrend.cpp
+++ b/src/univ/ctrlrend.cpp
@@ -6,7 +6,7 @@
 // Created:     15.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
 // Created:     15.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // ===========================================================================
 ///////////////////////////////////////////////////////////////////////////////
 
 // ===========================================================================


@@ -177,7 +177,8 @@ wxRect wxRenderer::StandardGetScrollbarRect(const wxScrollBar *scrollbar,
     }
 
     wxSize sizeTotal = scrollbar->GetClientSize();
     }
 
     wxSize sizeTotal = scrollbar->GetClientSize();

-    wxCoord *start, *width, length, arrow;
+    wxCoord *start, *width;
+    wxCoord length, arrow;

     wxRect rect;
     if ( scrollbar->IsVertical() )
     {
     wxRect rect;
     if ( scrollbar->IsVertical() )
     {


@@ -541,7 +542,7 @@ void wxControlRenderer::DrawBitmap(wxDC &dc,
     }
 
     // do draw it
     }
 
     // do draw it

-    dc.DrawBitmap(bmp, x, y, TRUE /* use mask */);
+    dc.DrawBitmap(bmp, x, y, true /* use mask */);

 }
 
 void wxControlRenderer::DrawScrollbar(const wxScrollBar *scrollbar,
 }
 
 void wxControlRenderer::DrawScrollbar(const wxScrollBar *scrollbar,


@@ -561,7 +562,7 @@ void wxControlRenderer::DrawScrollbar(const wxScrollBar *scrollbar,
                    rectUpdate.GetBottom());
 
 #if 0 //def WXDEBUG_SCROLLBAR
                    rectUpdate.GetBottom());
 
 #if 0 //def WXDEBUG_SCROLLBAR

-        static bool s_refreshDebug = FALSE;
+        static bool s_refreshDebug = false;

         if ( s_refreshDebug )
         {
             wxClientDC dc(wxConstCast(scrollbar, wxScrollBar));
         if ( s_refreshDebug )
         {
             wxClientDC dc(wxConstCast(scrollbar, wxScrollBar));


@@ -628,7 +629,7 @@ void wxControlRenderer::DrawScrollbar(const wxScrollBar *scrollbar,
                 (wxScrollArrows::Arrow)nArrow,
                 m_dc,
                 rectArrow,
                 (wxScrollArrows::Arrow)nArrow,
                 m_dc,
                 rectArrow,

-                TRUE // draw a scrollbar arrow, not just an arrow
+                true // draw a scrollbar arrow, not just an arrow

             );
         }
     }
             );
         }
     }


@@ -750,7 +751,7 @@ void wxControlRenderer::DoDrawItems(const wxListBox *lbox,
 void wxControlRenderer::DrawCheckItems(const wxCheckListBox *lbox,
                                        size_t itemFirst, size_t itemLast)
 {
 void wxControlRenderer::DrawCheckItems(const wxCheckListBox *lbox,
                                        size_t itemFirst, size_t itemLast)
 {

-    DoDrawItems(lbox, itemFirst, itemLast, TRUE);
+    DoDrawItems(lbox, itemFirst, itemLast, true);

 }
 
 #endif // wxUSE_CHECKLISTBOX
 }
 
 #endif // wxUSE_CHECKLISTBOX


@@ -813,7 +814,8 @@ void wxControlRenderer::DrawProgressBar(const wxGauge *gauge)
         int steps = ((lenTotal + step - 1) * pos) / (max * step);
 
         // calc the coords of one small rect
         int steps = ((lenTotal + step - 1) * pos) / (max * step);
 
         // calc the coords of one small rect

-        wxCoord *px, dx, dy;
+        wxCoord *px;
+        wxCoord dx, dy;

         if ( gauge->IsVertical() )
         {
             // draw from bottom to top: so first set y to the bottom
         if ( gauge->IsVertical() )
         {
             // draw from bottom to top: so first set y to the bottom