Avoid CRT deprecation warnings for MSVC build using makefiles too.

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

diff --git a/include/wx/msw/gauge.h b/include/wx/msw/gauge.h
index b3c434ae6ad0a0746acd59326ea88ef4b69abebc..4ddbd3bd0efe6e9a2e6b220774c9749b7f8d40a8 100644 (file)
--- a/include/wx/msw/gauge.h
+++ b/include/wx/msw/gauge.h
@@ -14,10 +14,10 @@
 
 #if wxUSE_GAUGE
 
 
 #if wxUSE_GAUGE
 

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

 
 // Group box
 
 // Group box

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

 {
 public:
     wxGauge() { }
 {
 public:
     wxGauge() { }


@@ -47,14 +47,11 @@ public:
     virtual void SetRange(int range);
     virtual void SetValue(int pos);
 
     virtual void SetRange(int range);
     virtual void SetValue(int pos);
 

-    // overriden base class virtuals
+    // overridden base class virtuals

     virtual bool SetForegroundColour(const wxColour& col);
     virtual bool SetBackgroundColour(const wxColour& col);
 
     virtual bool SetForegroundColour(const wxColour& col);
     virtual bool SetBackgroundColour(const wxColour& col);
 

-
-    void SetIndeterminateMode();
-    void SetDeterminateMode();
-    void Pulse();
+    virtual void Pulse();

 
     WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
 
 
     WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
 


@@ -64,6 +61,15 @@ public:
 protected:
     virtual wxSize DoGetBestSize() const;
 
 protected:
     virtual wxSize DoGetBestSize() const;
 

+private:
+    // returns true if the control is currently in indeterminate (a.k.a.
+    // "marquee") mode
+    bool IsInIndeterminateMode() const;
+
+    // switch to/from indeterminate mode
+    void SetIndeterminateMode();
+    void SetDeterminateMode();
+

     DECLARE_DYNAMIC_CLASS_NO_COPY(wxGauge)
 };
 
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxGauge)
 };