Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Common code for the same handling of wxSL_INVERSE.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32044 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-02-14 19:29:37 +00:00
parent cd0bbd03d7
commit 01526d4f6c
7 changed files with 102 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/mac/carbon/slider.h
View File

@@ -78,13 +78,12 @@ public:
int GetThumbLength() const ; int GetThumbLength() const ;
void SetTick(int tickPos) ; void SetTick(int tickPos) ;
// set min/max size of the slider // set min/max size of the slider
virtual void DoSetSizeHints( int minW, int minH, virtual void DoSetSizeHints( int minW, int minH,
int maxW = -1, int maxH = -1, int maxW = -1, int maxH = -1,
int incW = -1, int incH = -1 ); int incW = -1, int incH = -1 );
protected: protected:
virtual wxSize DoGetBestSize() const; virtual wxSize DoGetBestSize() const;
virtual void DoSetSize(int x, int y, int w, int h, int sizeFlags); virtual void DoSetSize(int x, int y, int w, int h, int sizeFlags);
virtual void DoMoveWindow(int x, int y, int w, int h); virtual void DoMoveWindow(int x, int y, int w, int h);
@@ -94,7 +93,7 @@ public:
void MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ; void MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ;
// Common processing to invert slider values based on wxSL_INVERSE // Common processing to invert slider values based on wxSL_INVERSE
int MacInvertOrNot(int value) const; virtual int ValueInvertOrNot(int value) const;
wxStaticText* m_macMinimumStatic ; wxStaticText* m_macMinimumStatic ;
wxStaticText* m_macMaximumStatic ; wxStaticText* m_macMaximumStatic ;

3
include/wx/msw/slider95.h
View File

@@ -99,9 +99,6 @@ protected:
// format an integer value as string // format an integer value as string
static wxString Format(int n) { return wxString::Format(_T("%d"), n); } static wxString Format(int n) { return wxString::Format(_T("%d"), n); }
// Common processing to invert slider values based on wxSL_INVERSE
int MSWInvertOrNot(int value) const;
// get the boundig box for the slider and possible labels // get the boundig box for the slider and possible labels
wxRect GetBoundingBox() const; wxRect GetBoundingBox() const;

2
include/wx/palmos/slider.h
View File

@@ -86,8 +86,6 @@ private:
void Init(); void Init();
int PalmInvertOrNot(int value) const;
int m_oldPos; // needed for tracing thumb position during scrolling int m_oldPos; // needed for tracing thumb position during scrolling
int m_oldValue; // needed for comparing thumb position before and after scrolling int m_oldValue; // needed for comparing thumb position before and after scrolling
int m_lineSize; // imitate line size int m_lineSize; // imitate line size

11
include/wx/slider.h
View File

@@ -80,10 +80,19 @@ public:
virtual int GetSelStart() const { return GetMax(); } virtual int GetSelStart() const { return GetMax(); }
virtual void SetSelection(int WXUNUSED(min), int WXUNUSED(max)) { } virtual void SetSelection(int WXUNUSED(min), int WXUNUSED(max)) { }
virtual void ApplyParentThemeBackground(const wxColour& bg) virtual void ApplyParentThemeBackground(const wxColour& bg)
{ SetBackgroundColour(bg); } { SetBackgroundColour(bg); }
protected:
// adjust value according to wxSL_INVERSE style
virtual int ValueInvertOrNot(int value) const
{
if (HasFlag(wxSL_INVERSE))
return (GetMax() + GetMin()) - value;
else
return value;
}
private: private:
DECLARE_NO_COPY_CLASS(wxSliderBase) DECLARE_NO_COPY_CLASS(wxSliderBase)

28
src/mac/carbon/slider.cpp
View File

@@ -136,7 +136,7 @@ wxSlider::~wxSlider()
int wxSlider::GetValue() const int wxSlider::GetValue() const
{ {
// We may need to invert the value returned by the widget // We may need to invert the value returned by the widget
return MacInvertOrNot( m_peer->GetValue() ) ; return ValueInvertOrNot( m_peer->GetValue() ) ;
} }
void wxSlider::SetValue(int value) void wxSlider::SetValue(int value)
@@ -147,7 +147,7 @@ void wxSlider::SetValue(int value)
m_macValueStatic->SetLabel( valuestring ) ; m_macValueStatic->SetLabel( valuestring ) ;
// We only invert for the setting of the actual native widget // We only invert for the setting of the actual native widget
m_peer->SetValue( MacInvertOrNot ( value ) ) ; m_peer->SetValue( ValueInvertOrNot ( value ) ) ;
} }
void wxSlider::SetRange(int minValue, int maxValue) void wxSlider::SetRange(int minValue, int maxValue)
@@ -161,11 +161,11 @@ void wxSlider::SetRange(int minValue, int maxValue)
m_peer->SetMaximum( m_rangeMax); m_peer->SetMaximum( m_rangeMax);
if(m_macMinimumStatic) { if(m_macMinimumStatic) {
value.Printf(wxT("%d"), MacInvertOrNot( m_rangeMin ) ); value.Printf(wxT("%d"), ValueInvertOrNot( m_rangeMin ) );
m_macMinimumStatic->SetLabel(value); m_macMinimumStatic->SetLabel(value);
} }
if(m_macMaximumStatic) { if(m_macMaximumStatic) {
value.Printf(wxT("%d"), MacInvertOrNot( m_rangeMax ) ); value.Printf(wxT("%d"), ValueInvertOrNot( m_rangeMax ) );
m_macMaximumStatic->SetLabel(value); m_macMaximumStatic->SetLabel(value);
} }
SetValue(m_rangeMin); SetValue(m_rangeMin);
@@ -254,7 +254,7 @@ void wxSlider::MacHandleControlClick( WXWidget control , wxInt16 controlpart, bo
{ {
// Whatever the native value is, we may need to invert it for calling // Whatever the native value is, we may need to invert it for calling
// SetValue and putting the possibly inverted value in the event // SetValue and putting the possibly inverted value in the event
SInt16 value = MacInvertOrNot ( m_peer->GetValue() ) ; SInt16 value = ValueInvertOrNot ( m_peer->GetValue() ) ;
SetValue( value ) ; SetValue( value ) ;
@@ -278,7 +278,7 @@ wxInt32 wxSlider::MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF mevent )
{ {
// Whatever the native value is, we may need to invert it for calling // Whatever the native value is, we may need to invert it for calling
// SetValue and putting the possibly inverted value in the event // SetValue and putting the possibly inverted value in the event
SInt16 value = MacInvertOrNot ( m_peer->GetValue() ) ; SInt16 value = ValueInvertOrNot ( m_peer->GetValue() ) ;
SetValue( value ) ; SetValue( value ) ;
@@ -326,9 +326,9 @@ wxSize wxSlider::DoGetBestSize() const
int ht, wd; int ht, wd;
// Get maximum text label width and height // Get maximum text label width and height
text.Printf(wxT("%d"), MacInvertOrNot( m_rangeMin ) ); text.Printf(wxT("%d"), ValueInvertOrNot( m_rangeMin ) );
GetTextExtent(text, &textwidth, &textheight); GetTextExtent(text, &textwidth, &textheight);
text.Printf(wxT("%d"), MacInvertOrNot( m_rangeMax ) ); text.Printf(wxT("%d"), ValueInvertOrNot( m_rangeMax ) );
GetTextExtent(text, &wd, &ht); GetTextExtent(text, &wd, &ht);
if(ht > textheight) { if(ht > textheight) {
textheight = ht; textheight = ht;
@@ -389,9 +389,9 @@ void wxSlider::DoSetSize(int x, int y, int w, int h, int sizeFlags)
int ht; int ht;
// Get maximum text label width and height // Get maximum text label width and height
text.Printf(wxT("%d"), MacInvertOrNot( m_rangeMin ) ); text.Printf(wxT("%d"), ValueInvertOrNot( m_rangeMin ) );
GetTextExtent(text, &minValWidth, &textheight); GetTextExtent(text, &minValWidth, &textheight);
text.Printf(wxT("%d"), MacInvertOrNot( m_rangeMax ) ); text.Printf(wxT("%d"), ValueInvertOrNot( m_rangeMax ) );
GetTextExtent(text, &maxValWidth, &ht); GetTextExtent(text, &maxValWidth, &ht);
if(ht > textheight) { if(ht > textheight) {
textheight = ht; textheight = ht;
@@ -434,7 +434,6 @@ void wxSlider::DoSetSize(int x, int y, int w, int h, int sizeFlags)
} }
} }
// yet another hack since this is a composite control // yet another hack since this is a composite control
// when wxSlider has it's size hardcoded, we're not allowed to // when wxSlider has it's size hardcoded, we're not allowed to
// change the size. But when the control has labels, we DO need // change the size. But when the control has labels, we DO need
@@ -466,7 +465,7 @@ void wxSlider::DoMoveWindow(int x, int y, int width, int height)
} }
// Common processing to invert slider values based on wxSL_INVERSE // Common processing to invert slider values based on wxSL_INVERSE
int wxSlider::MacInvertOrNot(int value) const int wxSlider::ValueInvertOrNot(int value) const
{ {
if (m_windowStyle & wxSL_VERTICAL) if (m_windowStyle & wxSL_VERTICAL)
{ {
@@ -480,10 +479,7 @@ int wxSlider::MacInvertOrNot(int value) const
} }
else // normal logic applies to HORIZONTAL sliders else // normal logic applies to HORIZONTAL sliders
{ {
if (m_windowStyle & wxSL_INVERSE) return wxSliderBase::ValueInvertOrNot(value);
return (m_rangeMax + m_rangeMin) - value;
else
return value;
} }
} }

18
src/msw/slider95.cpp
View File

@@ -307,7 +307,7 @@ bool wxSlider95::MSWOnScroll(int WXUNUSED(orientation),
return false; return false;
} }
int newPos = MSWInvertOrNot((int) ::SendMessage((HWND) control, TBM_GETPOS, 0, 0)); int newPos = ValueInvertOrNot((int) ::SendMessage((HWND) control, TBM_GETPOS, 0, 0));
if ( (newPos < GetMin()) || (newPos > GetMax()) ) if ( (newPos < GetMin()) || (newPos > GetMax()) )
{ {
// out of range - but we did process it // out of range - but we did process it
@@ -507,22 +507,14 @@ wxSize wxSlider95::DoGetBestSize() const
// slider-specific methods // slider-specific methods
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
int wxSlider95::MSWInvertOrNot(int value) const
{
if (m_windowStyle & wxSL_INVERSE)
return (m_rangeMax + m_rangeMin) - value;
else
return value;
}
int wxSlider95::GetValue() const int wxSlider95::GetValue() const
{ {
return MSWInvertOrNot(::SendMessage(GetHwnd(), TBM_GETPOS, 0, 0)); return ValueInvertOrNot(::SendMessage(GetHwnd(), TBM_GETPOS, 0, 0));
} }
void wxSlider95::SetValue(int value) void wxSlider95::SetValue(int value)
{ {
::SendMessage(GetHwnd(), TBM_SETPOS, (WPARAM)TRUE, (LPARAM)MSWInvertOrNot(value)); ::SendMessage(GetHwnd(), TBM_SETPOS, (WPARAM)TRUE, (LPARAM)ValueInvertOrNot(value));
if ( m_labels ) if ( m_labels )
{ {
@@ -539,8 +531,8 @@ void wxSlider95::SetRange(int minValue, int maxValue)
if ( m_labels ) if ( m_labels )
{ {
::SetWindowText((*m_labels)[SliderLabel_Min], Format(MSWInvertOrNot(m_rangeMin))); ::SetWindowText((*m_labels)[SliderLabel_Min], Format(ValueInvertOrNot(m_rangeMin)));
::SetWindowText((*m_labels)[SliderLabel_Max], Format(MSWInvertOrNot(m_rangeMax))); ::SetWindowText((*m_labels)[SliderLabel_Max], Format(ValueInvertOrNot(m_rangeMax)));
} }
} }

14
src/palmos/slider.cpp
View File

@@ -195,14 +195,6 @@ int wxSlider::GetPageSize() const
return ret; return ret;
} }
int wxSlider::PalmInvertOrNot(int value) const
{
if (m_windowStyle & wxSL_INVERSE)
return (GetMax() + GetMin()) - value;
else
return value;
}
int wxSlider::GetValue() const int wxSlider::GetValue() const
{ {
ControlType *control = (ControlType *)GetObjectPtr(); ControlType *control = (ControlType *)GetObjectPtr();
@@ -210,12 +202,12 @@ int wxSlider::GetValue() const
return 0; return 0;
uint16_t ret; uint16_t ret;
CtlGetSliderValues(control, NULL, NULL, NULL, &ret); CtlGetSliderValues(control, NULL, NULL, NULL, &ret);
return PalmInvertOrNot(ret); return ValueInvertOrNot(ret);
} }
void wxSlider::SetValue(int value) void wxSlider::SetValue(int value)
{ {
SetIntValue(PalmInvertOrNot(value)); SetIntValue(ValueInvertOrNot(value));
m_oldValue = m_oldPos = value; m_oldValue = m_oldPos = value;
} }
@@ -335,7 +327,7 @@ bool wxSlider::SendUpdatedEvent()
bool wxSlider::SendScrollEvent(EventType* event) bool wxSlider::SendScrollEvent(EventType* event)
{ {
wxEventType scrollEvent; wxEventType scrollEvent;
int newPos = PalmInvertOrNot(event->data.ctlRepeat.value); int newPos = ValueInvertOrNot(event->data.ctlRepeat.value);
if ( newPos == m_oldPos ) if ( newPos == m_oldPos )
{ {
// nothing changed since last event // nothing changed since last event