cleanup - fixed warnings, reformatting

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

diff --git a/include/wx/gauge.h b/include/wx/gauge.h
index ba1623f1cda58b48edeee4c36b5f8e02a7892df7..31757e87c9549121303a21360d998a6f66d9b5fa 100644 (file)
--- a/include/wx/gauge.h
+++ b/include/wx/gauge.h
@@ -6,16 +6,12 @@
 // Created:     20.02.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 1996-2001 wxWidgets team
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GAUGE_H_BASE_
 #define _WX_GAUGE_H_BASE_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "gaugebase.h"
-#endif
-
 #include "wx/defs.h"
 
 #if wxUSE_GAUGE
@@ -36,7 +32,7 @@
 #define wxGA_PROGRESSBAR     0
 
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxGaugeNameStr;
+extern WXDLLEXPORT_DATA(const wxChar) wxGaugeNameStr[];
 
 // ----------------------------------------------------------------------------
 // wxGauge: a progress bar
@@ -77,7 +73,7 @@ public:
     virtual int GetBezelFace() const;
 
     // overriden base class virtuals
-    virtual bool AcceptsFocus() const { return FALSE; }
+    virtual bool AcceptsFocus() const { return false; }
 
 protected:
     // the max position
@@ -92,16 +88,14 @@ protected:
 #if defined(__WXUNIVERSAL__)
     #include "wx/univ/gauge.h"
 #elif defined(__WXMSW__)
-    #ifdef __WIN95__
-        #include "wx/msw/gauge95.h"
-        #define wxGauge wxGauge95
-    #else // !__WIN95__
-        // Gauge no longer supported on 16-bit Windows
-    #endif
+    #include "wx/msw/gauge95.h"
+    #define wxGauge wxGauge95
 #elif defined(__WXMOTIF__)
     #include "wx/motif/gauge.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
     #include "wx/gtk/gauge.h"
+#elif defined(__WXGTK__)
+    #include "wx/gtk1/gauge.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/gauge.h"
 #elif defined(__WXCOCOA__)