projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge of wxMac into main repository
[wxWidgets.git]
/
include
/
wx
/
os2
/
gauge.h
diff --git
a/include/wx/os2/gauge.h
b/include/wx/os2/gauge.h
index bac0f982b5009cb64af4ffcf475e9b74b951d3ef..24c44ba4c8b53ac4a3746a04b9405fbf20341ca2 100644
(file)
--- a/
include/wx/os2/gauge.h
+++ b/
include/wx/os2/gauge.h
@@
-1,26
+1,21
@@
/////////////////////////////////////////////////////////////////////////////
// Name: gauge.h
// Purpose: wxGauge class
/////////////////////////////////////////////////////////////////////////////
// Name: gauge.h
// Purpose: wxGauge class
-// Author:
AUTHOR
+// Author:
David Webster
// Modified by:
// Modified by:
-// Created:
??/??/98
+// Created:
10/06/99
// RCS-ID: $Id$
// RCS-ID: $Id$
-// Copyright: (c)
AUTHOR
-// Licence: wxWindows licence
+// Copyright: (c)
David Webster
+// Licence:
wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_GAUGE_H_
#define _WX_GAUGE_H_
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_GAUGE_H_
#define _WX_GAUGE_H_
-#ifdef __GNUG__
-#pragma interface "gauge.h"
-#endif
-
#include "wx/control.h"
WXDLLEXPORT_DATA(extern const char*) wxGaugeNameStr;
#include "wx/control.h"
WXDLLEXPORT_DATA(extern const char*) wxGaugeNameStr;
-// Group box
class WXDLLEXPORT wxGauge: public wxControl
{
DECLARE_DYNAMIC_CLASS(wxGauge)
class WXDLLEXPORT wxGauge: public wxControl
{
DECLARE_DYNAMIC_CLASS(wxGauge)
@@
-32,7
+27,9
@@
class WXDLLEXPORT wxGauge: public wxControl
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxGA_HORIZONTAL,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxGA_HORIZONTAL,
+#if wxUSE_VALIDATORS
const wxValidator& validator = wxDefaultValidator,
const wxValidator& validator = wxDefaultValidator,
+#endif
const wxString& name = wxGaugeNameStr)
{
Create(parent, id, range, pos, size, style, validator, name);
const wxString& name = wxGaugeNameStr)
{
Create(parent, id, range, pos, size, style, validator, name);
@@
-43,7
+40,9
@@
class WXDLLEXPORT wxGauge: public wxControl
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxGA_HORIZONTAL,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxGA_HORIZONTAL,
+#if wxUSE_VALIDATORS
const wxValidator& validator = wxDefaultValidator,
const wxValidator& validator = wxDefaultValidator,
+#endif
const wxString& name = wxGaugeNameStr);
void SetShadowWidth(int w);
const wxString& name = wxGaugeNameStr);
void SetShadowWidth(int w);
@@
-56,15
+55,14
@@
class WXDLLEXPORT wxGauge: public wxControl
int GetRange() const ;
int GetValue() const ;
int GetRange() const ;
int GetValue() const ;
- void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
+ bool SetForegroundColour(const wxColour& col);
+ bool SetBackgroundColour(const wxColour& col);
virtual void Command(wxCommandEvent& WXUNUSED(event)) {} ;
protected:
int m_rangeMax;
int m_gaugePos;
virtual void Command(wxCommandEvent& WXUNUSED(event)) {} ;
protected:
int m_rangeMax;
int m_gaugePos;
-private:
- void SetSize(int width, int height) {wxWindow::SetSize(width, height);}
};
#endif
};
#endif