f9876c519e
Platforms that don't make use of wxGaugeBase::Create when creating a wxGauge (such as GTK and MSW) access the uninitialised m_appProgressIndicator. Fix by initialising m_appProgressIndicator to NULL in the wxGaugeBase constructor. Regression since r78499. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@78512 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
131 lines
3.7 KiB
C++
131 lines
3.7 KiB
C++
///////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/gauge.h
|
|
// Purpose: wxGauge interface
|
|
// Author: Vadim Zeitlin
|
|
// Modified by:
|
|
// Created: 20.02.01
|
|
// Copyright: (c) 1996-2001 wxWidgets team
|
|
// Licence: wxWindows licence
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_GAUGE_H_BASE_
|
|
#define _WX_GAUGE_H_BASE_
|
|
|
|
#include "wx/defs.h"
|
|
|
|
#if wxUSE_GAUGE
|
|
|
|
#include "wx/control.h"
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// wxGauge style flags
|
|
// ----------------------------------------------------------------------------
|
|
|
|
#define wxGA_HORIZONTAL wxHORIZONTAL
|
|
#define wxGA_VERTICAL wxVERTICAL
|
|
|
|
// Available since Windows 7 only. With this style, the value of guage will
|
|
// reflect on the taskbar button.
|
|
#define wxGA_PROGRESS 0x0010
|
|
// Win32 only, is default (and only) on some other platforms
|
|
#define wxGA_SMOOTH 0x0020
|
|
// QT only, display current completed percentage (text default format "%p%")
|
|
#define wxGA_TEXT 0x0040
|
|
|
|
// GTK and Mac always have native implementation of the indeterminate mode
|
|
// wxMSW has native implementation only if comctl32.dll >= 6.00
|
|
#if !defined(__WXGTK20__) && !defined(__WXMAC__)
|
|
#define wxGAUGE_EMULATE_INDETERMINATE_MODE 1
|
|
#else
|
|
#define wxGAUGE_EMULATE_INDETERMINATE_MODE 0
|
|
#endif
|
|
|
|
extern WXDLLIMPEXP_DATA_CORE(const char) wxGaugeNameStr[];
|
|
|
|
class WXDLLIMPEXP_FWD_CORE wxAppProgressIndicator;
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// wxGauge: a progress bar
|
|
// ----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_CORE wxGaugeBase : public wxControl
|
|
{
|
|
public:
|
|
wxGaugeBase() : m_rangeMax(0), m_gaugePos(0),
|
|
m_appProgressIndicator(NULL) { }
|
|
|
|
virtual ~wxGaugeBase();
|
|
|
|
bool Create(wxWindow *parent,
|
|
wxWindowID id,
|
|
int range,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& size = wxDefaultSize,
|
|
long style = wxGA_HORIZONTAL,
|
|
const wxValidator& validator = wxDefaultValidator,
|
|
const wxString& name = wxGaugeNameStr);
|
|
|
|
// determinate mode API
|
|
|
|
// set/get the control range
|
|
virtual void SetRange(int range);
|
|
virtual int GetRange() const;
|
|
|
|
virtual void SetValue(int pos);
|
|
virtual int GetValue() const;
|
|
|
|
// indeterminate mode API
|
|
virtual void Pulse();
|
|
|
|
// simple accessors
|
|
bool IsVertical() const { return HasFlag(wxGA_VERTICAL); }
|
|
|
|
// appearance params (not implemented for most ports)
|
|
virtual void SetShadowWidth(int w);
|
|
virtual int GetShadowWidth() const;
|
|
|
|
virtual void SetBezelFace(int w);
|
|
virtual int GetBezelFace() const;
|
|
|
|
// overridden base class virtuals
|
|
virtual bool AcceptsFocus() const wxOVERRIDE { return false; }
|
|
|
|
protected:
|
|
virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; }
|
|
|
|
// the max position
|
|
int m_rangeMax;
|
|
|
|
// the current position
|
|
int m_gaugePos;
|
|
|
|
#if wxGAUGE_EMULATE_INDETERMINATE_MODE
|
|
int m_nDirection; // can be wxRIGHT or wxLEFT
|
|
#endif
|
|
|
|
wxAppProgressIndicator *m_appProgressIndicator;
|
|
|
|
wxDECLARE_NO_COPY_CLASS(wxGaugeBase);
|
|
};
|
|
|
|
#if defined(__WXUNIVERSAL__)
|
|
#include "wx/univ/gauge.h"
|
|
#elif defined(__WXMSW__)
|
|
#include "wx/msw/gauge.h"
|
|
#elif defined(__WXMOTIF__)
|
|
#include "wx/motif/gauge.h"
|
|
#elif defined(__WXGTK20__)
|
|
#include "wx/gtk/gauge.h"
|
|
#elif defined(__WXGTK__)
|
|
#include "wx/gtk1/gauge.h"
|
|
#elif defined(__WXMAC__)
|
|
#include "wx/osx/gauge.h"
|
|
#elif defined(__WXQT__)
|
|
#include "wx/qt/gauge.h"
|
|
#endif
|
|
|
|
#endif // wxUSE_GAUGE
|
|
|
|
#endif
|
|
// _WX_GAUGE_H_BASE_
|