projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
don't leak wxImageList if wxHF_CONTENTS is not used in wxHtmlHelpWindow
[wxWidgets.git]
/
include
/
wx
/
gtk
/
gauge.h
diff --git
a/include/wx/gtk/gauge.h
b/include/wx/gtk/gauge.h
index 6d2152338a3a1b289e35fe46330cf5c7d68d3934..b06d3bf7f87496b3d23cf14423c5b46e8573105f 100644
(file)
--- a/
include/wx/gtk/gauge.h
+++ b/
include/wx/gtk/gauge.h
@@
-1,37
+1,17
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: gauge.h
+// Name:
wx/gtk/
gauge.h
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// Copyright: (c) 1998 Robert Roebling
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// Copyright: (c) 1998 Robert Roebling
-// Licence: wxWindows licence
+// Licence:
wxWindows licence
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-#ifndef __GTKGAUGEH__
-#define __GTKGAUGEH__
-
-#include "wx/defs.h"
-
-#if wxUSE_GAUGE
-
-#include "wx/object.h"
-#include "wx/list.h"
-#include "wx/control.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxGauge;
+#ifndef _WX_GTK_GAUGE_H_
+#define _WX_GTK_GAUGE_H_
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
-
-extern WXDLLIMPEXP_CORE const wxChar* wxGaugeNameStr;
-
-//-----------------------------------------------------------------------------
-// wxGaugeBox
+// wxGauge
//-----------------------------------------------------------------------------
class WXDLLIMPEXP_CORE wxGauge: public wxControl
//-----------------------------------------------------------------------------
class WXDLLIMPEXP_CORE wxGauge: public wxControl
@@
-63,18
+43,26
@@
public:
void SetShadowWidth( int WXUNUSED(w) ) { }
void SetBezelFace( int WXUNUSED(w) ) { }
void SetShadowWidth( int WXUNUSED(w) ) { }
void SetBezelFace( int WXUNUSED(w) ) { }
- void SetRange( int r );
- void SetValue( int pos );
int GetShadowWidth() const { return 0; };
int GetBezelFace() const { return 0; };
int GetShadowWidth() const { return 0; };
int GetBezelFace() const { return 0; };
+
+ // determinate mode API
+ void SetRange( int r );
+ void SetValue( int pos );
+
int GetRange() const;
int GetValue() const;
int GetRange() const;
int GetValue() const;
+ // indeterminate mode API
+ virtual void Pulse();
+
bool IsVertical() const { return HasFlag(wxGA_VERTICAL); }
bool IsVertical() const { return HasFlag(wxGA_VERTICAL); }
-
+
static wxVisualAttributes
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
static wxVisualAttributes
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
-
+
+ virtual wxVisualAttributes GetDefaultAttributes() const;
+
// implementation
// -------------
// implementation
// -------------
@@
-82,11
+70,6
@@
public:
int m_rangeMax,
m_gaugePos;
int m_rangeMax,
m_gaugePos;
- // obsolete functions, don't use
-#if WXWIN_COMPATIBILITY_2_2
- bool GetProgressBar() const { return true; }
-#endif // WXWIN_COMPATIBILITY_2_2
-
protected:
// common part of all ctors
void Init() { m_rangeMax = m_gaugePos = 0; }
protected:
// common part of all ctors
void Init() { m_rangeMax = m_gaugePos = 0; }
@@
-96,12
+79,9
@@
protected:
virtual wxSize DoGetBestSize() const;
virtual wxSize DoGetBestSize() const;
- virtual wxVisualAttributes GetDefaultAttributes() const;
-
private:
DECLARE_DYNAMIC_CLASS(wxGauge)
};
#endif
private:
DECLARE_DYNAMIC_CLASS(wxGauge)
};
#endif
-
-#endif // __GTKGAUGEH__
+ // _WX_GTK_GAUGE_H_