remove warnings

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

diff --git a/include/wx/msw/gauge95.h b/include/wx/msw/gauge95.h
index 981aae0c5ff73bb018891c9f3537cd93b21d7409..26919abfd7ab1fbb5bc144ec823dacdec9148983 100644 (file)
--- a/include/wx/msw/gauge95.h
+++ b/include/wx/msw/gauge95.h
@@ -6,19 +6,15 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _GAUGE95_H_
 #define _GAUGE95_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _GAUGE95_H_
 #define _GAUGE95_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "gauge95.h"
-#endif
-

 #if wxUSE_GAUGE
 
 #if wxUSE_GAUGE
 

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

 
 // Group box
 class WXDLLEXPORT wxGauge95 : public wxGaugeBase
 
 // Group box
 class WXDLLEXPORT wxGauge95 : public wxGaugeBase


@@ -55,11 +51,19 @@ public:
     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();
+
+    WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
+
+    // returns true if the platform should explicitly apply a theme border
+    virtual bool CanApplyThemeBorder() const { return false; }
+

 protected:
 protected:

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

     virtual wxSize DoGetBestSize() const;
 
     virtual wxSize DoGetBestSize() const;
 

-

     DECLARE_DYNAMIC_CLASS_NO_COPY(wxGauge95)
 };
 
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxGauge95)
 };