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 6ffd9dd1a5fe6acbf03f6e9931453a1fcfdf6ddd..bbf97a3d9f50d8e90f5b0ff25e07535e703d9ce0 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


@@ -20,12 +16,10 @@
 #include "wx/slider.h"
 #include "wx/mac/uma.h"
 
 #include "wx/slider.h"
 #include "wx/mac/uma.h"
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxSlider, wxControl)
 
 BEGIN_EVENT_TABLE(wxSlider, wxControl)
 END_EVENT_TABLE()
 IMPLEMENT_DYNAMIC_CLASS(wxSlider, wxControl)
 
 BEGIN_EVENT_TABLE(wxSlider, wxControl)
 END_EVENT_TABLE()

-#endif

 
  // The dimensions of the different styles of sliders (From Aqua document)
 #define wxSLIDER_DIMENSIONACROSS 15
 
  // The dimensions of the different styles of sliders (From Aqua document)
 #define wxSLIDER_DIMENSIONACROSS 15


@@ -36,8 +30,8 @@ END_EVENT_TABLE()
 #define wxSLIDER_BORDERTEXT 5
 
 /* NB!  The default orientation for a slider is horizontal however if the user specifies
 #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 }>
  */
  * vertical is tested for if this is not set then we use the horizontal one
  * eg.  if(GetWindowStyle() & wxSL_VERTICAL) {}  else { horizontal case }>
  */


@@ -52,8 +46,6 @@ END_EVENT_TABLE()
     m_tickFreq = 0;
 }
 
     m_tickFreq = 0;
 }
 

-extern ControlActionUPP wxMacLiveScrollbarActionUPP ;
-

 bool wxSlider::Create(wxWindow *parent, wxWindowID id,
                       int value, int minValue, int maxValue,
                       const wxPoint& pos,
 bool wxSlider::Create(wxWindow *parent, wxWindowID id,
                       int value, int minValue, int maxValue,
                       const wxPoint& pos,


@@ -63,6 +55,34 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
 {
     m_macIsUserPane = false ;
 
 {
     m_macIsUserPane = false ;
 

+    // our styles are redundant: wxSL_LEFT/RIGHT imply wxSL_VERTICAL and
+    // wxSL_TOP/BOTTOM imply wxSL_HORIZONTAL, but for backwards compatibility
+    // reasons we can't really change it, instead try to infer the orientation
+    // from the flags given to us here
+    switch ( style & (wxSL_LEFT | wxSL_RIGHT | wxSL_TOP | wxSL_BOTTOM) )
+    {
+        case wxSL_LEFT:
+        case wxSL_RIGHT:
+            style |= wxSL_VERTICAL;
+            break;
+
+        case wxSL_TOP:
+        case wxSL_BOTTOM:
+            style |= wxSL_HORIZONTAL;
+            break;
+
+        case 0:
+            // no specific direction, do we have at least the orientation?
+            if ( !(style & (wxSL_HORIZONTAL | wxSL_VERTICAL)) )
+            {
+                // no, choose default
+                style |= wxSL_BOTTOM | 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) )
         return false;
 
     if ( !wxControl::Create(parent, id, pos, size, style, validator, name) )
         return false;
 


@@ -91,11 +111,10 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
     while (tickMarks > 20)
         tickMarks /= 5; //keep the number of tickmarks from becoming unwieldly
 
     while (tickMarks > 20)
         tickMarks /= 5; //keep the number of tickmarks from becoming unwieldly
 

-    m_peer = new wxMacControl() ;
+    m_peer = new wxMacControl(this) ;

     verify_noerr ( CreateSliderControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds ,
         value , minValue , maxValue , kControlSliderPointsDownOrRight , tickMarks , true /* liveTracking */ ,
     verify_noerr ( CreateSliderControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds ,
         value , minValue , maxValue , kControlSliderPointsDownOrRight , tickMarks , true /* liveTracking */ ,

-        wxMacLiveScrollbarActionUPP , m_peer->GetControlRefAddr() ) );
-
+        GetwxMacLiveScrollbarActionProc() , m_peer->GetControlRefAddr() ) );

 
     if(style & wxSL_VERTICAL) {
         SetSizeHints(10, -1, 10, -1);  // Forces SetSize to use the proper width
 
     if(style & wxSL_VERTICAL) {
         SetSizeHints(10, -1, 10, -1);  // Forces SetSize to use the proper width


@@ -318,23 +337,31 @@ void wxSlider::DoSetSizeHints( int minW, int minH,
 wxSize wxSlider::DoGetBestSize() const
 {
     wxSize size;
 wxSize wxSlider::DoGetBestSize() const
 {
     wxSize size;

-    int textwidth, textheight;
+    int textwidth = 0;
+    int textheight = 0;
+    int mintwidth, mintheight;
+    int maxtwidth, maxtheight;

 
     if(GetWindowStyle() & wxSL_LABELS)
     {
         wxString text;
 
     if(GetWindowStyle() & wxSL_LABELS)
     {
         wxString text;

-        int ht, wd;

 
         // Get maximum text label width and height
         text.Printf(wxT("%d"), ValueInvertOrNot( m_rangeMin ) );
 
         // Get maximum text label width and height
         text.Printf(wxT("%d"), ValueInvertOrNot( m_rangeMin ) );

-        GetTextExtent(text, &textwidth, &textheight);
+        GetTextExtent(text, &mintwidth, &mintheight);

         text.Printf(wxT("%d"), ValueInvertOrNot( m_rangeMax ) );
         text.Printf(wxT("%d"), ValueInvertOrNot( m_rangeMax ) );

-        GetTextExtent(text, &wd, &ht);
-        if(ht > textheight) {
-            textheight = ht;
+        GetTextExtent(text, &maxtwidth, &maxtheight);
+        if(maxtheight > mintheight) {
+            textheight = maxtheight;
+        }
+        else {
+            textheight = mintheight;

         }
         }

-        if (wd > textwidth) {
-            textwidth = wd;
+        if (maxtwidth > mintwidth) {
+            textwidth = maxtwidth;
+        }
+        else {
+            textwidth = mintwidth;

         }
     }
 
         }
     }
 


@@ -359,10 +386,13 @@ wxSize wxSlider::DoGetBestSize() const
         else {
             size.y = wxSLIDER_DIMENSIONACROSS_ARROW;
         }
         else {
             size.y = wxSLIDER_DIMENSIONACROSS_ARROW;
         }

+
+        size.x = 150;
+

         if(GetWindowStyle() & wxSL_LABELS) {
             size.y += textheight + wxSLIDER_BORDERTEXT;
         if(GetWindowStyle() & wxSL_LABELS) {
             size.y += textheight + wxSLIDER_BORDERTEXT;

+            size.x += (mintwidth/2) + (maxtwidth/2);

         }
         }

-        size.x = 150;

     }
     return size;
 }
     }
     return size;
 }


@@ -370,7 +400,7 @@ wxSize wxSlider::DoGetBestSize() const
 void wxSlider::DoSetSize(int x, int y, int w, int h, int sizeFlags)
 {
     int  xborder, yborder;
 void wxSlider::DoSetSize(int x, int y, int w, int h, int sizeFlags)
 {
     int  xborder, yborder;

-    int  minValWidth, maxValWidth, textwidth, textheight;
+    int  minValWidth, maxValWidth, textheight;

     int  sliderBreadth;
     int width = w;
 
     int  sliderBreadth;
     int width = w;
 


@@ -378,27 +408,52 @@ void wxSlider::DoSetSize(int x, int y, int w, int h, int sizeFlags)
 
     if (GetWindowStyle() & wxSL_LABELS)
     {
 
     if (GetWindowStyle() & wxSL_LABELS)
     {

-        //Labels have this control's parent as their parent
-        //so if this control is not at 0,0 relative to the parent
-        //the labels need to know the position of this control
-        //relative to its parent in order to size properly, so
-        //move the control first so we can use GetPosition()
-        wxControl::DoSetSize( x, y , w , h ,sizeFlags ) ;

 
         wxString text;
 
         wxString text;

-        int ht;
+        int ht, valValWidth;

 
         // Get maximum text label width and height
         text.Printf(wxT("%d"), ValueInvertOrNot( m_rangeMin ) );
         GetTextExtent(text, &minValWidth, &textheight);
         text.Printf(wxT("%d"), ValueInvertOrNot( m_rangeMax ) );
         GetTextExtent(text, &maxValWidth, &ht);
 
         // Get maximum text label width and height
         text.Printf(wxT("%d"), ValueInvertOrNot( m_rangeMin ) );
         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;
         }

-        textwidth = (minValWidth > maxValWidth ? minValWidth : maxValWidth);

 
 

-        xborder = textwidth + wxSLIDER_BORDERTEXT;
+        if(GetWindowStyle() & wxSL_HORIZONTAL)
+        {
+          if ( m_macMinimumStatic ) {
+            w-=minValWidth/2;
+            x+=minValWidth/2;
+        }
+          if ( m_macMaximumStatic ) {
+            w-=maxValWidth/2;
+          }
+        }
+
+
+        //Labels have this control's parent as their parent
+        //so if this control is not at 0,0 relative to the parent
+        //the labels need to know the position of this control
+        //relative to its parent in order to size properly, so
+        //move the control first so we can use GetPosition()
+        wxControl::DoSetSize( x, y , w , h ,sizeFlags ) ;
+
+        // If vertical, use current value
+        if(GetWindowStyle() & wxSL_VERTICAL)
+        {
+            text.Printf(wxT("%d"), (int)m_peer->GetValue());
+        }
+        // Use max so that the current value doesn't drift as centering would need to change
+        else
+        {
+            text.Printf(wxT("%d"), m_rangeMax);
+        }
+
+        GetTextExtent(text, &valValWidth, &ht);
+

         yborder = textheight + wxSLIDER_BORDERTEXT;
 
         // Get slider breadth
         yborder = textheight + wxSLIDER_BORDERTEXT;
 
         // Get slider breadth


@@ -414,30 +469,27 @@ void wxSlider::DoSetSize(int x, int y, int w, int h, int sizeFlags)
             h = h - yborder ;
 
             if ( m_macMinimumStatic )
             h = h - yborder ;
 
             if ( m_macMinimumStatic )

-                m_macMinimumStatic->Move(GetPosition().x + sliderBreadth + wxSLIDER_BORDERTEXT,
-                GetPosition().y + h - yborder);
+                m_macMinimumStatic->Move(GetPosition().x + sliderBreadth + wxSLIDER_BORDERTEXT, GetPosition().y + h - yborder);

             if ( m_macMaximumStatic )
                 m_macMaximumStatic->Move(GetPosition().x + sliderBreadth + wxSLIDER_BORDERTEXT, GetPosition().y + 0);
             if ( m_macValueStatic )
             if ( m_macMaximumStatic )
                 m_macMaximumStatic->Move(GetPosition().x + sliderBreadth + wxSLIDER_BORDERTEXT, GetPosition().y + 0);
             if ( m_macValueStatic )

-                m_macValueStatic->Move(GetPosition().x, GetPosition().y + h );
+                m_macValueStatic->Move(GetPosition().x + sliderBreadth + wxSLIDER_BORDERTEXT, GetPosition().y + (h/2) - (ht/2));

         }
         else
         {
         }
         else
         {

-            w = w - xborder ;

             if ( m_macMinimumStatic )
             if ( m_macMinimumStatic )

-                m_macMinimumStatic->Move(GetPosition().x + 0, GetPosition().y + sliderBreadth + wxSLIDER_BORDERTEXT);
+                m_macMinimumStatic->Move(GetPosition().x, GetPosition().y + sliderBreadth + wxSLIDER_BORDERTEXT);

             if ( m_macMaximumStatic )
             if ( m_macMaximumStatic )

-                m_macMaximumStatic->Move(GetPosition().x + w - (maxValWidth/2),
-                GetPosition().y + sliderBreadth + wxSLIDER_BORDERTEXT);
+                 m_macMaximumStatic->Move(GetPosition().x + w - maxValWidth, GetPosition().y + sliderBreadth + wxSLIDER_BORDERTEXT);

             if ( m_macValueStatic )
             if ( m_macValueStatic )

-                m_macValueStatic->Move(GetPosition().x + w, GetPosition().y + 0);
+                m_macValueStatic->Move(GetPosition().x + (w/2) - (valValWidth/2), GetPosition().y + sliderBreadth + wxSLIDER_BORDERTEXT);

         }
     }
 
     // yet another hack since this is a composite control
     // when wxSlider has it's size hardcoded, we're not allowed to
     // change the size. But when the control has labels, we DO need
         }
     }
 
     // yet another hack since this is a composite control
     // when wxSlider has it's size hardcoded, we're not allowed to
     // change the size. But when the control has labels, we DO need

-    // to resize the internal Mac control to accomodate the text labels.
+    // to resize the internal Mac control to accommodate the text labels.

     // We need to trick the wxWidgets resize mechanism so that we can
     // resize the slider part of the control ONLY.
 
     // We need to trick the wxWidgets resize mechanism so that we can
     // resize the slider part of the control ONLY.