rename fobr95.{cpp,h} files to foobar.{cpp,h}

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52551 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/gauge.h

@@ -106,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__)

include/wx/msw/gauge.h

@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        gauge95.h
-// Purpose:     wxGauge95 class
+// Name:        wx/msw/gauge.h
+// Purpose:     wxGauge implementation for MSW
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
@@ -9,27 +9,27 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef _GAUGE95_H_
-#define _GAUGE95_H_
+#ifndef _WX_MSW_GAUGE_H_
+#define _WX_MSW_GAUGE_H_
 
 #if wxUSE_GAUGE
 
 extern WXDLLEXPORT_DATA(const char) wxGaugeNameStr[];
 
 // Group box
-class WXDLLEXPORT wxGauge95 : public wxGaugeBase
+class WXDLLEXPORT wxGauge : public wxGaugeBase
 {
 public:
-    wxGauge95() { }
+    wxGauge() { }
 
-    wxGauge95(wxWindow *parent,
-              wxWindowID id,
-              int range,
-              const wxPoint& pos = wxDefaultPosition,
-              const wxSize& size = wxDefaultSize,
-              long style = wxGA_HORIZONTAL,
-              const wxValidator& validator = wxDefaultValidator,
-              const wxString& name = wxGaugeNameStr)
+    wxGauge(wxWindow *parent,
+            wxWindowID id,
+            int range,
+            const wxPoint& pos = wxDefaultPosition,
+            const wxSize& size = wxDefaultSize,
+            long style = wxGA_HORIZONTAL,
+            const wxValidator& validator = wxDefaultValidator,
+            const wxString& name = wxGaugeNameStr)
     {
         (void)Create(parent, id, range, pos, size, style, validator, name);
     }
@@ -64,10 +64,9 @@ public:
 protected:
     virtual wxSize DoGetBestSize() const;
 
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxGauge95)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxGauge)
 };
 
 #endif // wxUSE_GAUGE
 
-#endif
-    // _GAUGEMSW_H_
+#endif // _WX_MSW_GAUGE_H_

include/wx/msw/slider.h

@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/msw/slider95.h
-// Purpose:     wxSlider class, using the Win95 (and later) trackbar control
+// Name:        wx/msw/slider.h
+// Purpose:     wxSlider class implementation using trackbar control
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
@@ -9,8 +9,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef _WX_SLIDER95_H_
-#define _WX_SLIDER95_H_
+#ifndef _WX_SLIDER_H_
+#define _WX_SLIDER_H_
 
 class WXDLLIMPEXP_FWD_CORE wxSubwindows;
 
@@ -132,5 +132,5 @@ protected:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxSlider)
 };
 
-#endif // _WX_SLIDER95_H_
+#endif // _WX_SLIDER_H_
 

include/wx/msw/statusbar.h

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        msw/statbr95.h
+// Name:        wx/msw/statbr.h
 // Purpose:     native implementation of wxStatusBar
 // Author:      Vadim Zeitlin
 // Modified by:
@@ -9,20 +9,20 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifndef   _STATBR95_H
-#define   _STATBR95_H
+#ifndef _WX_MSW_STATUSBAR_H_
+#define _WX_MSW_STATUSBAR_H_
 
 #if wxUSE_NATIVE_STATUSBAR
 
-class WXDLLEXPORT wxStatusBar95 : public wxStatusBarBase
+class WXDLLEXPORT wxStatusBar : public wxStatusBarBase
 {
 public:
     // ctors and such
-    wxStatusBar95();
-    wxStatusBar95(wxWindow *parent,
-                  wxWindowID id = wxID_ANY,
-                  long style = wxST_SIZEGRIP,
-                  const wxString& name = wxStatusBarNameStr)
+    wxStatusBar();
+    wxStatusBar(wxWindow *parent,
+                wxWindowID id = wxID_ANY,
+                long style = wxST_SIZEGRIP,
+                const wxString& name = wxStatusBarNameStr)
     {
         (void)Create(parent, id, style, name);
     }
@@ -32,7 +32,7 @@ public:
                 long style = wxST_SIZEGRIP,
                 const wxString& name = wxStatusBarNameStr);
 
-    virtual ~wxStatusBar95();
+    virtual ~wxStatusBar();
 
     // a status line can have several (<256) fields numbered from 0
     virtual void SetFieldsCount(int number = 1, const int *widths = NULL);
@@ -69,9 +69,9 @@ protected:
     virtual void DoMoveWindow(int x, int y, int width, int height);
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxStatusBar95)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxStatusBar)
 };
 
 #endif  // wxUSE_NATIVE_STATUSBAR
 
-#endif
+#endif // _WX_MSW_STATUSBAR_H_

include/wx/slider.h

@@ -128,7 +128,7 @@ private:
 #if defined(__WXUNIVERSAL__)
     #include "wx/univ/slider.h"
 #elif defined(__WXMSW__)
-    #include "wx/msw/slider95.h"
+    #include "wx/msw/slider.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/slider.h"
 #elif defined(__WXGTK20__)

include/wx/statusbr.h

@@ -158,9 +158,7 @@ protected:
 
     #include "wx/palmos/statusbr.h"
 #elif defined(__WIN32__) && wxUSE_NATIVE_STATUSBAR
-    #define wxStatusBar95 wxStatusBar
-
-    #include "wx/msw/statbr95.h"
+    #include "wx/msw/statusbar.h"
 #elif defined(__WXMAC__)
     #define wxStatusBarMac wxStatusBar
 

include/wx/toolbar.h

@@ -71,7 +71,7 @@ enum
     #elif defined(__WXPALMOS__)
        #include "wx/palmos/toolbar.h"
     #elif defined(__WXMSW__) && (!defined(_WIN32_WCE) || (_WIN32_WCE >= 400 && !defined(__POCKETPC__) && !defined(__SMARTPHONE__)))
-       #include "wx/msw/tbar95.h"
+       #include "wx/msw/toolbar.h"
     #elif defined(__WXWINCE__)
        #include "wx/msw/wince/tbarwce.h"
     #elif defined(__WXMOTIF__)