move wxWindowGTK::DoPopupMenu back to window.cpp

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

diff --git a/include/wx/gauge.h b/include/wx/gauge.h
index 61dd3fa1f6884389684014c88c3fe85f68be55c3..6a6317a5f25c7a4dda9a9e72d095f1e0592a0925 100644 (file)
--- a/include/wx/gauge.h
+++ b/include/wx/gauge.h
@@ -41,7 +41,7 @@
     #define wxGAUGE_EMULATE_INDETERMINATE_MODE 0
 #endif
 
-extern WXDLLEXPORT_DATA(const wxChar) wxGaugeNameStr[];
+extern WXDLLEXPORT_DATA(const char) wxGaugeNameStr[];
 
 // ----------------------------------------------------------------------------
 // wxGauge: a progress bar
@@ -88,6 +88,8 @@ public:
     virtual bool AcceptsFocus() const { return false; }
 
 protected:
+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
+
     // the max position
     int m_rangeMax;
 
@@ -104,8 +106,7 @@ protected:
 #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__)