projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added support more support for DB2
[wxWidgets.git]
/
include
/
wx
/
gtk
/
gauge.h
diff --git
a/include/wx/gtk/gauge.h
b/include/wx/gtk/gauge.h
index d6c546f706177f175f49edb93d5113856ac7674e..ee018c01a17be90db5e34217160dba695477a002 100644
(file)
--- a/
include/wx/gtk/gauge.h
+++ b/
include/wx/gtk/gauge.h
@@
-16,6
+16,9
@@
#endif
#include "wx/defs.h"
#endif
#include "wx/defs.h"
+
+#if wxUSE_GAUGE
+
#include "wx/object.h"
#include "wx/list.h"
#include "wx/control.h"
#include "wx/object.h"
#include "wx/list.h"
#include "wx/control.h"
@@
-38,13
+41,10
@@
extern const char* wxGaugeNameStr;
class wxGauge: public wxControl
{
class wxGauge: public wxControl
{
- DECLARE_DYNAMIC_CLASS(wxGauge)
-
- public:
- inline wxGauge(void) { m_rangeMax = 0; m_gaugePos = 0; m_useProgressBar = TRUE; }
+public:
+ inline wxGauge() { m_rangeMax = 0; m_gaugePos = 0; m_useProgressBar = TRUE; }
- inline wxGauge( wxWindow *parent, wxWindowID id,
- int range,
+ inline wxGauge( wxWindow *parent, wxWindowID id, int range,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxGA_HORIZONTAL,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxGA_HORIZONTAL,
@@
-53,8
+53,7
@@
class wxGauge: public wxControl
{
Create(parent, id, range, pos, size, style, validator, name);
}
{
Create(parent, id, range, pos, size, style, validator, name);
}
- bool Create( wxWindow *parent, wxWindowID id,
- int range,
+ bool Create( wxWindow *parent, wxWindowID id, int range,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxGA_HORIZONTAL,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxGA_HORIZONTAL,
@@
-64,21
+63,26
@@
class wxGauge: public wxControl
void SetBezelFace( int WXUNUSED(w) ) {};
void SetRange( int r );
void SetValue( int pos );
void SetBezelFace( int WXUNUSED(w) ) {};
void SetRange( int r );
void SetValue( int pos );
- int GetShadowWidth(
void
) const { return 0; };
- int GetBezelFace(
void
) const { return 0; };
- int GetRange(
void
) const;
- int GetValue(
void
) const;
+ int GetShadowWidth() const { return 0; };
+ int GetBezelFace() const { return 0; };
+ int GetRange() const;
+ int GetValue() const;
// Are we a Win95/GTK progress bar, or a normal gauge?
// Are we a Win95/GTK progress bar, or a normal gauge?
- inline bool GetProgressBar(
void
) const { return m_useProgressBar; }
+ inline bool GetProgressBar() const { return m_useProgressBar; }
- // implementation
+ // implementation
+ // -------------
void ApplyWidgetStyle();
void ApplyWidgetStyle();
-
- int m_rangeMax;
- int m_gaugePos;
- bool m_useProgressBar;
+ int m_rangeMax;
+ int m_gaugePos;
+ bool m_useProgressBar;
+
+private:
+ DECLARE_DYNAMIC_CLASS(wxGauge)
};
};
+#endif
+
#endif // __GTKGAUGEH__
#endif // __GTKGAUGEH__