patch 1306473

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

diff --git a/src/mac/carbon/slider.cpp b/src/mac/carbon/slider.cpp
index 3a12b890081c0b40eea8b12488ebab18a08f9fbe..d7613a3edddc166794ceaa3ff0fa4476dc734213 100644 (file)
--- a/src/mac/carbon/slider.cpp
+++ b/src/mac/carbon/slider.cpp
@@ -9,10 +9,6 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "slider.h"
-#endif
-

 #include "wx/wxprec.h"
 
 #if wxUSE_SLIDER
 #include "wx/wxprec.h"
 
 #if wxUSE_SLIDER


@@ -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) )
         _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 = 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);
         GetTextExtent(text, &minValWidth, &textheight);
         text.Printf(wxT("%d"), ValueInvertOrNot( m_rangeMax ) );
         GetTextExtent(text, &maxValWidth, &ht);

- 
+

         if(ht > textheight) {
             textheight = ht;
         }
         if(ht > textheight) {
             textheight = ht;
         }