__WIN95__ removed (used to differ win3.1 vs. 'modern' 95 look, nowadays always defined for WXMSW so useless). Minor cleanings and corrections for correct #includes.

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

contrib/samples/ogl/studio/mainfrm.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        mainfrm.cpp
+// Name:        ogl/stufio/mainfrm.cpp
 // Purpose:     Studio main frame
 // Author:      Julian Smart
 // Modified by:
@@ -184,7 +184,7 @@ void csFrame::OnIdle(wxIdleEvent& event)
         wxLayoutAlgorithm layout;
         layout.LayoutMDIFrame(this);
 
-#if defined(__WXMSW__) && defined(__WIN95__)
+#if defined(__WXMSW__)
         // Need to do something else to get it to refresh properly
         // when a client frame is first displayed; moving the client
         // window doesn't cause the proper refresh. Just refreshing the
@@ -202,7 +202,7 @@ void csFrame::OnIdle(wxIdleEvent& event)
 
         }
 #endif
-#endif
+#endif // __WXMSW__
     }
     event.Skip();
 }
@@ -277,4 +277,3 @@ void csMDIChildFrame::OnActivate(wxActivateEvent& event)
     layout.LayoutMDIFrame((wxMDIParentFrame*) GetParent());
 */
 }
-

include/wx/gauge.h

@@ -88,12 +88,8 @@ protected:
 #if defined(__WXUNIVERSAL__)
     #include "wx/univ/gauge.h"
 #elif defined(__WXMSW__)
-    #ifdef __WIN95__
+    #include "wx/msw/gauge95.h"
-        #include "wx/msw/gauge95.h"
+    #define wxGauge wxGauge95
-        #define wxGauge wxGauge95
-    #else // !__WIN95__
-        // Gauge no longer supported on 16-bit Windows
-    #endif
 #elif defined(__WXMOTIF__)
     #include "wx/motif/gauge.h"
 #elif defined(__WXGTK__)

include/wx/msw/control.h

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        control.h
+// Name:        wx/msw/control.h
 // Purpose:     wxControl class
 // Author:      Julian Smart
 // Modified by:
@@ -56,9 +56,7 @@ public:
     bool ProcessCommand(wxCommandEvent& event);
 
     // MSW-specific
-#ifdef __WIN95__
     virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
-#endif // Win95
 
     // For ownerdraw items
     virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *WXUNUSED(item)) { return false; };

include/wx/msw/helpbest.h

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        helpbest.h
+// Name:        wx/msw/helpbest.h
 // Purpose:     Tries to load MS HTML Help, falls back to wxHTML upon failure
 // Author:      Mattia Barbon
 // Modified by:
@@ -12,7 +12,7 @@
 #ifndef _WX_HELPBEST_H_
 #define _WX_HELPBEST_H_
 
-#if wxUSE_HELP && wxUSE_MS_HTML_HELP && defined(__WIN95__) \
+#if wxUSE_HELP && wxUSE_MS_HTML_HELP \
     && wxUSE_WXHTML_HELP && !defined(__WXUNIVERSAL__)
 
 #include "wx/helpbase.h"
@@ -118,7 +118,7 @@ protected:
     DECLARE_NO_COPY_CLASS(wxBestHelpController)
 };
 
-#endif // wxUSE_HELP && wxUSE_MS_HTML_HELP && defined(__WIN95__) && wxUSE_WXHTML_HELP
+#endif // wxUSE_HELP && wxUSE_MS_HTML_HELP && wxUSE_WXHTML_HELP
 
 #endif
     // _WX_HELPBEST_H_

include/wx/msw/window.h

@@ -270,9 +270,7 @@ public:
                              WXWORD pos, WXHWND control);
 
     // child control notifications
-#ifdef __WIN95__
     virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
-#endif // __WIN95__
 
     // owner-drawn controls need to process these messages
     virtual bool MSWOnDrawItem(int id, WXDRAWITEMSTRUCT *item);
@@ -485,10 +483,7 @@ private:
     bool HandleMove(int x, int y);
     bool HandleMoving(wxRect& rect);
     bool HandleJoystickEvent(WXUINT msg, int x, int y, WXUINT flags);
-
-#ifdef __WIN95__
     bool HandleNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
-#endif // __WIN95__
 
     // list of disabled children before last call to our Disable()
     wxWindowList *m_childrenDisabled;

include/wx/platform.h

@@ -115,11 +115,6 @@
 
 #    ifndef __WIN32__
 #        define __WIN32__
-#    endif
-
-    /* this means Win95-style UI, i.e. Win9x/NT 4+: always true now */
-#    if !defined(__WIN95__)
-#        define __WIN95__
 #    endif
 #endif /* Win32 */
 
@@ -129,12 +124,6 @@
 #   endif
 #endif
 
-#ifdef __WINE__
-#   ifndef __WIN95__
-#       define __WIN95__
-#   endif
-#endif /* WINE */
-
 /* detect MS SmartPhone */
 #if defined( WIN32_PLATFORM_WFSP )
 #   ifndef __SMARTPHONE__

include/wx/spinbutt.h

@@ -74,7 +74,7 @@ protected:
 
 #if defined(__WXUNIVERSAL__)
     #include "wx/univ/spinbutt.h"
-#elif defined(__WXMSW__) && defined(__WIN95__)
+#elif defined(__WXMSW__)
     #include "wx/msw/spinbutt.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/spinbutt.h"