X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dc797d8e1b4ef10be4f5c9cd73151406f459706d..66c2bf7b1d9326fb650acfaae22ec50528cfbf7c:/include/wx/gauge.h

diff --git a/include/wx/gauge.h b/include/wx/gauge.h
index 11605c9d1a..93ae86fcc4 100644
--- a/include/wx/gauge.h
+++ b/include/wx/gauge.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     20.02.01
-// RCS-ID:      $Id$
 // Copyright:   (c) 1996-2001 wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -41,13 +40,13 @@
     #define wxGAUGE_EMULATE_INDETERMINATE_MODE 0
 #endif
 
-extern WXDLLEXPORT_DATA(const char) 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; }
@@ -84,7 +83,7 @@ public:
     virtual void SetBezelFace(int w);
     virtual int GetBezelFace() const;
 
-    // overriden base class virtuals
+    // overridden base class virtuals
     virtual bool AcceptsFocus() const { return false; }
 
 protected:
@@ -100,14 +99,13 @@ protected:
     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__)
@@ -115,7 +113,7 @@ protected:
 #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__)