correct access for virtuals, unneeded includes

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

diff --git a/include/wx/msw/gauge95.h b/include/wx/msw/gauge95.h
index 052a7ae7129e8ada8cb597a6304d2e415c89b09c..26e7c18e35028376f3715f1b1163b518ca80e3f3 100644 (file)
--- a/include/wx/msw/gauge95.h
+++ b/include/wx/msw/gauge95.h
@@ -12,15 +12,9 @@
 #ifndef _GAUGE95_H_
 #define _GAUGE95_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "gauge95.h"
-#endif
-
-#if wxUSE_SLIDER
-
-#include "wx/control.h"
+#if wxUSE_GAUGE
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxGaugeNameStr;
+extern WXDLLEXPORT_DATA(const wxChar) wxGaugeNameStr[];
 
 // Group box
 class WXDLLEXPORT wxGauge95 : public wxGaugeBase
@@ -57,8 +51,9 @@ public:
     virtual bool SetForegroundColour(const wxColour& col);
     virtual bool SetBackgroundColour(const wxColour& col);
 
-protected:
     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
+
+protected:
     virtual wxSize DoGetBestSize() const;