projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed comma
[wxWidgets.git]
/
include
/
wx
/
gtk
/
gauge.h
diff --git
a/include/wx/gtk/gauge.h
b/include/wx/gtk/gauge.h
index 5ca47abcf643511403dfdb8e688878edcf52670f..e5150fb70a5b7a05f8d2e6e8bb6d1947b5bb965b 100644
(file)
--- a/
include/wx/gtk/gauge.h
+++ b/
include/wx/gtk/gauge.h
@@
-7,14
+7,9
@@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-
#ifndef __GTKGAUGEH__
#define __GTKGAUGEH__
#ifndef __GTKGAUGEH__
#define __GTKGAUGEH__
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface
-#endif
-
#include "wx/defs.h"
#if wxUSE_GAUGE
#include "wx/defs.h"
#if wxUSE_GAUGE
@@
-27,19
+22,19
@@
// classes
//-----------------------------------------------------------------------------
// classes
//-----------------------------------------------------------------------------
-class wxGauge;
+class
WXDLLIMPEXP_CORE
wxGauge;
//-----------------------------------------------------------------------------
// global data
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
// global data
//-----------------------------------------------------------------------------
-extern
const wxChar* wxGaugeNameStr
;
+extern
WXDLLIMPEXP_CORE const wxChar wxGaugeNameStr[]
;
//-----------------------------------------------------------------------------
// wxGaugeBox
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
// wxGaugeBox
//-----------------------------------------------------------------------------
-class wxGauge: public wxControl
+class
WXDLLIMPEXP_CORE
wxGauge: public wxControl
{
public:
wxGauge() { Init(); }
{
public:
wxGauge() { Init(); }
@@
-77,20
+72,18
@@
public:
bool IsVertical() const { return HasFlag(wxGA_VERTICAL); }
bool IsVertical() const { return HasFlag(wxGA_VERTICAL); }
+ static wxVisualAttributes
+ GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
+
+ virtual wxVisualAttributes GetDefaultAttributes() const;
+
// implementation
// -------------
// implementation
// -------------
- void ApplyWidgetStyle();
-
// the max and current gauge values
int m_rangeMax,
m_gaugePos;
// the max and current gauge values
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; }