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

Allow forward declaration of wxSlider in wxMSW (bug 1157614). Remove unused header from wxSliderMSW.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32672 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-03-08 10:44:38 +00:00
parent 7e4fb3b816
commit 7d0d80bd1c
10 changed files with 92 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.in
View File

@@ -1799,7 +1799,6 @@ COND_TOOLKIT_MSW_GUI_HDR = \
wx/msw/scrolbar.h \ wx/msw/scrolbar.h \
wx/msw/setup0.h \ wx/msw/setup0.h \
wx/msw/slider95.h \ wx/msw/slider95.h \
wx/msw/slidrmsw.h \
wx/msw/spinbutt.h \ wx/msw/spinbutt.h \
wx/msw/spinctrl.h \ wx/msw/spinctrl.h \
wx/msw/statbmp.h \ wx/msw/statbmp.h \
@@ -2004,7 +2003,6 @@ COND_TOOLKIT_WINCE_GUI_HDR = \
wx/msw/scrolbar.h \ wx/msw/scrolbar.h \
wx/msw/setup0.h \ wx/msw/setup0.h \
wx/msw/slider95.h \ wx/msw/slider95.h \
wx/msw/slidrmsw.h \
wx/msw/spinbutt.h \ wx/msw/spinbutt.h \
wx/msw/spinctrl.h \ wx/msw/spinctrl.h \
wx/msw/statbmp.h \ wx/msw/statbmp.h \

1
build/bakefiles/files.bkl
View File

@@ -1368,7 +1368,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/msw/scrolbar.h wx/msw/scrolbar.h
wx/msw/setup0.h wx/msw/setup0.h
wx/msw/slider95.h wx/msw/slider95.h
wx/msw/slidrmsw.h
wx/msw/spinbutt.h wx/msw/spinbutt.h
wx/msw/spinctrl.h wx/msw/spinctrl.h
wx/msw/statbmp.h wx/msw/statbmp.h

9
build/msw/wx_core.dsp
View File

@@ -2017,7 +2017,6 @@ SOURCE=..\..\src\msw\gdiobj.cpp
# Begin Source File # Begin Source File
SOURCE=..\..\src\msw\gsockmsw.cpp SOURCE=..\..\src\msw\gsockmsw.cpp
# SUBTRACT CPP /YX /Yc /Yu
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -7602,10 +7601,6 @@ SOURCE=..\..\include\wx\msw\slider95.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\msw\slidrmsw.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\msw\sound.h SOURCE=..\..\include\wx\msw\sound.h
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -8010,10 +8005,6 @@ SOURCE=..\..\include\wx\univ\window.h
# PROP Default_Filter "" # PROP Default_Filter ""
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\html\forcelnk.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\html\helpctrl.h SOURCE=..\..\include\wx\html\helpctrl.h
# End Source File # End Source File
# Begin Source File # Begin Source File

1
distrib/msw/tmake/filelist.txt
View File

@@ -1430,7 +1430,6 @@ registry.h MSWH
scrolbar.h MSWH scrolbar.h MSWH
setup0.h MSWH setup0.h MSWH
slider95.h MSWH slider95.h MSWH
slidrmsw.h MSWH
spinctrl.h MSWH spinctrl.h MSWH
spinbutt.h MSWH spinbutt.h MSWH
statbmp.h MSWH statbmp.h MSWH

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

@@ -1,6 +1,6 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: wx/msw/slider95.h // Name: wx/msw/slider95.h
// Purpose: wxSlider95 class // Purpose: wxSlider class, using the Win95 (and later) trackbar control
// Author: Julian Smart // Author: Julian Smart
// Modified by: // Modified by:
// Created: 01/02/97 // Created: 01/02/97
@@ -19,12 +19,12 @@
class WXDLLEXPORT wxSubwindows; class WXDLLEXPORT wxSubwindows;
// Slider // Slider
class WXDLLEXPORT wxSlider95 : public wxSliderBase class WXDLLEXPORT wxSlider : public wxSliderBase
{ {
public: public:
wxSlider95() { Init(); } wxSlider() { Init(); }
wxSlider95(wxWindow *parent, wxSlider(wxWindow *parent,
wxWindowID id, wxWindowID id,
int value, int value,
int minValue, int minValue,
@@ -51,7 +51,7 @@ public:
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxSliderNameStr); const wxString& name = wxSliderNameStr);
virtual ~wxSlider95(); virtual ~wxSlider();
// slider methods // slider methods
virtual int GetValue() const; virtual int GetValue() const;
@@ -127,7 +127,7 @@ protected:
int m_tickFreq; int m_tickFreq;
DECLARE_DYNAMIC_CLASS_NO_COPY(wxSlider95) DECLARE_DYNAMIC_CLASS_NO_COPY(wxSlider)
}; };
#endif // _WX_SLIDER95_H_ #endif // _WX_SLIDER95_H_

96
include/wx/msw/slidrmsw.h
View File

@@ -1,96 +0,0 @@
/////////////////////////////////////////////////////////////////////////////
// Name: wx/msw/slidrmsw.h
// Purpose: wxSliderMSW class
// Author: Julian Smart
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _SLIDRMSW_H_
#define _SLIDRMSW_H_
#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma interface "slidrmsw.h"
#endif
// Slider
class WXDLLEXPORT wxSliderMSW : public wxSliderBase
{
public:
wxSliderMSW();
wxSliderMSW(wxWindow *parent, wxWindowID id,
int value, int minValue, int maxValue,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxSL_HORIZONTAL,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxSliderNameStr)
{
Create(parent, id, value, minValue, maxValue, pos, size, style, validator, name);
}
~wxSliderMSW();
bool Create(wxWindow *parent, wxWindowID id,
int value, int minValue, int maxValue,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxSL_HORIZONTAL,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxSliderNameStr);
virtual int GetValue() const;
virtual void SetValue(int);
void GetSize(int *x, int *y) const;
void GetPosition(int *x, int *y) const;
bool Show(bool show);
void SetRange(int minValue, int maxValue);
int GetMin() const { return m_rangeMin; }
int GetMax() const { return m_rangeMax; }
// For trackbars only
void SetPageSize(int pageSize);
int GetPageSize() const;
void SetLineSize(int lineSize);
int GetLineSize() const;
// these methods get/set the length of the slider pointer in pixels
virtual void SetThumbLength(int lenPixels);
virtual int GetThumbLength() const ;
// IMPLEMENTATION
WXHWND GetStaticMin() const { return m_staticMin; }
WXHWND GetStaticMax() const { return m_staticMax; }
WXHWND GetEditValue() const { return m_staticValue; }
virtual bool ContainsHWND(WXHWND hWnd) const;
void Command(wxCommandEvent& event);
virtual bool MSWOnScroll(int orientation, WXWORD wParam,
WXWORD pos, WXHWND control);
protected:
WXHWND m_staticMin;
WXHWND m_staticMax;
WXHWND m_staticValue;
int m_rangeMin;
int m_rangeMax;
int m_pageSize;
int m_lineSize;
virtual void DoSetSize(int x, int y,
int width, int height,
int sizeFlags = wxSIZE_AUTO);
DECLARE_DYNAMIC_CLASS(wxSliderMSW)
};
#endif
// _SLIDRMSW_H_

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

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: wx/palmos/slider95.h // Name: wx/palmos/slider.h
// Purpose: wxSlider class // Purpose: wxSlider class
// Author: William Osborne - minimal working wxPalmOS port // Author: William Osborne - minimal working wxPalmOS port
// Modified by: Wlodzimierz ABX Skiba - native implementation // Modified by: Wlodzimierz ABX Skiba - native implementation
@@ -9,11 +9,11 @@
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifndef _SLIDER95_H_ #ifndef _SLIDERPALM_H_
#define _SLIDER95_H_ #define _SLIDERPALM_H_
#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma interface "slider95.h" #pragma interface "slider.h"
#endif #endif
// Slider // Slider
@@ -94,4 +94,4 @@ private:
}; };
#endif #endif
// _SLIDER95_H_ // _SLIDERPALM_H_

4
include/wx/slider.h
View File

@@ -106,7 +106,9 @@ private:
#include "wx/univ/slider.h" #include "wx/univ/slider.h"
#elif defined(__WXMSW__) #elif defined(__WXMSW__)
#include "wx/msw/slider95.h" #include "wx/msw/slider95.h"
#define wxSlider wxSlider95 #if WXWIN_COMPATIBILITY_2_4
#define wxSlider95 wxSlider
#endif
#elif defined(__WXMOTIF__) #elif defined(__WXMOTIF__)
#include "wx/motif/slider.h" #include "wx/motif/slider.h"
#elif defined(__WXGTK__) #elif defined(__WXGTK__)

82
src/msw/slider95.cpp
View File

@@ -1,6 +1,6 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: msw/slider95.cpp // Name: msw/slider.cpp
// Purpose: wxSlider95, using the Win95 trackbar control // Purpose: wxSlider, using the Win95 (and later) trackbar control
// Author: Julian Smart // Author: Julian Smart
// Modified by: // Modified by:
// Created: 04/01/98 // Created: 04/01/98
@@ -46,7 +46,7 @@
// constants // constants
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// indices of labels in wxSlider95::m_labels // indices of labels in wxSlider::m_labels
enum enum
{ {
SliderLabel_Min, SliderLabel_Min,
@@ -107,9 +107,9 @@ wxBEGIN_FLAGS( wxSliderStyle )
wxEND_FLAGS( wxSliderStyle ) wxEND_FLAGS( wxSliderStyle )
IMPLEMENT_DYNAMIC_CLASS_XTI(wxSlider95, wxControl,"wx/scrolbar.h") IMPLEMENT_DYNAMIC_CLASS_XTI(wxSlider, wxControl,"wx/scrolbar.h")
wxBEGIN_PROPERTIES_TABLE(wxSlider95) wxBEGIN_PROPERTIES_TABLE(wxSlider)
wxEVENT_RANGE_PROPERTY( Scroll , wxEVT_SCROLL_TOP , wxEVT_SCROLL_ENDSCROLL , wxScrollEvent ) wxEVENT_RANGE_PROPERTY( Scroll , wxEVT_SCROLL_TOP , wxEVT_SCROLL_ENDSCROLL , wxScrollEvent )
wxEVENT_PROPERTY( Updated , wxEVT_COMMAND_SLIDER_UPDATED , wxCommandEvent ) wxEVENT_PROPERTY( Updated , wxEVT_COMMAND_SLIDER_UPDATED , wxCommandEvent )
@@ -122,23 +122,23 @@ wxBEGIN_PROPERTIES_TABLE(wxSlider95)
wxPROPERTY_FLAGS( WindowStyle , wxSliderStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style wxPROPERTY_FLAGS( WindowStyle , wxSliderStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
wxEND_PROPERTIES_TABLE() wxEND_PROPERTIES_TABLE()
wxBEGIN_HANDLERS_TABLE(wxSlider95) wxBEGIN_HANDLERS_TABLE(wxSlider)
wxEND_HANDLERS_TABLE() wxEND_HANDLERS_TABLE()
wxCONSTRUCTOR_8( wxSlider95 , wxWindow* , Parent , wxWindowID , Id , int , Value , int , Minimum , int , Maximum , wxPoint , Position , wxSize , Size , long , WindowStyle ) wxCONSTRUCTOR_8( wxSlider , wxWindow* , Parent , wxWindowID , Id , int , Value , int , Minimum , int , Maximum , wxPoint , Position , wxSize , Size , long , WindowStyle )
#else #else
IMPLEMENT_DYNAMIC_CLASS(wxSlider95, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxSlider, wxControl)
#endif #endif
// ============================================================================ // ============================================================================
// wxSlider95 implementation // wxSlider implementation
// ============================================================================ // ============================================================================
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// construction // construction
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
void wxSlider95::Init() void wxSlider::Init()
{ {
m_labels = NULL; m_labels = NULL;
@@ -150,7 +150,7 @@ void wxSlider95::Init()
} }
bool bool
wxSlider95::Create(wxWindow *parent, wxSlider::Create(wxWindow *parent,
wxWindowID id, wxWindowID id,
int value, int value,
int minValue, int minValue,
@@ -219,7 +219,7 @@ wxSlider95::Create(wxWindow *parent,
return true; return true;
} }
WXDWORD wxSlider95::MSWGetStyle(long style, WXDWORD *exstyle) const WXDWORD wxSlider::MSWGetStyle(long style, WXDWORD *exstyle) const
{ {
WXDWORD msStyle = wxControl::MSWGetStyle(style, exstyle); WXDWORD msStyle = wxControl::MSWGetStyle(style, exstyle);
@@ -249,7 +249,7 @@ WXDWORD wxSlider95::MSWGetStyle(long style, WXDWORD *exstyle) const
return msStyle; return msStyle;
} }
wxSlider95::~wxSlider95() wxSlider::~wxSlider()
{ {
delete m_labels; delete m_labels;
} }
@@ -258,7 +258,7 @@ wxSlider95::~wxSlider95()
// event handling // event handling
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
bool wxSlider95::MSWOnScroll(int WXUNUSED(orientation), bool wxSlider::MSWOnScroll(int WXUNUSED(orientation),
WXWORD wParam, WXWORD wParam,
WXWORD WXUNUSED(pos), WXWORD WXUNUSED(pos),
WXHWND control) WXHWND control)
@@ -328,7 +328,7 @@ bool wxSlider95::MSWOnScroll(int WXUNUSED(orientation),
return GetEventHandler()->ProcessEvent( cevent ); return GetEventHandler()->ProcessEvent( cevent );
} }
void wxSlider95::Command (wxCommandEvent & event) void wxSlider::Command (wxCommandEvent & event)
{ {
SetValue (event.GetInt()); SetValue (event.GetInt());
ProcessCommand (event); ProcessCommand (event);
@@ -338,7 +338,7 @@ void wxSlider95::Command (wxCommandEvent & event)
// geometry stuff // geometry stuff
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
wxRect wxSlider95::GetBoundingBox() const wxRect wxSlider::GetBoundingBox() const
{ {
// take care not to call our own functions which would call us recursively // take care not to call our own functions which would call us recursively
int x, y, w, h; int x, y, w, h;
@@ -356,7 +356,7 @@ wxRect wxSlider95::GetBoundingBox() const
return rect; return rect;
} }
void wxSlider95::DoGetSize(int *width, int *height) const void wxSlider::DoGetSize(int *width, int *height) const
{ {
wxRect rect = GetBoundingBox(); wxRect rect = GetBoundingBox();
@@ -366,7 +366,7 @@ void wxSlider95::DoGetSize(int *width, int *height) const
*height = rect.height; *height = rect.height;
} }
void wxSlider95::DoGetPosition(int *x, int *y) const void wxSlider::DoGetPosition(int *x, int *y) const
{ {
wxRect rect = GetBoundingBox(); wxRect rect = GetBoundingBox();
@@ -376,7 +376,7 @@ void wxSlider95::DoGetPosition(int *x, int *y) const
*y = rect.y; *y = rect.y;
} }
int wxSlider95::GetLabelsSize(int *width) const int wxSlider::GetLabelsSize(int *width) const
{ {
int cy; int cy;
@@ -397,7 +397,7 @@ int wxSlider95::GetLabelsSize(int *width) const
return EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy); return EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy);
} }
void wxSlider95::DoMoveWindow(int x, int y, int width, int height) void wxSlider::DoMoveWindow(int x, int y, int width, int height)
{ {
// all complications below are because we need to position the labels, // all complications below are because we need to position the labels,
// without them everything is easy // without them everything is easy
@@ -464,7 +464,7 @@ void wxSlider95::DoMoveWindow(int x, int y, int width, int height)
} }
} }
wxSize wxSlider95::DoGetBestSize() const wxSize wxSlider::DoGetBestSize() const
{ {
// these values are arbitrary // these values are arbitrary
static const int length = 100; static const int length = 100;
@@ -507,12 +507,12 @@ wxSize wxSlider95::DoGetBestSize() const
// slider-specific methods // slider-specific methods
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
int wxSlider95::GetValue() const int wxSlider::GetValue() const
{ {
return ValueInvertOrNot(::SendMessage(GetHwnd(), TBM_GETPOS, 0, 0)); return ValueInvertOrNot(::SendMessage(GetHwnd(), TBM_GETPOS, 0, 0));
} }
void wxSlider95::SetValue(int value) void wxSlider::SetValue(int value)
{ {
::SendMessage(GetHwnd(), TBM_SETPOS, (WPARAM)TRUE, (LPARAM)ValueInvertOrNot(value)); ::SendMessage(GetHwnd(), TBM_SETPOS, (WPARAM)TRUE, (LPARAM)ValueInvertOrNot(value));
@@ -522,7 +522,7 @@ void wxSlider95::SetValue(int value)
} }
} }
void wxSlider95::SetRange(int minValue, int maxValue) void wxSlider::SetRange(int minValue, int maxValue)
{ {
m_rangeMin = minValue; m_rangeMin = minValue;
m_rangeMax = maxValue; m_rangeMax = maxValue;
@@ -536,72 +536,72 @@ void wxSlider95::SetRange(int minValue, int maxValue)
} }
} }
void wxSlider95::SetTickFreq(int n, int pos) void wxSlider::SetTickFreq(int n, int pos)
{ {
m_tickFreq = n; m_tickFreq = n;
::SendMessage( GetHwnd(), TBM_SETTICFREQ, (WPARAM) n, (LPARAM) pos ); ::SendMessage( GetHwnd(), TBM_SETTICFREQ, (WPARAM) n, (LPARAM) pos );
} }
void wxSlider95::SetPageSize(int pageSize) void wxSlider::SetPageSize(int pageSize)
{ {
::SendMessage( GetHwnd(), TBM_SETPAGESIZE, (WPARAM) 0, (LPARAM) pageSize ); ::SendMessage( GetHwnd(), TBM_SETPAGESIZE, (WPARAM) 0, (LPARAM) pageSize );
m_pageSize = pageSize; m_pageSize = pageSize;
} }
int wxSlider95::GetPageSize() const int wxSlider::GetPageSize() const
{ {
return m_pageSize; return m_pageSize;
} }
void wxSlider95::ClearSel() void wxSlider::ClearSel()
{ {
::SendMessage(GetHwnd(), TBM_CLEARSEL, (WPARAM) TRUE, (LPARAM) 0); ::SendMessage(GetHwnd(), TBM_CLEARSEL, (WPARAM) TRUE, (LPARAM) 0);
} }
void wxSlider95::ClearTicks() void wxSlider::ClearTicks()
{ {
::SendMessage(GetHwnd(), TBM_CLEARTICS, (WPARAM) TRUE, (LPARAM) 0); ::SendMessage(GetHwnd(), TBM_CLEARTICS, (WPARAM) TRUE, (LPARAM) 0);
} }
void wxSlider95::SetLineSize(int lineSize) void wxSlider::SetLineSize(int lineSize)
{ {
m_lineSize = lineSize; m_lineSize = lineSize;
::SendMessage(GetHwnd(), TBM_SETLINESIZE, (WPARAM) 0, (LPARAM) lineSize); ::SendMessage(GetHwnd(), TBM_SETLINESIZE, (WPARAM) 0, (LPARAM) lineSize);
} }
int wxSlider95::GetLineSize() const int wxSlider::GetLineSize() const
{ {
return (int)::SendMessage(GetHwnd(), TBM_GETLINESIZE, 0, 0); return (int)::SendMessage(GetHwnd(), TBM_GETLINESIZE, 0, 0);
} }
int wxSlider95::GetSelEnd() const int wxSlider::GetSelEnd() const
{ {
return (int)::SendMessage(GetHwnd(), TBM_SETSELEND, 0, 0); return (int)::SendMessage(GetHwnd(), TBM_SETSELEND, 0, 0);
} }
int wxSlider95::GetSelStart() const int wxSlider::GetSelStart() const
{ {
return (int)::SendMessage(GetHwnd(), TBM_GETSELSTART, 0, 0); return (int)::SendMessage(GetHwnd(), TBM_GETSELSTART, 0, 0);
} }
void wxSlider95::SetSelection(int minPos, int maxPos) void wxSlider::SetSelection(int minPos, int maxPos)
{ {
::SendMessage(GetHwnd(), TBM_SETSEL, ::SendMessage(GetHwnd(), TBM_SETSEL,
(WPARAM) TRUE /* redraw */, (WPARAM) TRUE /* redraw */,
(LPARAM) MAKELONG( minPos, maxPos) ); (LPARAM) MAKELONG( minPos, maxPos) );
} }
void wxSlider95::SetThumbLength(int len) void wxSlider::SetThumbLength(int len)
{ {
::SendMessage(GetHwnd(), TBM_SETTHUMBLENGTH, (WPARAM) len, (LPARAM) 0); ::SendMessage(GetHwnd(), TBM_SETTHUMBLENGTH, (WPARAM) len, (LPARAM) 0);
} }
int wxSlider95::GetThumbLength() const int wxSlider::GetThumbLength() const
{ {
return (int)::SendMessage( GetHwnd(), TBM_GETTHUMBLENGTH, 0, 0); return (int)::SendMessage( GetHwnd(), TBM_GETTHUMBLENGTH, 0, 0);
} }
void wxSlider95::SetTick(int tickPos) void wxSlider::SetTick(int tickPos)
{ {
::SendMessage( GetHwnd(), TBM_SETTIC, (WPARAM) 0, (LPARAM) tickPos ); ::SendMessage( GetHwnd(), TBM_SETTIC, (WPARAM) 0, (LPARAM) tickPos );
} }
@@ -610,21 +610,21 @@ void wxSlider95::SetTick(int tickPos)
// composite control methods // composite control methods
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
WXHWND wxSlider95::GetStaticMin() const WXHWND wxSlider::GetStaticMin() const
{ {
return m_labels ? (WXHWND)(*m_labels)[SliderLabel_Min] : NULL; return m_labels ? (WXHWND)(*m_labels)[SliderLabel_Min] : NULL;
} }
WXHWND wxSlider95::GetStaticMax() const WXHWND wxSlider::GetStaticMax() const
{ {
return m_labels ? (WXHWND)(*m_labels)[SliderLabel_Max] : NULL; return m_labels ? (WXHWND)(*m_labels)[SliderLabel_Max] : NULL;
} }
WXHWND wxSlider95::GetEditValue() const WXHWND wxSlider::GetEditValue() const
{ {
return m_labels ? (WXHWND)(*m_labels)[SliderLabel_Value] : NULL; return m_labels ? (WXHWND)(*m_labels)[SliderLabel_Value] : NULL;
} }
WX_FORWARD_STD_METHODS_TO_SUBWINDOWS(wxSlider95, wxSliderBase, m_labels) WX_FORWARD_STD_METHODS_TO_SUBWINDOWS(wxSlider, wxSliderBase, m_labels)
#endif // wxUSE_SLIDER #endif // wxUSE_SLIDER

20
src/wxWindows.dsp
View File

@@ -1655,6 +1655,10 @@ SOURCE=.\xrc\xh_choic.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\xrc\xh_choicbk.cpp
# End Source File
# Begin Source File
SOURCE=.\xrc\xh_combo.cpp SOURCE=.\xrc\xh_combo.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -1687,6 +1691,10 @@ SOURCE=.\xrc\xh_listb.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\xrc\xh_listbk.cpp
# End Source File
# Begin Source File
SOURCE=.\xrc\xh_listc.cpp SOURCE=.\xrc\xh_listc.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -3027,6 +3035,10 @@ SOURCE=..\include\wx\xrc\xh_choic.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\include\wx\xrc\xh_choicbk.h
# End Source File
# Begin Source File
SOURCE=..\include\wx\xrc\xh_combo.h SOURCE=..\include\wx\xrc\xh_combo.h
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -3059,6 +3071,10 @@ SOURCE=..\include\wx\xrc\xh_listb.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\include\wx\xrc\xh_listbk.h
# End Source File
# Begin Source File
SOURCE=..\include\wx\xrc\xh_listc.h SOURCE=..\include\wx\xrc\xh_listc.h
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -3523,10 +3539,6 @@ SOURCE=..\include\wx\msw\slider95.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\include\wx\msw\slidrmsw.h
# End Source File
# Begin Source File
SOURCE=..\include\wx\msw\sound.h SOURCE=..\include\wx\msw\sound.h
# End Source File # End Source File
# Begin Source File # Begin Source File