Add some basic tests for wxDataViewCtrl selection handling.

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

diff --git a/include/wx/gauge.h b/include/wx/gauge.h
index 2156e05a8788d9945ca7e64865adc7d9a28002d1..be03e7e8e7b061c07cd5b7a2470cb6c6dede788f 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; }


@@ -84,10 +84,12 @@ public:
     virtual void SetBezelFace(int w);
     virtual int GetBezelFace() const;
 
     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 bool AcceptsFocus() const { return false; }
 
 protected:

+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
+

     // the max position
     int m_rangeMax;
 
     // the max position
     int m_rangeMax;
 


@@ -98,14 +100,13 @@ protected:
     int m_nDirection;       // can be wxRIGHT or wxLEFT
 #endif
 
     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__)
 };
 
 #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__)


@@ -113,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__)