projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added some trivial macros for exception handling
[wxWidgets.git]
/
include
/
wx
/
gauge.h
diff --git
a/include/wx/gauge.h
b/include/wx/gauge.h
index e2254e11926289458ad672f4746bb2d27ea47eb1..925cca91dd7ebca48cc2a9a3ee5a8ff8042d946b 100644
(file)
--- a/
include/wx/gauge.h
+++ b/
include/wx/gauge.h
@@
-12,7
+12,7
@@
#ifndef _WX_GAUGE_H_BASE_
#define _WX_GAUGE_H_BASE_
#ifndef _WX_GAUGE_H_BASE_
#define _WX_GAUGE_H_BASE_
-#if defined(__GNUG__) && !defined(
__APPLE__
)
+#if defined(__GNUG__) && !defined(
NO_GCC_PRAGMA
)
#pragma interface "gaugebase.h"
#endif
#pragma interface "gaugebase.h"
#endif
@@
-31,6
+31,7
@@
WXDLLEXPORT_DATA(extern const wxChar*) wxGaugeNameStr;
class WXDLLEXPORT wxGaugeBase : public wxControl
{
public:
class WXDLLEXPORT wxGaugeBase : public wxControl
{
public:
+ wxGaugeBase() { }
virtual ~wxGaugeBase();
bool Create(wxWindow *parent,
virtual ~wxGaugeBase();
bool Create(wxWindow *parent,
@@
-67,6
+68,8
@@
protected:
// the current position
int m_gaugePos;
// the current position
int m_gaugePos;
+
+ DECLARE_NO_COPY_CLASS(wxGaugeBase)
};
#if defined(__WXUNIVERSAL__)
};
#if defined(__WXUNIVERSAL__)
@@
-77,9
+80,7
@@
protected:
#define wxGauge wxGauge95
#define sm_classwxGauge sm_classwxGauge95
#else // !__WIN95__
#define wxGauge wxGauge95
#define sm_classwxGauge sm_classwxGauge95
#else // !__WIN95__
- #include "wx/msw/gaugemsw.h"
- #define wxGauge wxGaugeMSW
- #define sm_classwxGauge sm_classwxGaugeMSW
+ // Gauge no longer supported on 16-bit Windows
#endif
#elif defined(__WXMOTIF__)
#include "wx/motif/gauge.h"
#endif
#elif defined(__WXMOTIF__)
#include "wx/motif/gauge.h"
@@
-87,6
+88,8
@@
protected:
#include "wx/gtk/gauge.h"
#elif defined(__WXMAC__)
#include "wx/mac/gauge.h"
#include "wx/gtk/gauge.h"
#elif defined(__WXMAC__)
#include "wx/mac/gauge.h"
+#elif defined(__WXCOCOA__)
+ #include "wx/cocoa/gauge.h"
#elif defined(__WXPM__)
#include "wx/os2/gauge.h"
#endif
#elif defined(__WXPM__)
#include "wx/os2/gauge.h"
#endif