fix Borland bug http://news.gmane.org/find-root.php?message_id=%3c43A0B07F.8010204...

[wxWidgets.git] / src / mac / carbon / slider.cpp

diff --git a/src/mac/carbon/slider.cpp b/src/mac/carbon/slider.cpp
index 3a12b890081c0b40eea8b12488ebab18a08f9fbe..bbf97a3d9f50d8e90f5b0ff25e07535e703d9ce0 100644 (file)
--- a/src/mac/carbon/slider.cpp
+++ b/src/mac/carbon/slider.cpp
@@ -9,10 +9,6 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "slider.h"
-#endif
-
 #include "wx/wxprec.h"
 
 #if wxUSE_SLIDER
@@ -34,8 +30,8 @@ END_EVENT_TABLE()
 #define wxSLIDER_BORDERTEXT 5
 
 /* NB!  The default orientation for a slider is horizontal however if the user specifies
- * some slider styles but dosen't specify the orientation we have to assume he wants a
- * horizontal one.  Therefore in this file when testing for the sliders orientation
+ * some slider styles but doesn't specify the orientation we have to assume he wants a
+ * horizontal one.  Therefore in this file when testing for the slider's orientation
  * vertical is tested for if this is not set then we use the horizontal one
  * eg.  if(GetWindowStyle() & wxSL_VERTICAL) {}  else { horizontal case }>
  */
@@ -84,7 +80,7 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
             }
     };
 
-    wxASSERT_MSG( !(style & wxSL_VERTICAL) | !(style & wxSL_HORIZONTAL),
+    wxASSERT_MSG( !(style & wxSL_VERTICAL) || !(style & wxSL_HORIZONTAL),
         _T("incompatible slider direction and orientation") );
 
     if ( !wxControl::Create(parent, id, pos, size, style, validator, name) )
@@ -365,7 +361,7 @@ wxSize wxSlider::DoGetBestSize() const
             textwidth = maxtwidth;
         }
         else {
-            textwidth = mintwidth; 
+            textwidth = mintwidth;
         }
     }
 
@@ -421,7 +417,7 @@ void wxSlider::DoSetSize(int x, int y, int w, int h, int sizeFlags)
         GetTextExtent(text, &minValWidth, &textheight);
         text.Printf(wxT("%d"), ValueInvertOrNot( m_rangeMax ) );
         GetTextExtent(text, &maxValWidth, &ht);
- 
+
         if(ht > textheight) {
             textheight = ht;
         }