diff --git a/src/common/quantize.cpp b/src/common/quantize.cpp index 4fa2988ca4..dc749e1583 100644 --- a/src/common/quantize.cpp +++ b/src/common/quantize.cpp @@ -675,7 +675,7 @@ select_colors (j_decompress_ptr cinfo, int desired_colors) * it needs a work array to hold the best-distance-so-far for each histogram * cell (because the inner loop has to be over cells, not colormap entries). * The work array elements have to be INT32s, so the work array would need - * 256Kb at our recommended precision. This is not feasible in DOS machines. + * 256Kb at our recommended precision. * * To get around these problems, we apply Thomas' method to compute the * nearest colors for only the cells within a small subbox of the histogram. @@ -694,9 +694,8 @@ select_colors (j_decompress_ptr cinfo, int desired_colors) * * Thomas' article also describes a refined method which is asymptotically * faster than the brute-force method, but it is also far more complex and - * cannot efficiently be applied to small subboxes. It is therefore not - * useful for programs intended to be portable to DOS machines. On machines - * with plenty of memory, filling the whole histogram in one shot with Thomas' + * cannot efficiently be applied to small subboxes. On machines with + * plenty of memory, filling the whole histogram in one shot with Thomas' * refined method might be faster than the present code --- but then again, * it might not be any faster, and it's certainly more complicated. */ diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp index 93a92facc2..714e378a8c 100644 --- a/src/generic/dirctrlg.cpp +++ b/src/generic/dirctrlg.cpp @@ -95,7 +95,7 @@ wxDEFINE_EVENT( wxEVT_DIRCTRL_SELECTIONCHANGED, wxTreeEvent ); wxDEFINE_EVENT( wxEVT_DIRCTRL_FILEACTIVATED, wxTreeEvent ); // ---------------------------------------------------------------------------- -// wxGetAvailableDrives, for WINDOWS, DOS, MAC, UNIX (returns "/") +// wxGetAvailableDrives, for WINDOWS, OSX, UNIX (returns "/") // ---------------------------------------------------------------------------- size_t wxGetAvailableDrives(wxArrayString &paths, wxArrayString &names, wxArrayInt &icon_ids) diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp index bacc3a2dbb..db1557bace 100644 --- a/src/generic/filedlgg.cpp +++ b/src/generic/filedlgg.cpp @@ -19,7 +19,7 @@ // NOTE : it probably also supports MAC, untested #if !defined(__UNIX__) && !defined(__WIN32__) -#error wxGenericFileDialog currently only supports Unix, win32 and DOS +#error wxGenericFileDialog currently only supports Unix and MSW #endif #ifndef WX_PRECOMP diff --git a/src/msw/bitmap.cpp b/src/msw/bitmap.cpp index 9b2c4ad9dc..2afbf7b677 100644 --- a/src/msw/bitmap.cpp +++ b/src/msw/bitmap.cpp @@ -176,10 +176,9 @@ wxIMPLEMENT_DYNAMIC_CLASS(wxBitmapHandler, wxObject); // (a) if hdc is specified, the caller explicitly wants DDB // (b) otherwise, create a DIB if depth >= 24 (we don't support 16bpp // or less DIBs anyhow) - // (c) finally, create DIBs under Win9x even if the depth hasn't been + // (c) finally, create DIBs under MSW even if the depth hasn't been // explicitly specified but the current display depth is 24 or - // more and the image is "big", i.e. > 16Mb which is the - // theoretical limit for DDBs under Win9x + // more and the image is "big", i.e. > 16Mb // // consequences (all of which seem to make sense): // diff --git a/src/msw/button.cpp b/src/msw/button.cpp index 40dfa1677d..1d934ee94d 100644 --- a/src/msw/button.cpp +++ b/src/msw/button.cpp @@ -404,12 +404,8 @@ bool wxButton::MSWCommand(WXUINT param, WXWORD WXUNUSED(id)) bool processed = false; switch ( param ) { - // NOTE: Apparently older versions (NT 4?) of the common controls send - // BN_DOUBLECLICKED but not a second BN_CLICKED for owner-drawn - // buttons, so in order to send two EVT_BUTTON events we should - // catch both types. Currently (Feb 2003) up-to-date versions of - // win98, win2k and winXP all send two BN_CLICKED messages for - // all button types, so we don't catch BN_DOUBLECLICKED anymore + // NOTE: Currently all versions of Windows send two BN_CLICKED messages + // for all button types, so we don't catch BN_DOUBLECLICKED // in order to not get 3 EVT_BUTTON events. If this is a problem // then we need to figure out which version of the comctl32 changed // this behaviour and test for it. diff --git a/src/msw/control.cpp b/src/msw/control.cpp index daf7b06590..becfab0140 100644 --- a/src/msw/control.cpp +++ b/src/msw/control.cpp @@ -206,13 +206,9 @@ bool wxControl::MSWCreateControl(const wxChar *classname, if ( testFont ) { - // not sure if we need to explicitly set the font here for Win95/NT4 - // but we definitely can't do it for any newer version + // we can't explicitly set the font here // see wxGetCCDefaultFont() in src/msw/settings.cpp for explanation // of why this test works - - // TODO: test Win95/NT4 to see if this is needed or breaks the - // font resizing as it does on newer versions if ( font != wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT) ) { setFont = false; diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp index 03f96e6955..d46216eae2 100644 --- a/src/msw/dc.cpp +++ b/src/msw/dc.cpp @@ -1426,7 +1426,7 @@ void wxMSWDCImpl::DoDrawRotatedText(const wxString& text, // NB: don't take DEFAULT_GUI_FONT (a.k.a. wxSYS_DEFAULT_GUI_FONT) // because it's not TrueType and so can't have non zero - // orientation/escapement under Win9x + // orientation/escapement wxFont font = m_font.IsOk() ? m_font : *wxSWISS_FONT; LOGFONT lf; if ( ::GetObject(GetHfontOf(font), sizeof(lf), &lf) == 0 ) diff --git a/src/msw/dcclient.cpp b/src/msw/dcclient.cpp index b438082fcc..511256f4a5 100644 --- a/src/msw/dcclient.cpp +++ b/src/msw/dcclient.cpp @@ -226,10 +226,6 @@ void wxClientDCImpl::InitDC() // in wxUniv build we must manually do some DC adjustments usually // performed by Windows for us - // - // we also need to take the menu/toolbar manually into account under - // Windows CE because they're just another control there, not anything - // special as usually under Windows #if defined(__WXUNIVERSAL__) wxPoint ptOrigin = m_window->GetClientAreaOrigin(); if ( ptOrigin.x || ptOrigin.y ) diff --git a/src/msw/dialup.cpp b/src/msw/dialup.cpp index 61988328a9..56d620e7b3 100644 --- a/src/msw/dialup.cpp +++ b/src/msw/dialup.cpp @@ -263,8 +263,6 @@ private: static RASRENAMEENTRY ms_pfnRasRenameEntry; static RASDELETEENTRY ms_pfnRasDeleteEntry; static RASVALIDATEENTRYNAME ms_pfnRasValidateEntryName; - - // this function is not supported by Win95 static RASCONNECTIONNOTIFICATION ms_pfnRasConnectionNotification; // if this flag is different from -1, it overrides IsOnline() @@ -1035,9 +1033,6 @@ bool wxDialUpManagerMSW::EnableAutoCheckOnlineStatus(size_t nSeconds) if ( ok ) { - // we're running under NT 4.0, Windows 98 or later and can use - // RasConnectionNotification() to be notified by a secondary thread - // first, see if we don't have this thread already running if ( m_hThread != 0 ) { @@ -1160,8 +1155,6 @@ bool wxDialUpManagerMSW::EnableAutoCheckOnlineStatus(size_t nSeconds) } } - // we're running under Windows 95 and have to poll ourselves - // (or, alternatively, the code above for NT/98 failed) m_timerStatusPolling.Stop(); if ( nSeconds == 0 ) { diff --git a/src/msw/dib.cpp b/src/msw/dib.cpp index 616c59c7a4..0b11c93087 100644 --- a/src/msw/dib.cpp +++ b/src/msw/dib.cpp @@ -64,10 +64,9 @@ static inline WORD GetNumberOfColours(WORD bitsPerPixel) // wrapper around ::GetObject() for DIB sections static inline bool GetDIBSection(HBITMAP hbmp, DIBSECTION *ds) { - // note that at least under Win9x (this doesn't seem to happen under Win2K - // but this doesn't mean anything, of course), GetObject() may return - // sizeof(DIBSECTION) for a bitmap which is *not* a DIB section and the way - // to check for it is by looking at the bits pointer + // note that GetObject() may return sizeof(DIBSECTION) for a bitmap + // which is *not* a DIB section and the way to check for it is + // by looking at the bits pointer return ::GetObject(hbmp, sizeof(DIBSECTION), ds) == sizeof(DIBSECTION) && ds->dsBm.bmBits; } @@ -485,8 +484,8 @@ HGLOBAL wxDIB::ConvertFromBitmap(HBITMAP hbmp) HGLOBAL hDIB = ::GlobalAlloc(GMEM_MOVEABLE, size); if ( !hDIB ) { - // this is an error which does risk to happen especially under Win9x - // and which the user may understand so let him know about it + // this is an error which the user may understand so let him + // know about it wxLogError(_("Failed to allocate %luKb of memory for bitmap data."), (unsigned long)(size / 1024)); diff --git a/src/msw/display.cpp b/src/msw/display.cpp index 4f5f6970de..66c6665788 100644 --- a/src/msw/display.cpp +++ b/src/msw/display.cpp @@ -260,9 +260,9 @@ wxVideoMode wxDisplayMSW::GetCurrentMode() const { wxVideoMode mode; - // The first parameter of EnumDisplaySettings() must be NULL under Win95 - // according to MSDN. The version of GetName() we implement for Win95 - // returns an empty string. + // Having NULL as the first parameter of EnumDisplaySettings() specifies + // the current display device on the computer on which the calling + // thread is running, according to MSDN. const wxString name = GetName(); const wxChar * const deviceName = name.empty() ? (const wxChar*)NULL diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp index e7a6524fb1..bdd508befd 100644 --- a/src/msw/frame.cpp +++ b/src/msw/frame.cpp @@ -675,7 +675,7 @@ void wxFrame::IconizeChildFrames(bool bIconize) { wxWindow *win = node->GetData(); - // iconizing the frames with this style under Win95 shell puts them at + // iconizing the frames with this style under MSW puts them at // the bottom of the screen (as the MDI children) instead of making // them appear in the taskbar because they are, by virtue of this // style, not managed by the taskbar - instead leave Windows take care diff --git a/src/msw/mediactrl_am.cpp b/src/msw/mediactrl_am.cpp index 4721bb1455..65d53808c7 100644 --- a/src/msw/mediactrl_am.cpp +++ b/src/msw/mediactrl_am.cpp @@ -8,31 +8,22 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -// TODO: Actually test the CE IWMP.... // TODO: Actually test HTTP proxies... //-----------------Introduction---------------------------------------------- -// This is the media backend for Windows Media Player 6 and ActiveMovie, -// as well as PocketPC 2000, Windows Media Player Mobile 7 and 8. +// This is the media backend for Windows Media Player 6 and ActiveMovie. // // We use a combination of the WMP 6 IMediaPlayer interface as well as the -// ActiveMovie interface IActiveMovie that even exists on Windows 3. For -// mobile systems we switch to IWMP for WMP mobile 7 and 8 and possibly -// earlier. We just use ifdefs for differentiating between IWMP and -// IActiveMovie/IMediaPlayer as the IWMP and IMediaPlayer are virtually -// identical with a few minor exceptions. +// ActiveMovie interface IActiveMovie. // // For supporting HTTP proxies and such we query the media player -// interface (IActiveMovie/IWMP) for the INSPlay (NetShow) interface. +// interface (IActiveMovie) for the INSPlay (NetShow) interface. // -// The IMediaPlayer/IActiveMovie/IWMP are rather clean and straightforward +// The IMediaPlayer/IActiveMovie are rather clean and straightforward // interfaces that are fairly simplistic. // // Docs for IMediaPlayer are at // http://msdn.microsoft.com/library/en-us/wmp6sdk/htm/microsoftwindowsmediaplayercontrolversion64sdk.asp -// -// Docs for IWMP are at -// http://msdn.microsoft.com/library/en-us/wcewmp/html/_wcesdk_asx_wmp_control_reference.asp //=========================================================================== // DECLARATIONS @@ -87,14 +78,6 @@ // generated interfaces I want with the STDMETHOD wrappers and then put them // into mediactrl.cpp. // -// According to the MSDN docs, IMediaPlayer requires Windows 98 SE -// or greater. NetShow is available on Windows 3.1 and I'm guessing -// IActiveMovie is too. IMediaPlayer is essentially the Windows Media -// Player 6.4 SDK. -// -// IWMP is from PlayerOCX.idl on PocketPC 2000, which uses CLSID_MediaPlayer -// as well as the main windows line. -// // Some of these are not used but are kept here for future reference anyway //--------------------------------------------------------------------------- const IID IID_IActiveMovie = {0x05589FA2,0xC356,0x11CE,{0xBF,0x01,0x00,0xAA,0x00,0x55,0x59,0x5A}};