#ifndef WX_PRECOMP
#include <stdio.h>
+#include <wx/utils.h>
+#include <wx/brush.h>
#endif
#ifdef __WIN95__
#include "wx/msw/slider95.h"
#include "wx/msw/private.h"
-#if defined(__WIN95__) && !defined(__GNUWIN32__)
+#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__)
#include <commctrl.h>
#endif
#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxSlider95, wxControl)
-
-#if WXWIN_COMPATIBILITY
-BEGIN_EVENT_TABLE(wxSlider95, wxControl)
- EVT_SCROLL(wxSlider95::OnScroll)
-END_EVENT_TABLE()
-#endif
-
#endif
// Slider
-wxSlider95::wxSlider95(void)
+wxSlider95::wxSlider95()
{
m_staticValue = 0;
m_staticMin = 0;
m_tickFreq = 0;
}
-bool wxSlider95::Create(wxWindow *parent, const wxWindowID id,
- const int value, const int minValue, const int maxValue,
+bool wxSlider95::Create(wxWindow *parent, wxWindowID id,
+ int value, int minValue, int maxValue,
const wxPoint& pos,
- const wxSize& size, const long style,
+ const wxSize& size, long style,
const wxValidator& validator,
const wxString& name)
{
SetValidator(validator);
if (parent) parent->AddChild(this);
- SetBackgroundColour(parent->GetDefaultBackgroundColour()) ;
- SetForegroundColour(parent->GetDefaultForegroundColour()) ;
+ SetBackgroundColour(parent->GetBackgroundColour()) ;
+ SetForegroundColour(parent->GetForegroundColour()) ;
m_staticValue = 0;
m_staticMin = 0;
SubclassWin(GetHWND());
+ SetWindowText((HWND) m_hWnd, "");
+
+ SetFont(parent->GetFont());
+
if ( m_windowStyle & wxSL_LABELS )
{
// Finally, create max value static item
0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)NewControlId(),
wxGetInstance(), NULL);
- SetFont(parent->GetFont());
- if (GetFont())
+ if (GetFont().Ok())
{
-// GetFont()->RealizeResource();
- if (GetFont()->GetResourceHandle())
+ if (GetFont().GetResourceHandle())
{
if ( m_staticMin )
SendMessage((HWND)m_staticMin,WM_SETFONT,
- (WPARAM)GetFont()->GetResourceHandle(),0L);
+ (WPARAM)GetFont().GetResourceHandle(),0L);
if ( m_staticMax )
SendMessage((HWND)m_staticMax,WM_SETFONT,
- (WPARAM)GetFont()->GetResourceHandle(),0L);
+ (WPARAM)GetFont().GetResourceHandle(),0L);
if (m_staticValue)
SendMessage((HWND)m_staticValue,WM_SETFONT,
- (WPARAM)GetFont()->GetResourceHandle(),0L);
+ (WPARAM)GetFont().GetResourceHandle(),0L);
}
}
}
return TRUE;
}
-void wxSlider95::MSWOnVScroll(const WXWORD wParam, const WXWORD pos, const WXHWND control)
+void wxSlider95::MSWOnVScroll(WXWORD wParam, WXWORD pos, WXHWND control)
{
int position = 0; // Dummy - not used in this mode
event.SetPosition(newPos);
event.SetEventObject( this );
GetEventHandler()->ProcessEvent(event);
+
+ wxCommandEvent cevent( wxEVT_COMMAND_SLIDER_UPDATED, GetId() );
+ cevent.SetEventObject( this );
+ GetEventHandler()->ProcessEvent( cevent );
+
}
}
}
-void wxSlider95::MSWOnHScroll(const WXWORD wParam, const WXWORD pos, const WXHWND control)
+void wxSlider95::MSWOnHScroll(WXWORD wParam, WXWORD pos, WXHWND control)
{
MSWOnVScroll(wParam, pos, control);
}
-wxSlider95::~wxSlider95(void)
+wxSlider95::~wxSlider95()
{
if (m_staticMin)
DestroyWindow((HWND) m_staticMin);
DestroyWindow((HWND) m_staticValue);
}
-int wxSlider95::GetValue(void) const
+int wxSlider95::GetValue() const
{
return ::SendMessage((HWND) GetHWND(), TBM_GETPOS, 0, 0);
}
-void wxSlider95::SetValue(const int value)
+void wxSlider95::SetValue(int value)
{
::SendMessage((HWND) GetHWND(), TBM_SETPOS, (WPARAM)TRUE, (LPARAM)value);
if (m_staticValue)
if (parent)
::ScreenToClient((HWND) parent->GetHWND(), &point);
+ // We may be faking the client origin.
+ // So a window that's really at (0, 30) may appear
+ // (to wxWin apps) to be at (0, 0).
+ if (GetParent())
+ {
+ wxPoint pt(GetParent()->GetClientAreaOrigin());
+ point.x -= pt.x;
+ point.y -= pt.y;
+ }
*x = point.x;
*y = point.y;
}
-void wxSlider95::SetSize(const int x, const int y, const int width, const int height, const int sizeFlags)
+void wxSlider95::DoSetSize(int x, int y, int width, int height, int sizeFlags)
{
int x1 = x;
int y1 = y;
if (y == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
y1 = currentY;
+ AdjustForParentClientOrigin(x1, y1, sizeFlags);
+
char buf[300];
int x_offset = x;
int cx; // slider,min,max sizes
int cy;
- float cyf;
+ int cyf;
- wxGetCharSize(GetHWND(), &cx, &cy,GetFont());
+ wxGetCharSize(GetHWND(), &cx, &cy, & this->GetFont());
if ((m_windowStyle & wxSL_VERTICAL) != wxSL_VERTICAL)
{
if ( m_windowStyle & wxSL_LABELS )
{
- float min_len = 0.0;
+ int min_len = 0;
GetWindowText((HWND) m_staticMin, buf, 300);
- GetTextExtent(buf, &min_len, &cyf,NULL,NULL, GetFont());
+ GetTextExtent(buf, &min_len, &cyf,NULL,NULL, & this->GetFont());
- float max_len = 0.0;
+ int max_len = 0;
GetWindowText((HWND) m_staticMax, buf, 300);
- GetTextExtent(buf, &max_len, &cyf,NULL,NULL, GetFont());
+ GetTextExtent(buf, &max_len, &cyf,NULL,NULL, & this->GetFont());
if (m_staticValue)
{
int new_width = (int)(wxMax(min_len, max_len));
else
{
// No labels
+ // If we're prepared to use the existing size, then...
+ if (width == -1 && height == -1 && ((sizeFlags & wxSIZE_AUTO) != wxSIZE_AUTO))
+ {
+ GetSize(&w1, &h1);
+ }
if ( w1 < 0 )
w1 = 200;
if ( h1 < 0 )
{
if ( m_windowStyle & wxSL_LABELS )
{
- float min_len;
+ int min_len;
GetWindowText((HWND) m_staticMin, buf, 300);
- GetTextExtent(buf, &min_len, &cyf,NULL,NULL,GetFont());
+ GetTextExtent(buf, &min_len, &cyf,NULL,NULL, & this->GetFont());
- float max_len;
+ int max_len;
GetWindowText((HWND) m_staticMax, buf, 300);
- GetTextExtent(buf, &max_len, &cyf,NULL,NULL, GetFont());
+ GetTextExtent(buf, &max_len, &cyf,NULL,NULL, & this->GetFont());
if (m_staticValue)
{
else
{
// No labels
+ // If we're prepared to use the existing size, then...
+ if (width == -1 && height == -1 && ((sizeFlags & wxSIZE_AUTO) != wxSIZE_AUTO))
+ {
+ GetSize(&w1, &h1);
+ }
if ( w1 < 0 )
w1 = 20;
if ( h1 < 0 )
}
}
-void wxSlider95::SetRange(const int minValue, const int maxValue)
+void wxSlider95::SetRange(int minValue, int maxValue)
{
m_rangeMin = minValue;
m_rangeMax = maxValue;
}
}
-WXHBRUSH wxSlider95::OnCtlColor(const WXHDC pDC, const WXHWND pWnd, const WXUINT nCtlColor,
+WXHBRUSH wxSlider95::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
{
if ( nCtlColor == CTLCOLOR_SCROLLBAR )
}
// For trackbars only
-void wxSlider95::SetTickFreq(const int n, const int pos)
+void wxSlider95::SetTickFreq(int n, int pos)
{
m_tickFreq = n;
::SendMessage( (HWND) GetHWND(), TBM_SETTICFREQ, (WPARAM) n, (LPARAM) pos );
}
-void wxSlider95::SetPageSize(const int pageSize)
+void wxSlider95::SetPageSize(int pageSize)
{
::SendMessage( (HWND) GetHWND(), TBM_SETPAGESIZE, (WPARAM) 0, (LPARAM) pageSize );
m_pageSize = pageSize;
}
-int wxSlider95::GetPageSize(void) const
+int wxSlider95::GetPageSize() const
{
return m_pageSize;
}
-void wxSlider95::ClearSel(void)
+void wxSlider95::ClearSel()
{
::SendMessage( (HWND) GetHWND(), TBM_CLEARSEL, (WPARAM) TRUE, (LPARAM) 0 );
}
-void wxSlider95::ClearTicks(void)
+void wxSlider95::ClearTicks()
{
::SendMessage( (HWND) GetHWND(), TBM_CLEARTICS, (WPARAM) TRUE, (LPARAM) 0 );
}
-void wxSlider95::SetLineSize(const int lineSize)
+void wxSlider95::SetLineSize(int lineSize)
{
m_lineSize = lineSize;
::SendMessage( (HWND) GetHWND(), TBM_SETLINESIZE, (WPARAM) 0, (LPARAM) lineSize );
}
-int wxSlider95::GetLineSize(void) const
+int wxSlider95::GetLineSize() const
{
return (int) ::SendMessage( (HWND) GetHWND(), TBM_GETLINESIZE, (WPARAM) 0, (LPARAM) 0 );
}
-int wxSlider95::GetSelEnd(void) const
+int wxSlider95::GetSelEnd() const
{
return (int) ::SendMessage( (HWND) GetHWND(), TBM_SETSELEND, (WPARAM) 0, (LPARAM) 0 );
}
-int wxSlider95::GetSelStart(void) const
+int wxSlider95::GetSelStart() const
{
return (int) ::SendMessage( (HWND) GetHWND(), TBM_GETSELSTART, (WPARAM) 0, (LPARAM) 0 );
}
-void wxSlider95::SetSelection(const int minPos, const int maxPos)
+void wxSlider95::SetSelection(int minPos, int maxPos)
{
::SendMessage( (HWND) GetHWND(), TBM_SETSEL, (WPARAM) TRUE, (LPARAM) MAKELONG( minPos, maxPos) );
}
-void wxSlider95::SetThumbLength(const int len)
+void wxSlider95::SetThumbLength(int len)
{
::SendMessage( (HWND) GetHWND(), TBM_SETTHUMBLENGTH, (WPARAM) len, (LPARAM) 0 );
}
-int wxSlider95::GetThumbLength(void) const
+int wxSlider95::GetThumbLength() const
{
return (int) ::SendMessage( (HWND) GetHWND(), TBM_GETTHUMBLENGTH, (WPARAM) 0, (LPARAM) 0 );
}
-void wxSlider95::SetTick(const int tickPos)
+void wxSlider95::SetTick(int tickPos)
{
::SendMessage( (HWND) GetHWND(), TBM_SETTIC, (WPARAM) 0, (LPARAM) tickPos );
}
return ( hWnd == GetStaticMin() || hWnd == GetStaticMax() || hWnd == GetEditValue() );
}
-#if WXWIN_COMPATIBILITY
-// Backward compatibility
-void wxSlider95::OnScroll(wxScrollEvent& event)
-{
- wxEventType oldEvent = event.GetEventType();
- event.SetEventType( wxEVT_COMMAND_SLIDER_UPDATED );
- if ( !GetEventHandler()->ProcessEvent(event) )
- {
- event.SetEventType( oldEvent );
- if (!GetParent()->GetEventHandler()->ProcessEvent(event))
- event.Skip();
- }
-}
-#endif
-
void wxSlider95::Command (wxCommandEvent & event)
{
SetValue (event.GetInt());
ProcessCommand (event);
}
-bool wxSlider95::Show(const bool show)
+bool wxSlider95::Show(bool show)
{
wxWindow::Show(show);
projects / wxWidgets.git / blobdiff