From 1ed64378076af9e28d1c3f896d4b85bdc6aa1b2a Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Mon, 19 Dec 2005 10:55:11 +0000 Subject: [PATCH] __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 | 7 +++---- include/wx/gauge.h | 8 ++------ include/wx/msw/control.h | 4 +--- include/wx/msw/helpbest.h | 6 +++--- include/wx/msw/window.h | 5 ----- include/wx/platform.h | 11 ----------- include/wx/spinbutt.h | 2 +- 7 files changed, 10 insertions(+), 33 deletions(-) diff --git a/contrib/samples/ogl/studio/mainfrm.cpp b/contrib/samples/ogl/studio/mainfrm.cpp index cc4730c01f..e5f97fc674 100644 --- a/contrib/samples/ogl/studio/mainfrm.cpp +++ b/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()); */ } - diff --git a/include/wx/gauge.h b/include/wx/gauge.h index 660089a7fd..0eb6adee67 100644 --- a/include/wx/gauge.h +++ b/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" - #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__) diff --git a/include/wx/msw/control.h b/include/wx/msw/control.h index 40d2c53959..16c7419422 100644 --- a/include/wx/msw/control.h +++ b/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; }; diff --git a/include/wx/msw/helpbest.h b/include/wx/msw/helpbest.h index a05c4e14de..95b128084c 100644 --- a/include/wx/msw/helpbest.h +++ b/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_ diff --git a/include/wx/msw/window.h b/include/wx/msw/window.h index 01fed31008..24dad15d5f 100644 --- a/include/wx/msw/window.h +++ b/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; diff --git a/include/wx/platform.h b/include/wx/platform.h index 725e6a99cb..aa6c716c03 100644 --- a/include/wx/platform.h +++ b/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__ diff --git a/include/wx/spinbutt.h b/include/wx/spinbutt.h index 64e9f1ebae..d2f817ad77 100644 --- a/include/wx/spinbutt.h +++ b/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" -- 2.45.2