#define wxGAUGE_EMULATE_INDETERMINATE_MODE 0
#endif
-extern WXDLLEXPORT_DATA(const wxChar) wxGaugeNameStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxGaugeNameStr[];
// ----------------------------------------------------------------------------
// wxGauge: a progress bar
// ----------------------------------------------------------------------------
-class WXDLLEXPORT wxGaugeBase : public wxControl
+class WXDLLIMPEXP_CORE wxGaugeBase : public wxControl
{
public:
wxGaugeBase() { m_rangeMax = m_gaugePos = 0; }
virtual void SetBezelFace(int w);
virtual int GetBezelFace() const;
- // overriden base class virtuals
+ // overridden base class virtuals
virtual bool AcceptsFocus() const { return false; }
protected:
+ virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
+
// the max position
int m_rangeMax;
int m_nDirection; // can be wxRIGHT or wxLEFT
#endif
- DECLARE_NO_COPY_CLASS(wxGaugeBase)
+ wxDECLARE_NO_COPY_CLASS(wxGaugeBase);
};
#if defined(__WXUNIVERSAL__)
#include "wx/univ/gauge.h"
#elif defined(__WXMSW__)
- #include "wx/msw/gauge95.h"
- #define wxGauge wxGauge95
+ #include "wx/msw/gauge.h"
#elif defined(__WXMOTIF__)
#include "wx/motif/gauge.h"
#elif defined(__WXGTK20__)
#elif defined(__WXGTK__)
#include "wx/gtk1/gauge.h"
#elif defined(__WXMAC__)
- #include "wx/mac/gauge.h"
+ #include "wx/osx/gauge.h"
#elif defined(__WXCOCOA__)
#include "wx/cocoa/gauge.h"
#elif defined(__WXPM__)