Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'rmv_symbols_3' of https://github.com/catalinr/wxWidgets

Browse Source 
Remove obsolete mentions of Windows 9x, Windows CE and OS/2.
This commit is contained in:
Vadim Zeitlin
2017-02-20 17:46:45 +01:00
parent 41045df7ea a00e4e65c9
commit d15bbcacd2
63 changed files with 133 additions and 674 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/defs.h
View File

@@ -461,7 +461,7 @@ typedef short int WXTYPE;
#define wxSTDCALL
#endif /* platform */
/* LINKAGEMODE mode is empty for everything except OS/2 */
/* LINKAGEMODE mode is most likely empty everywhere */
#ifndef LINKAGEMODE
#define LINKAGEMODE
#endif /* LINKAGEMODE */

7
include/wx/event.h
View File

@@ -153,8 +153,8 @@ private:
// These are needed for the functor definitions
typedef void (wxEvtHandler::*wxEventFunction)(wxEvent&);
// We had some trouble (specifically with eVC for ARM WinCE build) with using
// wxEventFunction in the past so we had introduced wxObjectEventFunction which
// We had some trouble with using wxEventFunction
// in the past so we had introduced wxObjectEventFunction which
// used to be a typedef for a member of wxObject and not wxEvtHandler to work
// around this but as eVC is not really supported any longer we now only keep
// this for backwards compatibility and, despite its name, this is a typedef
@@ -3106,8 +3106,7 @@ private:
/* TODO
wxEVT_MOUSE_CAPTURE_CHANGED,
wxEVT_SETTING_CHANGED, // WM_WININICHANGE (NT) / WM_SETTINGCHANGE (Win95)
wxEVT_SETTING_CHANGED, // WM_WININICHANGE
// wxEVT_FONT_CHANGED, // WM_FONTCHANGE: roll into wxEVT_SETTING_CHANGED, but remember to propagate
// wxEVT_FONT_CHANGED to all other windows (maybe).
wxEVT_DRAW_ITEM, // Leave these three as virtual functions in wxControl?? Platform-specific.

4
include/wx/filefn.h
View File

@@ -596,7 +596,7 @@ WXDLLIMPEXP_BASE bool wxIsExecutable(const wxString &path);
#elif defined(__MAC__)
#define wxFILE_SEP_PATH wxFILE_SEP_PATH_MAC
#define wxPATH_SEP wxPATH_SEP_MAC
#else // Windows and OS/2
#else // Windows
#define wxFILE_SEP_PATH wxFILE_SEP_PATH_DOS
#define wxPATH_SEP wxPATH_SEP_DOS
#endif // Unix/Windows
@@ -605,7 +605,7 @@ WXDLLIMPEXP_BASE bool wxIsExecutable(const wxString &path);
// filename1.IsSameAs(filename2, wxARE_FILENAMES_CASE_SENSITIVE)
#if defined(__UNIX__) && !defined(__DARWIN__)
#define wxARE_FILENAMES_CASE_SENSITIVE true
#else // Windows, Mac OS and OS/2
#else // Windows and OSX
#define wxARE_FILENAMES_CASE_SENSITIVE false
#endif // Unix/Windows

2
include/wx/helpwin.h
View File

@@ -1,6 +1,6 @@
/////////////////////////////////////////////////////////////////////////////
// Name: wx/helpwin.h
// Purpose: Includes Windows or OS/2 help
// Purpose: Includes Windows help
// Author: Julian Smart
// Modified by:
// Created:

2
include/wx/imaglist.h
View File

@@ -22,7 +22,7 @@
*
* Image lists can also create and draw images used for drag and drop functionality.
* This is not yet implemented in wxImageList. We need to discuss a generic API
* for doing drag and drop and see whether it ties in with the Win95 view of it.
* for doing drag and drop.
* See below for candidate functions and an explanation of how they might be
* used.
*/

2
include/wx/msw/app.h
View File

@@ -112,7 +112,7 @@ public:
#if wxUSE_RICHEDIT
// initialize the richedit DLL of (at least) given version, return true if
// ok (Win95 has version 1, Win98/NT4 has 1 and 2, W2K has 3)
// ok
static bool InitRichEdit(int version = 2);
#endif // wxUSE_RICHEDIT

9
include/wx/msw/imaglist.h
View File

@@ -76,13 +76,6 @@ public:
// 'bitmap' and 'mask' after calling Replace.
bool Replace(int index, const wxBitmap& bitmap, const wxBitmap& mask = wxNullBitmap);
/* Not supported by Win95
// Replacing a bitmap, using the specified colour to create the mask bitmap
// Note that wxImageList creates new bitmaps, so you may delete
// 'bitmap'.
bool Replace(int index, const wxBitmap& bitmap, const wxColour& maskColour);
*/
// Replaces a bitmap and mask from an icon.
// You can delete 'icon' after calling Replace.
bool Replace(int index, const wxIcon& icon);
@@ -164,7 +157,7 @@ public:
// window to be updated.
static bool DragLeave( wxWindow *lockWindow );
/* Here's roughly how you'd use these functions if implemented in this Win95-like way:
/* Here's roughly how you'd use these functions:
1) Starting to drag:

12
include/wx/msw/listctrl.h
View File

@@ -59,8 +59,7 @@ class wxMSWListHeaderCustomDraw;
which item. Each image in an image list can contain a mask, and can be made out
of either a bitmap, two bitmaps or an icon. See ImagList.h for more details.
Notifications are passed via the wxWidgets 2.0 event system, or using virtual
functions in wxWidgets 1.66.
Notifications are passed via the event system.
See the sample wxListCtrl app for API usage.
@@ -68,9 +67,6 @@ class wxMSWListHeaderCustomDraw;
- addition of further convenience functions
to avoid use of wxListItem in some functions
- state/overlay images: probably not needed.
- in Win95, you can be called back to supply other information
besides text, such as state information. This saves no memory
and is probably superfluous to requirements.
- testing of whole API, extending current sample.
@@ -255,12 +251,6 @@ public:
wxImageList *GetImageList(int which) const wxOVERRIDE;
// Sets the image list
// N.B. There's a quirk in the Win95 list view implementation.
// If in wxLC_LIST mode, it'll *still* display images by the labels if
// there's a small-icon image list set for the control - even though you
// haven't specified wxLIST_MASK_IMAGE when inserting.
// So you have to set a NULL small-icon image list to be sure that
// the wxLC_LIST mode works without icons. Of course, you may want icons...
void SetImageList(wxImageList *imageList, int which) wxOVERRIDE;
void AssignImageList(wxImageList *imageList, int which) wxOVERRIDE;

14
include/wx/msw/private.h
View File

@@ -333,15 +333,6 @@ BOOL wxDrawStateBitmap(HDC hDC, HBITMAP hBitmap, int x, int y, UINT uState);
#endif // wxUSE_OWNER_DRAWN
// get (x, y) from DWORD - notice that HI/LOWORD can *not* be used because they
// will fail on system with multiple monitors where the coords may be negative
//
// these macros are standard now (Win98) but some older headers don't have them
#ifndef GET_X_LPARAM
#define GET_X_LPARAM(lp) ((int)(short)LOWORD(lp))
#define GET_Y_LPARAM(lp) ((int)(short)HIWORD(lp))
#endif // GET_X_LPARAM
// get the current state of SHIFT/CTRL/ALT keys
inline bool wxIsModifierDown(int vk)
{
@@ -900,10 +891,6 @@ inline wxString wxGetFullModuleName()
// return the run-time version of the OS in a format similar to
// WINVER/_WIN32_WINNT compile-time macros:
//
// 0x0300 Windows NT 3.51
// 0x0400 Windows 95, NT4
// 0x0410 Windows 98
// 0x0500 Windows ME, 2000
// 0x0501 Windows XP, 2003
// 0x0502 Windows XP SP2, 2003 SP1
// 0x0600 Windows Vista, 2008
@@ -1095,7 +1082,6 @@ extern WXDLLIMPEXP_CORE wxWindow *wxGetWindowFromHWND(WXHWND hwnd);
// Get the size of an icon
extern WXDLLIMPEXP_CORE wxSize wxGetHiconSize(HICON hicon);
// Lines are drawn differently for WinCE and regular WIN32
WXDLLIMPEXP_CORE void wxDrawLine(HDC hdc, int x1, int y1, int x2, int y2);
// fill the client rect of the given window on the provided dc using this brush

4
include/wx/msw/registry.h
View File

@@ -52,9 +52,9 @@ public:
HKCU, // current user
HKLM, // local machine
HKUSR, // users
HKPD, // performance data (WinNT/2K only)
HKPD, // (obsolete under XP and later)
HKCC, // current config
HKDD, // dynamic data (Win95/98 only)
HKDD, // (obsolete under XP and later)
HKMAX
};

2
include/wx/msw/toolbar.h
View File

@@ -1,6 +1,6 @@
/////////////////////////////////////////////////////////////////////////////
// Name: wx/msw/toolbar.h
// Purpose: wxToolBar (Windows 95 toolbar) class
// Purpose: wxToolBar class
// Author: Julian Smart
// Modified by:
// Created: 01/02/97

1
include/wx/notebook.h
View File

@@ -48,7 +48,6 @@ enum
#define wxNB_FIXEDWIDTH 0x0100
#define wxNB_MULTILINE 0x0200
#define wxNB_NOPAGETHEME 0x0400
#define wxNB_FLAT 0x0800
typedef wxWindow wxNotebookPage; // so far, any window can be a page

20
include/wx/platinfo.h
View File

@@ -30,10 +30,10 @@ enum wxOperatingSystemId
wxOS_MAC_OSX_DARWIN = 1 << 1, // Apple Mac OS X with Unix paths
wxOS_MAC = wxOS_MAC_OS|wxOS_MAC_OSX_DARWIN,
wxOS_WINDOWS_9X = 1 << 2, // Windows 9x family (95/98/ME)
wxOS_WINDOWS_NT = 1 << 3, // Windows NT family (NT/2000/XP)
wxOS_WINDOWS_MICRO = 1 << 4, // MicroWindows
wxOS_WINDOWS_CE = 1 << 5, // Windows CE (Window Mobile)
wxOS_WINDOWS_9X = 1 << 2, // obsolete
wxOS_WINDOWS_NT = 1 << 3, // obsolete
wxOS_WINDOWS_MICRO = 1 << 4, // obsolete
wxOS_WINDOWS_CE = 1 << 5, // obsolete
wxOS_WINDOWS = wxOS_WINDOWS_9X |
wxOS_WINDOWS_NT |
wxOS_WINDOWS_MICRO |
@@ -56,8 +56,8 @@ enum wxOperatingSystemId
// 1<<13 and 1<<14 available for other Unix flavours
wxOS_DOS = 1 << 15, // Microsoft DOS
wxOS_OS2 = 1 << 16 // OS/2
wxOS_DOS = 1 << 15, // obsolete
wxOS_OS2 = 1 << 16 // obsolete
};
// list of wxWidgets ports - some of them can be used with more than
@@ -70,15 +70,15 @@ enum wxPortId
wxPORT_MSW = 1 << 1, // wxMSW, native toolkit is Windows API
wxPORT_MOTIF = 1 << 2, // wxMotif, using [Open]Motif or Lesstif
wxPORT_GTK = 1 << 3, // wxGTK, using GTK+ 1.x, 2.x, GPE or Maemo
wxPORT_GTK = 1 << 3, // wxGTK, using GTK+ 1.x, 2.x, 3.x
wxPORT_DFB = 1 << 4, // wxDFB, using wxUniversal
wxPORT_X11 = 1 << 5, // wxX11, using wxUniversal
wxPORT_PM = 1 << 6, // wxOS2, using OS/2 Presentation Manager
wxPORT_OS2 = wxPORT_PM, // wxOS2, using OS/2 Presentation Manager
wxPORT_PM = 1 << 6, // obsolete
wxPORT_OS2 = wxPORT_PM, // obsolete
wxPORT_MAC = 1 << 7, // wxOSX (former wxMac), using Cocoa or iPhone API
wxPORT_OSX = wxPORT_MAC, // wxOSX, using Cocoa or iPhone API
wxPORT_COCOA = 1 << 8, // wxCocoa, using Cocoa NextStep/Mac API
wxPORT_WINCE = 1 << 9, // wxWinCE, toolkit is WinCE SDK API
wxPORT_WINCE = 1 << 9, // obsolete
wxPORT_QT = 1 << 10 // wxQT, using QT4
};

2
include/wx/scopeguard.h
View File

@@ -1,6 +1,6 @@
///////////////////////////////////////////////////////////////////////////////
// Name: wx/scopeguard.h
// Purpose: declares wxwxScopeGuard and related macros
// Purpose: declares wxScopeGuard and related macros
// Author: Vadim Zeitlin
// Modified by:
// Created: 03.07.2003

17
include/wx/setup_inc.h
View File

@@ -1268,15 +1268,14 @@
// Metafiles support
// ----------------------------------------------------------------------------
// Windows supports the graphics format known as metafile which is, though not
// portable, is widely used under Windows and so is supported by wxWin (under
// Windows only, of course). Win16 (Win3.1) used the so-called "Window
// MetaFiles" or WMFs which were replaced with "Enhanced MetaFiles" or EMFs in
// Win32 (Win9x, NT, 2000). Both of these are supported in wxWin and, by
// default, WMFs will be used under Win16 and EMFs under Win32. This may be
// changed by setting wxUSE_WIN_METAFILES_ALWAYS to 1 and/or setting
// wxUSE_ENH_METAFILE to 0. You may also set wxUSE_METAFILE to 0 to not compile
// in any metafile related classes at all.
// Windows supports the graphics format known as metafile which, though not
// portable, is widely used under Windows and so is supported by wxWidgets
// (under Windows only, of course). Both the so-called "Window MetaFiles" or
// WMFs, and "Enhanced MetaFiles" or EMFs are supported in wxWin and, by
// default, EMFs will be used. This may be changed by setting
// wxUSE_WIN_METAFILES_ALWAYS to 1 and/or setting wxUSE_ENH_METAFILE to 0.
// You may also set wxUSE_METAFILE to 0 to not compile in any metafile
// related classes at all.
//
// Default is 1 for wxUSE_ENH_METAFILE and 0 for wxUSE_WIN_METAFILES_ALWAYS.
//

2
include/wx/slider.h
View File

@@ -87,7 +87,7 @@ public:
virtual int GetThumbLength() const = 0;
// warning: most of subsequent methods are currently only implemented in
// wxMSW under Win95 and are silently ignored on other platforms
// wxMSW and are silently ignored on other platforms
void SetTickFreq(int freq) { DoSetTickFreq(freq); }
virtual int GetTickFreq() const { return 0; }

2
include/wx/thread.h
View File

@@ -863,7 +863,7 @@ public:
// wxApp then should block all "dangerous" messages
extern bool WXDLLIMPEXP_BASE wxIsWaitingForThread();
#endif
#endif // MSW, OS/2
#endif // MSW, OSX
#endif // wxUSE_THREADS

4
include/wx/thrimpl.cpp
View File

@@ -71,8 +71,8 @@ wxMutexError wxMutex::Unlock()
// wxConditionInternal
// --------------------------------------------------------------------------
// Win32 and OS/2 don't have explicit support for the POSIX condition
// variables and their events/event semaphores have quite different semantics,
// Win32 doesn't have explicit support for the POSIX condition
// variables and its events/event semaphores have quite different semantics,
// so we reimplement the conditions from scratch using the mutexes and
// semaphores
#if defined(__WINDOWS__)

3
include/wx/toolbar.h
View File

@@ -27,9 +27,6 @@ enum
wxTB_VERTICAL = wxVERTICAL, // == 0x0008
wxTB_LEFT = wxTB_VERTICAL,
// show 3D buttons (wxToolBarSimple only)
wxTB_3DBUTTONS = 0x0010,
// "flat" buttons (Win32/GTK only)
wxTB_FLAT = 0x0020,

2
include/wx/utils.h
View File

@@ -197,7 +197,7 @@ WXDLLIMPEXP_CORE wxMouseState wxGetMouseState();
* A custom platform symbol:
*
* #define stPDA 100
* #ifdef __WXWINCE__
* #ifdef __WXMSW__
* wxPlatform::AddPlatform(stPDA);
* #endif
*

2
include/wx/wxcrtbase.h
View File

@@ -614,7 +614,7 @@ WXDLLIMPEXP_BASE size_t wxCRT_StrftimeW(wchar_t *s, size_t max,
#define wxCRT_ToupperW towupper
#endif
#else /* !__GLIBC__ */
/* There is a bug in MSVC RTL: toxxx() functions dosn't do anything
/* There is a bug in MSVC RTL: toxxx() functions don't do anything
with signed chars < 0, so "fix" it here. */
#define wxCRT_TolowerW(c) towlower((wxUChar)(wxChar)(c))
#define wxCRT_ToupperW(c) towupper((wxUChar)(wxChar)(c))