Separated out Win95 versions of gauge, slider; added wxTabCtrl::GetCurFocus
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@153 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
@@ -1,6 +1,6 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Name: gauge.h
|
||||
// Purpose: wxGauge class
|
||||
// Purpose: wxGauge header, includes gauge class headers as appropriate
|
||||
// Author: Julian Smart
|
||||
// Modified by:
|
||||
// Created: 01/02/97
|
||||
@@ -16,66 +16,15 @@
|
||||
#pragma interface "gauge.h"
|
||||
#endif
|
||||
|
||||
#include "wx/control.h"
|
||||
|
||||
WXDLLEXPORT_DATA(extern const char*) wxGaugeNameStr;
|
||||
|
||||
// Group box
|
||||
class WXDLLEXPORT wxGauge: public wxControl
|
||||
{
|
||||
DECLARE_DYNAMIC_CLASS(wxGauge)
|
||||
public:
|
||||
inline wxGauge(void) { m_rangeMax = 0; m_gaugePos = 0; m_useProgressBar = FALSE; }
|
||||
|
||||
inline wxGauge(wxWindow *parent, const wxWindowID id,
|
||||
const int range,
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
const wxSize& size = wxDefaultSize,
|
||||
const long style = wxGA_HORIZONTAL,
|
||||
const wxValidator& validator = wxDefaultValidator,
|
||||
const wxString& name = wxGaugeNameStr)
|
||||
{
|
||||
Create(parent, id, range, pos, size, style, validator, name);
|
||||
}
|
||||
|
||||
bool Create(wxWindow *parent, const wxWindowID id,
|
||||
const int range,
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
const wxSize& size = wxDefaultSize,
|
||||
const long style = wxGA_HORIZONTAL,
|
||||
const wxValidator& validator = wxDefaultValidator,
|
||||
const wxString& name = wxGaugeNameStr);
|
||||
|
||||
void SetShadowWidth(const int w);
|
||||
void SetBezelFace(const int w);
|
||||
void SetRange(const int r);
|
||||
void SetValue(const int pos);
|
||||
|
||||
int GetShadowWidth(void) const ;
|
||||
int GetBezelFace(void) const ;
|
||||
int GetRange(void) const ;
|
||||
int GetValue(void) const ;
|
||||
|
||||
void SetForegroundColour(const wxColour& col);
|
||||
void SetBackgroundColour(const wxColour& col);
|
||||
|
||||
// Backward compatibility
|
||||
#if WXWIN_COMPATIBILITY
|
||||
inline void SetButtonColour(const wxColour& col) { SetForegroundColour(col); }
|
||||
#ifdef __WIN95__
|
||||
#include "wx/msw/gauge95.h"
|
||||
#define wxGauge wxGauge95
|
||||
#define classwxGauge classwxGauge95
|
||||
#else
|
||||
#include "wx/msw/gaugemsw.h
|
||||
#define wxGauge wxGaugeMSW
|
||||
#define classwxGauge classwxGaugeMSW
|
||||
#endif
|
||||
|
||||
void SetSize(const int x, const int y, const int width, const int height, const int sizeFlags = wxSIZE_AUTO);
|
||||
|
||||
// Are we a Win95 progress bar, or a normal gauge?
|
||||
inline bool GetProgressBar(void) const { return m_useProgressBar; }
|
||||
|
||||
virtual void Command(wxCommandEvent& WXUNUSED(event)) {} ;
|
||||
|
||||
protected:
|
||||
int m_rangeMax;
|
||||
int m_gaugePos;
|
||||
bool m_useProgressBar;
|
||||
};
|
||||
|
||||
#endif
|
||||
// __GAUGEH__
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Name: slider.h
|
||||
// Purpose: wxSlider class
|
||||
// Purpose: wxSlider header, includes slider class headers as appropriate
|
||||
// Author: Julian Smart
|
||||
// Modified by:
|
||||
// Created: 01/02/97
|
||||
@@ -9,102 +9,22 @@
|
||||
// Licence: wxWindows license
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef __SLIDERH__
|
||||
#define __SLIDERH__
|
||||
#ifndef _SLIDER_H_
|
||||
#define _SLIDER_H_
|
||||
|
||||
#ifdef __GNUG__
|
||||
#pragma interface "slider.h"
|
||||
#endif
|
||||
|
||||
#include "wx/control.h"
|
||||
|
||||
WXDLLEXPORT_DATA(extern const char*) wxSliderNameStr;
|
||||
|
||||
// Slider
|
||||
class WXDLLEXPORT wxSlider: public wxControl
|
||||
{
|
||||
DECLARE_DYNAMIC_CLASS(wxSlider)
|
||||
|
||||
public:
|
||||
wxSlider(void);
|
||||
|
||||
inline wxSlider(wxWindow *parent, const wxWindowID id,
|
||||
const int value, const int minValue, const int maxValue,
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
const wxSize& size = wxDefaultSize,
|
||||
const long style = wxSL_HORIZONTAL,
|
||||
const wxValidator& validator = wxDefaultValidator,
|
||||
const wxString& name = wxSliderNameStr)
|
||||
{
|
||||
Create(parent, id, value, minValue, maxValue, pos, size, style, validator, name);
|
||||
}
|
||||
|
||||
~wxSlider(void);
|
||||
|
||||
bool Create(wxWindow *parent, const wxWindowID id,
|
||||
const int value, const int minValue, const int maxValue,
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
const wxSize& size = wxDefaultSize,
|
||||
const long style = wxSL_HORIZONTAL,
|
||||
const wxValidator& validator = wxDefaultValidator,
|
||||
const wxString& name = wxSliderNameStr);
|
||||
|
||||
virtual int GetValue(void) const ;
|
||||
virtual void SetValue(const int);
|
||||
void GetSize(int *x, int *y) const ;
|
||||
void SetSize(const int x, const int y, const int width, const int height, const int sizeFlags = wxSIZE_AUTO);
|
||||
void GetPosition(int *x, int *y) const ;
|
||||
bool Show(const bool show);
|
||||
|
||||
void SetRange(const int minValue, const int maxValue);
|
||||
|
||||
inline int GetMin(void) const { return m_rangeMin; }
|
||||
inline int GetMax(void) const { return m_rangeMax; }
|
||||
|
||||
// For trackbars only
|
||||
void SetTickFreq(const int n, const int pos);
|
||||
inline int GetTickFreq(void) const { return m_tickFreq; }
|
||||
void SetPageSize(const int pageSize);
|
||||
int GetPageSize(void) const ;
|
||||
void ClearSel(void) ;
|
||||
void ClearTicks(void) ;
|
||||
void SetLineSize(const int lineSize);
|
||||
int GetLineSize(void) const ;
|
||||
int GetSelEnd(void) const ;
|
||||
int GetSelStart(void) const ;
|
||||
void SetSelection(const int minPos, const int maxPos);
|
||||
void SetThumbLength(const int len) ;
|
||||
int GetThumbLength(void) const ;
|
||||
void SetTick(const int tickPos) ;
|
||||
|
||||
// IMPLEMENTATION
|
||||
inline WXHWND GetStaticMin() const { return m_staticMin; }
|
||||
inline WXHWND GetStaticMax() const { return m_staticMax; }
|
||||
inline WXHWND GetEditValue() const { return m_staticValue; }
|
||||
virtual bool ContainsHWND(WXHWND hWnd) const;
|
||||
|
||||
// Backward compatibility: translate to familiar wxEVT_COMMAND_SLIDER_UPDATED
|
||||
#if WXWIN_COMPATIBILITY
|
||||
void OnScroll(wxScrollEvent& event);
|
||||
#ifdef __WIN95__
|
||||
#include "wx/msw/slider95.h"
|
||||
#define wxSlider wxSlider95
|
||||
#define classwxSlider classwxSlider95
|
||||
#else
|
||||
#include "wx/msw/slidrmsw.h"
|
||||
#define wxSlider wxSliderMSW
|
||||
#define classwxSlider classwxSliderMSW
|
||||
#endif
|
||||
|
||||
void Command(wxCommandEvent& event);
|
||||
virtual WXHBRUSH OnCtlColor(const WXHDC pDC, const WXHWND pWnd, const WXUINT nCtlColor,
|
||||
WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
|
||||
void MSWOnVScroll(const WXWORD wParam, const WXWORD pos, const WXHWND control);
|
||||
void MSWOnHScroll(const WXWORD wParam, const WXWORD pos, const WXHWND control);
|
||||
|
||||
protected:
|
||||
WXHWND m_staticMin;
|
||||
WXHWND m_staticMax;
|
||||
WXHWND m_staticValue;
|
||||
int m_rangeMin;
|
||||
int m_rangeMax;
|
||||
int m_pageSize;
|
||||
int m_lineSize;
|
||||
int m_tickFreq;
|
||||
DECLARE_EVENT_TABLE()
|
||||
};
|
||||
|
||||
#endif
|
||||
// __SLIDERH__
|
||||
// _SLIDER_H_
|
||||
|
||||
@@ -51,6 +51,9 @@ class WXDLLEXPORT wxTabCtrl: public wxControl
|
||||
// Get the selection
|
||||
int GetSelection() const;
|
||||
|
||||
// Get the tab with the current keyboard focus
|
||||
int GetCurFocus() const;
|
||||
|
||||
// Get the associated image list
|
||||
wxImageList* GetImageList() const;
|
||||
|
||||
|
||||
@@ -1,11 +1,18 @@
|
||||
#ifndef __TOOLBARH_BASE__
|
||||
#define __TOOLBARH_BASE__
|
||||
#ifndef _TOOLBAR_H_BASE_
|
||||
#define _TOOLBAR_H_BASE_
|
||||
|
||||
#if defined(__WINDOWS__)
|
||||
#include "wx/tbar95.h"
|
||||
#if defined(__WINDOWS__) && defined(__WIN95__)
|
||||
# include "wx/tbar95.h"
|
||||
# define wxToolBar wxToolBar95
|
||||
# define classwxToolBar classwxToolBar95
|
||||
#elif defined(__WINDOWS__)
|
||||
# include "wx/tbarmsw.h"
|
||||
# define wxToolBar wxToolBarMSW
|
||||
# define classwxToolBar classwxToolBarMSW
|
||||
#elif defined(__GTK__)
|
||||
#include "wx/gtk/tbargtk.h"
|
||||
# include "wx/gtk/tbargtk.h"
|
||||
# define classwxToolBar wxToolBarGTK
|
||||
#endif
|
||||
|
||||
#endif
|
||||
// __TOOLBARH_BASE__
|
||||
// _TOOLBAR_H_BASE_
|
||||
|
||||
Reference in New Issue
Block a user