add a more readable wrapper for CreateDocument(wxEmptyString, wxDOC_NEW)

[wxWidgets.git] / include / wx / gauge.h

diff --git a/include/wx/gauge.h b/include/wx/gauge.h
index 11605c9d1a14942148c4306c098f936668bb9a07..1e2bd61ca86a2a3a77eea9c2e2fa31c5bab227f9 100644 (file)
--- a/include/wx/gauge.h
+++ b/include/wx/gauge.h
@@ -41,13 +41,13 @@
     #define wxGAUGE_EMULATE_INDETERMINATE_MODE 0
 #endif
 
     #define wxGAUGE_EMULATE_INDETERMINATE_MODE 0
 #endif
 

-extern WXDLLEXPORT_DATA(const char) wxGaugeNameStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxGaugeNameStr[];

 
 // ----------------------------------------------------------------------------
 // wxGauge: a progress bar
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // wxGauge: a progress bar
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxGaugeBase : public wxControl
+class WXDLLIMPEXP_CORE wxGaugeBase : public wxControl

 {
 public:
     wxGaugeBase() { m_rangeMax = m_gaugePos = 0; }
 {
 public:
     wxGaugeBase() { m_rangeMax = m_gaugePos = 0; }


@@ -106,8 +106,7 @@ protected:
 #if defined(__WXUNIVERSAL__)
     #include "wx/univ/gauge.h"
 #elif defined(__WXMSW__)
 #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(__WXMOTIF__)
     #include "wx/motif/gauge.h"
 #elif defined(__WXGTK20__)


@@ -115,7 +114,7 @@ protected:
 #elif defined(__WXGTK__)
     #include "wx/gtk1/gauge.h"
 #elif defined(__WXMAC__)
 #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__)
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/gauge.h"
 #elif defined(__WXPM__)