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))

7
interface/wx/msw/registry.h
View File

@@ -81,7 +81,8 @@ public:
WOW64ViewMode viewMode = WOW64ViewMode_Default);
/**
The constructor to set the full name of the key using one of the
standard keys, that is, HKCR, HKCU, HKLM, HKUSR, HKPD, HKCC or HKDD.
standard keys, that is, HKCR, HKCU, HKLM, HKUSR, HKPD (obsolete),
HKCC or HKDD (obsolete).
The @a viewMode parameter is new since wxWidgets 2.9.2.
*/
wxRegKey(StdKey keyParent, const wxString& strKey,
@@ -110,9 +111,9 @@ public:
HKCU, ///< HKEY_CURRENT_USER
HKLM, ///< HKEY_LOCAL_MACHINE
HKUSR, ///< HKEY_USERS
HKPD, ///< HKEY_PERFORMANCE_DATA
HKPD, ///< HKEY_PERFORMANCE_DATA (Obsolete under XP and later)
HKCC, ///< HKEY_CURRENT_CONFIG
HKDD, ///< HKEY_DYN_DATA (Obsolete)
HKDD, ///< HKEY_DYN_DATA (Obsolete under XP and later)
HKMAX
};

2
samples/sample.rc4
View File

@@ -1,2 +0,0 @@
ICON 1 PRELOAD "..\\sample_os2.ico"
RCINCLUDE "..\\..\\include\\wx\\os2\\wx.rc"

2
samples/sample.rcO
View File

@@ -1,2 +0,0 @@
ICON 1 PRELOAD "..\\sample_os2.ico"
RCINCLUDE "..\\..\\include\\wx\\os2\\wx.rc"

BIN
samples/sample_os2.ico
View File

Binary file not shown.

2
src/common/combocmn.cpp
View File

@@ -2306,7 +2306,7 @@ void wxComboCtrlBase::ShowPopup()
// by, for instance, adding check to window.cpp:wxWindowMSW::MSWProcessMessage
// that if transient popup is open, then tab traversal is to be ignored.
// However, I think this code would still be needed for cases where
// transient popup doesn't work yet (wxWinCE?).
// transient popup doesn't work yet.
wxWindow* mainCtrl = GetMainWindowOfCompositeControl();
wxWindow* parent = mainCtrl->GetParent();
int parentFlags = parent->GetWindowStyle();

2
src/common/dcbase.cpp
View File

@@ -1320,8 +1320,6 @@ It uses wxDCBase::CalculateEllipticPoints(...) and wxDCBase::Rotate(...),
which are also new.
All methods are generic, so they can be implemented in wxDCBase.
DoDrawEllipticArcRot(...) is virtual, so it can be called from deeper
methods like (WinCE) wxDC::DoDrawArc(...).
CalculateEllipticPoints(...) fills a given list of wxPoints with some points
of an elliptic arc. The algorithm is pixel-based: In every row (in flat

7
src/common/filefn.cpp
View File

@@ -1163,7 +1163,7 @@ bool wxMkdir(const wxString& dir, int perm)
#if defined(__WXMAC__) && !defined(__UNIX__)
if ( mkdir(dir.fn_str(), 0) != 0 )
// assume mkdir() has 2 args on non Windows-OS/2 platforms and on Windows too
// assume mkdir() has 2 args on all platforms
// for the GNU compiler
#elif (!defined(__WINDOWS__)) || \
(defined(__GNUWIN32__) && !defined(__MINGW32__)) || \
@@ -1175,7 +1175,7 @@ bool wxMkdir(const wxString& dir, int perm)
#else
if ( mkdir(wxFNCONV(dirname), perm) != 0 )
#endif
#else // !MSW and !OS/2 VAC++
#else // MSW and VC++
wxUnusedVar(perm);
if ( wxMkDir(dir.fn_str()) != 0 )
#endif // !MSW/MSW
@@ -1599,8 +1599,7 @@ int WXDLLIMPEXP_BASE wxParseCommonDialogsFilter(const wxString& filterStr,
static bool wxCheckWin32Permission(const wxString& path, DWORD access)
{
// quoting the MSDN: "To obtain a handle to a directory, call the
// CreateFile function with the FILE_FLAG_BACKUP_SEMANTICS flag", but this
// doesn't work under Win9x/ME but then it's not needed there anyhow
// CreateFile function with the FILE_FLAG_BACKUP_SEMANTICS flag"
const DWORD dwAttr = ::GetFileAttributes(path.t_str());
if ( dwAttr == INVALID_FILE_ATTRIBUTES )
{

2
src/common/filename.cpp
View File

@@ -668,7 +668,7 @@ wxFileSystemObjectExists(const wxString& path, int flags)
// Anything else must be a file (perhaps we should check for
// FILE_ATTRIBUTE_REPARSE_POINT?)
return acceptFile;
#else // Non-MSW, non-OS/2
#else // Non-MSW
wxStructStat st;
if ( !StatAny(st, strPath, flags) )
return false;

2
src/common/imagbmp.cpp
View File

@@ -1032,7 +1032,7 @@ bool wxBMPHandler::LoadDib(wxImage *image, wxInputStream& stream,
}
// Bitmap files come in old v1 format using BITMAPCOREHEADER or a newer
// format (typically BITMAPV5HEADER, in use since Windows 98, but we don't
// format (typically BITMAPV5HEADER, but we don't
// really support any features specific to later formats such as gamma
// correction or ICC profiles, so it doesn't matter much to us).
const bool usesV1 = hdrSize == 12;

1
src/common/nbkbase.cpp
View File

@@ -80,7 +80,6 @@ wxFLAGS_MEMBER(wxBK_LEFT)
wxFLAGS_MEMBER(wxBK_RIGHT)
wxFLAGS_MEMBER(wxBK_BOTTOM)
wxFLAGS_MEMBER(wxNB_NOPAGETHEME)
wxFLAGS_MEMBER(wxNB_FLAT)
wxEND_FLAGS( wxNotebookStyle )
#if wxUSE_EXTENDED_RTTI

21
src/common/platinfo.cpp
View File

@@ -42,15 +42,17 @@ static wxPlatformInfo gs_platInfo(wxPORT_UNKNOWN);
// constants
// ----------------------------------------------------------------------------
// Keep "Unknown" entries to avoid breaking the indexes
static const wxChar* const wxOperatingSystemIdNames[] =
{
wxT("Apple Mac OS"),
wxT("Apple Mac OS X"),
wxT("Microsoft Windows 9X"),
wxT("Unknown"), // STL build: cannot use _() to translate strings here
wxT("Microsoft Windows NT"),
wxT("Microsoft Windows Micro"),
wxT("Microsoft Windows CE"),
wxT("Unknown"),
wxT("Unknown"),
wxT("Linux"),
wxT("FreeBSD"),
@@ -64,8 +66,8 @@ static const wxChar* const wxOperatingSystemIdNames[] =
wxT("Other Unix"),
wxT("Other Unix"),
wxT("DOS"),
wxT("OS/2"),
wxT("Unknown"),
wxT("Unknown"),
};
@@ -77,10 +79,10 @@ static const wxChar* const wxPortIdNames[] =
wxT("wxGTK"),
wxT("wxDFB"),
wxT("wxX11"),
wxT("wxOS2"),
wxT("Unknown"),
wxT("wxMac"),
wxT("wxCocoa"),
wxT("wxWinCE"),
wxT("Unknown"),
wxT("wxQT")
};
@@ -239,10 +241,6 @@ wxString wxPlatformInfo::GetOperatingSystemFamilyName(wxOperatingSystemId os)
string = wxT("Windows");
else if ( os & wxOS_UNIX )
string = wxT("Unix");
else if ( os == wxOS_DOS )
string = wxT("DOS");
else if ( os == wxOS_OS2 )
string = wxT("OS/2");
return string;
}
@@ -377,4 +375,3 @@ wxEndianness wxPlatformInfo::GetEndianness(const wxString& end)
return wxENDIAN_INVALID;
}

7
src/common/quantize.cpp
View File

@@ -678,7 +678,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.
@@ -697,9 +697,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.
*/

2
src/generic/dirctrlg.cpp
View File

@@ -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)

2
src/generic/filedlgg.cpp
View File

@@ -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

5
src/msw/bitmap.cpp
View File

@@ -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 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):
//

8
src/msw/button.cpp
View File

@@ -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.

7
src/msw/combobox.cpp
View File

@@ -394,13 +394,8 @@ WXHWND wxComboBox::GetEditHWNDIfAvailable() const
return (WXHWND) ::ChildWindowFromPoint(GetHwnd(), pt);
}
// notice that a slightly safer alternative could be to use FindWindowEx()
// but it's not available under WinCE so just take the first child for now
// to keep one version of the code for all platforms and fix it later if
// problems are discovered
// we assume that the only child of the combobox is the edit window
return (WXHWND)::GetWindow(GetHwnd(), GW_CHILD);
return (WXHWND)::FindWindowEx(GetHwnd(), NULL, wxT("EDIT"), NULL);
}
WXHWND wxComboBox::GetEditHWND() const

6
src/msw/control.cpp
View File

@@ -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;

8
src/msw/dc.cpp
View File

@@ -1430,7 +1430,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 )
@@ -2339,11 +2339,7 @@ bool wxMSWDCImpl::DoStretchBlit(wxCoord xdest, wxCoord ydest,
dwRop
) == (int)GDI_ERROR )
{
// On Win9x this API fails most (all?) of the time, so
// logging it becomes quite distracting. Since it falls
// back to the code below this is not really serious, so
// don't log it.
//wxLogLastError(wxT("StretchDIBits"));
wxLogLastError(wxT("StretchDIBits"));
}
else
{

4
src/msw/dcclient.cpp
View File

@@ -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 )

7
src/msw/dialup.cpp
View File

@@ -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 )
{

11
src/msw/dib.cpp
View File

@@ -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));

12
src/msw/display.cpp
View File

@@ -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.
// The first parameter of EnumDisplaySettings() must be NULL according
// to MSDN, in order to specify the current display on the computer
// on which the calling thread is running.
const wxString name = GetName();
const wxChar * const deviceName = name.empty()
? (const wxChar*)NULL
@@ -288,9 +288,9 @@ wxArrayVideoModes wxDisplayMSW::GetModes(const wxVideoMode& modeMatch) const
{
wxArrayVideoModes modes;
// 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.
// The first parameter of EnumDisplaySettings() must be NULL according
// to MSDN, in order to specify the current display on the computer
// on which the calling thread is running.
const wxString name = GetName();
const wxChar * const deviceName = name.empty()
? (const wxChar*)NULL

9
src/msw/frame.cpp
View File

@@ -675,11 +675,10 @@ void wxFrame::IconizeChildFrames(bool bIconize)
{
wxWindow *win = node->GetData();
// iconizing the frames with this style under Win95 shell 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
// of them
// iconizing the frames with this style 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 of them
if ( win->GetWindowStyle() & wxFRAME_TOOL_WINDOW )
continue;

25
src/msw/mediactrl_am.cpp
View File

@@ -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}};

13
src/msw/menuitem.cpp
View File

@@ -1323,14 +1323,10 @@ void wxMenuItem::GetColourToUse(wxODStatus stat, wxColour& colText, wxColour& co
bool wxMenuItem::MSWMustUseOwnerDrawn()
{
// MIIM_BITMAP only works under WinME/2000+ so we always use owner
// drawn item under the previous versions and we also have to use
// them in any case if the item has custom colours or font
static const wxWinVersion winver = wxGetWinVersion();
bool mustUseOwnerDrawn = winver < wxWinVersion_98 ||
GetTextColour().IsOk() ||
GetBackgroundColour().IsOk() ||
GetFont().IsOk();
// we have to use owner drawn item if it has custom colours or font
bool mustUseOwnerDrawn = GetTextColour().IsOk() ||
GetBackgroundColour().IsOk() ||
GetFont().IsOk();
// Windows XP or earlier don't display menu bitmaps bigger than
// standard size correctly (they're truncated) nor can
@@ -1339,6 +1335,7 @@ bool wxMenuItem::MSWMustUseOwnerDrawn()
// doesn't seem to have any problems with even very large bitmaps
// so don't use owner-drawn items unnecessarily there (Vista wasn't
// actually tested but I assume it works as 7 rather than as XP).
static const wxWinVersion winver = wxGetWinVersion();
if ( !mustUseOwnerDrawn && winver < wxWinVersion_Vista )
{
const wxBitmap& bmpUnchecked = GetBitmap(false),

9
src/msw/registry.cpp
View File

@@ -49,7 +49,7 @@
typedef unsigned char *RegString;
typedef BYTE* RegBinary;
#ifndef HKEY_PERFORMANCE_DATA
#ifndef HKEY_PERFORMANCE_DATA // (Obsolete under XP and later)
#define HKEY_PERFORMANCE_DATA ((HKEY)0x80000004)
#endif
@@ -57,7 +57,7 @@ typedef BYTE* RegBinary;
#define HKEY_CURRENT_CONFIG ((HKEY)0x80000005)
#endif
#ifndef HKEY_DYN_DATA
#ifndef HKEY_DYN_DATA // (Obsolete under XP and later)
#define HKEY_DYN_DATA ((HKEY)0x80000006)
#endif
@@ -83,9 +83,9 @@ aStdKeys[] =
{ HKEY_CURRENT_USER, wxT("HKEY_CURRENT_USER"), wxT("HKCU") },
{ HKEY_LOCAL_MACHINE, wxT("HKEY_LOCAL_MACHINE"), wxT("HKLM") },
{ HKEY_USERS, wxT("HKEY_USERS"), wxT("HKU") }, // short name?
{ HKEY_PERFORMANCE_DATA, wxT("HKEY_PERFORMANCE_DATA"), wxT("HKPD") },
{ HKEY_PERFORMANCE_DATA, wxT("HKEY_PERFORMANCE_DATA"), wxT("HKPD") }, // (Obsolete under XP and later)
{ HKEY_CURRENT_CONFIG, wxT("HKEY_CURRENT_CONFIG"), wxT("HKCC") },
{ HKEY_DYN_DATA, wxT("HKEY_DYN_DATA"), wxT("HKDD") }, // short name?
{ HKEY_DYN_DATA, wxT("HKEY_DYN_DATA"), wxT("HKDD") }, // (Obsolete under XP and later)
};
// the registry name separator (perhaps one day MS will change it to '/' ;-)
@@ -486,7 +486,6 @@ bool wxRegKey::Create(bool bOkIfExists)
HKEY tmpKey;
DWORD disposition;
// Minimum supported OS for RegCreateKeyEx: Win 95, Win NT 3.1, Win CE 1.0
m_dwLastError = RegCreateKeyEx((HKEY) m_hRootKey, m_strKey.t_str(),
0, // reserved and must be 0
NULL, // The user-defined class type of this key.

2
src/msw/settings.cpp
View File

@@ -75,7 +75,7 @@ static wxFont *gs_fontDefault = NULL;
// from GetSystemMetric, and should it? Perhaps call it GetSystemParameter
// and pass an optional void* arg to get further info.
// Should also have SetSystemParameter.
// Also implement WM_WININICHANGE (NT) / WM_SETTINGCHANGE (Win95)
// Also implement WM_WININICHANGE
// ----------------------------------------------------------------------------
// wxSystemSettingsModule

2
src/msw/slider.cpp
View File

@@ -1,6 +1,6 @@
/////////////////////////////////////////////////////////////////////////////
// Name: src/msw/slider.cpp
// Purpose: wxSlider, using the Win95 (and later) trackbar control
// Purpose: wxSlider, using trackbar control
// Author: Julian Smart
// Modified by:
// Created: 04/01/98

4
src/msw/stackwalk.cpp
View File

@@ -200,8 +200,8 @@ void wxStackWalker::WalkFrom(const CONTEXT *pCtx, size_t skip, size_t maxDepth)
// according to MSDN, the first parameter should be just a unique value and
// not process handle (although the parameter is prototyped as "HANDLE
// hProcess") and actually it advises to use the process id and not handle
// for Win9x, but then we need to use the same value in StackWalk() call
// hProcess") and actually it advises to use the process id and not handle,
// but then we need to use the same value in StackWalk() call
// below which should be a real handle... so this is what we use
const HANDLE hProcess = ::GetCurrentProcess();

12
src/msw/statbmp.cpp
View File

@@ -121,14 +121,10 @@ bool wxStaticBitmap::Create(wxWindow *parent,
// GetBestSize will work properly now, so set the best size if needed
SetInitialSize(size);
// painting manually is reported not to work under Windows CE (see #10093),
// so don't do it there even if this probably means that alpha is not
// supported there -- but at least bitmaps without alpha appear correctly
// Windows versions before XP (and even XP if the application has no
// manifest and so the old comctl32.dll is used) don't draw correctly the
// images with alpha channel so we need to draw them ourselves and it's
// easier to just always do it rather than check if we have an image with
// alpha or not
// if the application has no manifest and so the old comctl32.dll is
// used, the images with alpha channel are not correctly drawn so we need
// to draw them ourselves and it's easier to just always do it rather than
// check if we have an image with alpha or not
if ( wxTheApp->GetComCtl32Version() < 600 )
{
Connect(wxEVT_PAINT, wxPaintEventHandler(wxStaticBitmap::DoPaintManually));

3
src/msw/statbox.cpp
View File

@@ -39,6 +39,9 @@
#include "wx/sysopt.h"
#include "wx/msw/uxtheme.h"
#include <windowsx.h> // needed by GET_X_LPARAM and GET_Y_LPARAM macros
#include "wx/msw/private.h"
#include "wx/msw/missing.h"
#include "wx/msw/dc.h"

3
src/msw/toolbar.cpp
View File

@@ -49,7 +49,10 @@
#include "wx/rawbmp.h"
#include "wx/scopedarray.h"
#include <windowsx.h> // needed by GET_X_LPARAM and GET_Y_LPARAM macros
#include "wx/msw/private.h"
#include "wx/msw/winundef.h"
#include "wx/msw/dc.h"
#include "wx/msw/dib.h"

3
src/msw/treectrl.cpp
View File

@@ -36,7 +36,10 @@
#include "wx/settings.h"
#endif
#include <windowsx.h> // needed by GET_X_LPARAM and GET_Y_LPARAM macros
#include "wx/msw/private.h"
#include "wx/msw/winundef.h"
#include "wx/imaglist.h"
#include "wx/itemattr.h"

114
src/msw/utils.cpp
View File

@@ -228,7 +228,7 @@ bool wxGetUserId(wxChar *buf,
DWORD nSize = maxSize;
if ( ::GetUserName(buf, &nSize) == 0 )
{
// actually, it does happen on Win9x if the user didn't log on
// actually, it does happen if the user didn't log on
DWORD res = ::GetEnvironmentVariable(wxT("username"), buf, maxSize);
if ( res == 0 )
{
@@ -1074,80 +1074,25 @@ wxString wxGetOsDescription()
const OSVERSIONINFOEXW info = wxGetWindowsVersionInfo();
switch ( info.dwPlatformId )
{
#ifdef VER_PLATFORM_WIN32_CE
case VER_PLATFORM_WIN32_CE:
str.Printf(_("Windows CE (%d.%d)"),
info.dwMajorVersion,
info.dwMinorVersion);
break;
#endif
case VER_PLATFORM_WIN32s:
str = _("Win32s on Windows 3.1");
break;
case VER_PLATFORM_WIN32_WINDOWS:
switch (info.dwMinorVersion)
{
case 0:
if ( info.szCSDVersion[1] == 'B' ||
info.szCSDVersion[1] == 'C' )
{
str = _("Windows 95 OSR2");
}
else
{
str = _("Windows 95");
}
break;
case 10:
if ( info.szCSDVersion[1] == 'B' ||
info.szCSDVersion[1] == 'C' )
{
str = _("Windows 98 SE");
}
else
{
str = _("Windows 98");
}
break;
case 90:
str = _("Windows ME");
break;
default:
str.Printf(_("Windows 9x (%d.%d)"),
info.dwMajorVersion,
info.dwMinorVersion);
break;
}
if ( !wxIsEmpty(info.szCSDVersion) )
{
str << wxT(" (") << info.szCSDVersion << wxT(')');
}
break;
case VER_PLATFORM_WIN32_NT:
switch ( info.dwMajorVersion )
{
case 5:
switch ( info.dwMinorVersion )
{
case 0:
str = _("Windows 2000");
break;
case 2:
// we can't distinguish between XP 64 and 2003
// as they both are 5.2, so examine the product
// type to resolve this ambiguity
if ( wxIsWindowsServer() == 1 )
{
str = _("Windows Server 2003");
str = "Windows Server 2003";
break;
}
//else: must be XP, fall through
case 1:
str = _("Windows XP");
str = "Windows XP";
break;
}
break;
@@ -1157,40 +1102,40 @@ wxString wxGetOsDescription()
{
case 0:
str = wxIsWindowsServer() == 1
? _("Windows Server 2008")
: _("Windows Vista");
? "Windows Server 2008"
: "Windows Vista";
break;
case 1:
str = wxIsWindowsServer() == 1
? _("Windows Server 2008 R2")
: _("Windows 7");
? "Windows Server 2008 R2"
: "Windows 7";
break;
case 2:
str = wxIsWindowsServer() == 1
? _("Windows Server 2012")
: _("Windows 8");
? "Windows Server 2012"
: "Windows 8";
break;
case 3:
str = wxIsWindowsServer() == 1
? _("Windows Server 2012 R2")
: _("Windows 8.1");
? "Windows Server 2012 R2"
: "Windows 8.1";
break;
}
break;
case 10:
str = wxIsWindowsServer() == 1
? _("Windows Server 2016")
: _("Windows 10");
? "Windows Server 2016"
: "Windows 10";
break;
}
if ( str.empty() )
{
str.Printf(_("Windows NT %lu.%lu"),
str.Printf("Windows %lu.%lu",
info.dwMajorVersion,
info.dwMinorVersion);
}
@@ -1260,11 +1205,6 @@ wxOperatingSystemId wxGetOsVersion(int *verMaj, int *verMin, int *verMicro)
{
case VER_PLATFORM_WIN32_NT:
s_version.os = wxOS_WINDOWS_NT;
break;
case VER_PLATFORM_WIN32_WINDOWS:
s_version.os = wxOS_WINDOWS_9X;
break;
}
s_version.verMaj = info.dwMajorVersion;
@@ -1310,38 +1250,12 @@ wxWinVersion wxGetWinVersion()
verMin;
switch ( wxGetOsVersion(&verMaj, &verMin) )
{
case wxOS_WINDOWS_9X:
if ( verMaj == 4 )
{
switch ( verMin )
{
case 0:
return wxWinVersion_95;
case 10:
return wxWinVersion_98;
case 90:
return wxWinVersion_ME;
}
}
break;
case wxOS_WINDOWS_NT:
switch ( verMaj )
{
case 3:
return wxWinVersion_NT3;
case 4:
return wxWinVersion_NT4;
case 5:
switch ( verMin )
{
case 0:
return wxWinVersion_2000;
case 1:
return wxWinVersion_XP;

3
src/msw/window.cpp
View File

@@ -296,8 +296,7 @@ static void EnsureParentHasControlParentStyle(wxWindow *parent)
// GetCursorPos can return an error, so use this function
// instead.
// Error originally observed with WinCE, but later using Remote Desktop
// to connect to XP.
// Error observed when using Remote Desktop to connect to XP.
void wxGetCursorPosMSW(POINT* pt)
{
if (!GetCursorPos(pt))

1
src/unix/dialup.cpp
View File

@@ -550,7 +550,6 @@ wxDialUpManagerImpl::NetConnection wxDialUpManagerImpl::CheckConnectAndPing()
wxDialUpManagerImpl::NetConnection wxDialUpManagerImpl::CheckConnect()
{
// second method: try to connect to a well known host:
// This can be used under Win 9x, too!
struct hostent *hp;
struct sockaddr_in serv_addr;

1
src/unix/net.cpp
View File

@@ -382,7 +382,6 @@ wxDialUpManagerImpl::CheckStatusInternal(void)
}
// second method: try to connect to well known host:
// This can be used under Win 9x, too!
struct hostent *hp;
struct sockaddr_in serv_addr;
int sockfd;

356
src/x11/makefile.unx
View File

@@ -1,356 +0,0 @@
##############################################################################
# Microwindows template Makefile
# Copyright (c) 2000 Martin Jolicoeur, Greg Haerr
##############################################################################
TOP=$(MICROWINDOWS)
ifeq "$(MICROWINDOWS)" ""
TOP=/home/julians/local/microwindows/microwindows-0.89pre8/src
endif
CONFIG = $(TOP)/config
WXDIR = ../..
OBJSUFF = o
SRCSUFF = cpp
WXLIB=$(WXDIR)/lib/libwx.a
AROPTIONS = ruv
RANLIB = ranlib
RM = rm -f
GENDIR = $(WXDIR)/src/generic
COMMDIR = $(WXDIR)/src/common
HTMLDIR = $(WXDIR)/src/html
ZLIBDIR = $(WXDIR)/src/zlib
PNGDIR = $(WXDIR)/src/png
JPEGDIR = $(WXDIR)/src/jpeg
TIFFDIR = $(WXDIR)/src/tiff
OLEDIR = $(WXDIR)/src/msw/ole
MICROWINDIR = $(WXDIR)/src/msw
UNIXDIR = $(WXDIR)/src/unix
UNIVDIR = $(WXDIR)/src/univ
ZLIBLIB = $(WXDIR)/lib/libzlib.a
PNGLIB = $(WXDIR)/lib/libpng.a
JPEGLIB = $(WXDIR)/lib/libjpeg.a
TIFFLIB = $(WXDIR)/lib/libtiff.a
GENERICOBJS = \
$(GENDIR)/accel.$(OBJSUFF) \
$(GENDIR)/busyinfo.$(OBJSUFF) \
$(GENDIR)/calctrl.$(OBJSUFF) \
$(GENDIR)/choicdgg.$(OBJSUFF) \
$(GENDIR)/colrdlgg.$(OBJSUFF) \
$(GENDIR)/dirctrlg.$(OBJSUFF) \
$(GENDIR)/dragimgg.$(OBJSUFF) \
$(GENDIR)/fontdlgg.$(OBJSUFF) \
$(GENDIR)/grid.$(OBJSUFF) \
$(GENDIR)/gridctrl.$(OBJSUFF) \
$(GENDIR)/gridsel.$(OBJSUFF) \
$(GENDIR)/imaglist.$(OBJSUFF) \
$(GENDIR)/laywin.$(OBJSUFF) \
$(GENDIR)/listctrl.$(OBJSUFF) \
$(GENDIR)/logg.$(OBJSUFF) \
$(GENDIR)/msgdlgg.$(OBJSUFF) \
$(GENDIR)/numdlgg.$(OBJSUFF) \
$(GENDIR)/panelg.$(OBJSUFF) \
$(GENDIR)/progdlgg.$(OBJSUFF) \
$(GENDIR)/sashwin.$(OBJSUFF) \
$(GENDIR)/scrlwing.$(OBJSUFF) \
$(GENDIR)/spinctlg.$(OBJSUFF) \
$(GENDIR)/splash.$(OBJSUFF) \
$(GENDIR)/splitter.$(OBJSUFF) \
$(GENDIR)/tabg.$(OBJSUFF) \
$(GENDIR)/tbarsmpl.$(OBJSUFF) \
$(GENDIR)/textdlgg.$(OBJSUFF) \
$(GENDIR)/tipdlg.$(OBJSUFF) \
$(GENDIR)/tipwin.$(OBJSUFF) \
$(GENDIR)/treectlg.$(OBJSUFF) \
$(GENDIR)/treelay.$(OBJSUFF) \
$(GENDIR)/wizard.$(OBJSUFF)
COMMONOBJS = \
$(COMMDIR)/appcmn.$(OBJSUFF) \
$(COMMDIR)/choiccmn.$(OBJSUFF) \
$(COMMDIR)/clntdata.$(OBJSUFF) \
$(COMMDIR)/clipcmn.$(OBJSUFF) \
$(COMMDIR)/cmdline.$(OBJSUFF) \
$(COMMDIR)/cmdproc.$(OBJSUFF) \
$(COMMDIR)/cmndata.$(OBJSUFF) \
$(COMMDIR)/config.$(OBJSUFF) \
$(COMMDIR)/containr.$(OBJSUFF) \
$(COMMDIR)/cshelp.$(OBJSUFF) \
$(COMMDIR)/ctrlcmn.$(OBJSUFF) \
$(COMMDIR)/ctrlsub.$(OBJSUFF) \
$(COMMDIR)/datetime.$(OBJSUFF) \
$(COMMDIR)/datstrm.$(OBJSUFF) \
$(COMMDIR)/dcbase.$(OBJSUFF) \
$(COMMDIR)/dircmn.$(OBJSUFF) \
$(COMMDIR)/dlgcmn.$(OBJSUFF) \
$(COMMDIR)/dobjcmn.$(OBJSUFF) \
$(COMMDIR)/docview.$(OBJSUFF) \
$(COMMDIR)/dynarray.$(OBJSUFF) \
$(COMMDIR)/dynlib.$(OBJSUFF) \
$(COMMDIR)/effects.$(OBJSUFF) \
$(COMMDIR)/encconv.$(OBJSUFF) \
$(COMMDIR)/event.$(OBJSUFF) \
$(COMMDIR)/extended.$(OBJSUFF) \
$(COMMDIR)/ffile.$(OBJSUFF) \
$(COMMDIR)/file.$(OBJSUFF) \
$(COMMDIR)/fileconf.$(OBJSUFF) \
$(COMMDIR)/filefn.$(OBJSUFF) \
$(COMMDIR)/filename.$(OBJSUFF) \
$(COMMDIR)/filesys.$(OBJSUFF) \
$(COMMDIR)/fontcmn.$(OBJSUFF) \
$(COMMDIR)/fontmap.$(OBJSUFF) \
$(COMMDIR)/framecmn.$(OBJSUFF) \
$(COMMDIR)/gaugecmn.$(OBJSUFF) \
$(COMMDIR)/gdicmn.$(OBJSUFF) \
$(COMMDIR)/geometry.$(OBJSUFF) \
$(COMMDIR)/gifdecod.$(OBJSUFF) \
$(COMMDIR)/hash.$(OBJSUFF) \
$(COMMDIR)/helpbase.$(OBJSUFF) \
$(COMMDIR)/imagall.$(OBJSUFF) \
$(COMMDIR)/imagbmp.$(OBJSUFF) \
$(COMMDIR)/image.$(OBJSUFF) \
$(COMMDIR)/imaggif.$(OBJSUFF) \
$(COMMDIR)/imagjpeg.$(OBJSUFF) \
$(COMMDIR)/imagpcx.$(OBJSUFF) \
$(COMMDIR)/imagpng.$(OBJSUFF) \
$(COMMDIR)/imagpnm.$(OBJSUFF) \
$(COMMDIR)/imagtiff.$(OBJSUFF) \
$(COMMDIR)/imagxpm.$(OBJSUFF) \
$(COMMDIR)/intl.$(OBJSUFF) \
$(COMMDIR)/ipcbase.$(OBJSUFF) \
$(COMMDIR)/layout.$(OBJSUFF) \
$(COMMDIR)/lboxcmn.$(OBJSUFF) \
$(COMMDIR)/list.$(OBJSUFF) \
$(COMMDIR)/log.$(OBJSUFF) \
$(COMMDIR)/longlong.$(OBJSUFF) \
$(COMMDIR)/matrix.$(OBJSUFF) \
$(COMMDIR)/memory.$(OBJSUFF) \
$(COMMDIR)/menucmn.$(OBJSUFF) \
$(COMMDIR)/mimecmn.$(OBJSUFF) \
$(COMMDIR)/module.$(OBJSUFF) \
$(COMMDIR)/mstream.$(OBJSUFF) \
$(COMMDIR)/nbkbase.$(OBJSUFF) \
$(COMMDIR)/object.$(OBJSUFF) \
$(COMMDIR)/paper.$(OBJSUFF) \
$(COMMDIR)/popupcmn.$(OBJSUFF) \
$(COMMDIR)/prntbase.$(OBJSUFF) \
$(COMMDIR)/process.$(OBJSUFF) \
$(COMMDIR)/quantize.$(OBJSUFF) \
$(COMMDIR)/radiocmn.$(OBJSUFF) \
$(COMMDIR)/resource.$(OBJSUFF) \
$(COMMDIR)/sizer.$(OBJSUFF) \
$(COMMDIR)/statbar.$(OBJSUFF) \
$(COMMDIR)/strconv.$(OBJSUFF) \
$(COMMDIR)/stream.$(OBJSUFF) \
$(COMMDIR)/string.$(OBJSUFF) \
$(COMMDIR)/sysopt.$(OBJSUFF) \
$(COMMDIR)/tbarbase.$(OBJSUFF) \
$(COMMDIR)/textbuf.$(OBJSUFF) \
$(COMMDIR)/textcmn.$(OBJSUFF) \
$(COMMDIR)/textfile.$(OBJSUFF) \
$(COMMDIR)/timercmn.$(OBJSUFF) \
$(COMMDIR)/tokenzr.$(OBJSUFF) \
$(COMMDIR)/toplvcmn.$(OBJSUFF) \
$(COMMDIR)/treebase.$(OBJSUFF) \
$(COMMDIR)/txtstrm.$(OBJSUFF) \
$(COMMDIR)/utilscmn.$(OBJSUFF) \
$(UNIXDIR)/utilsunx.$(OBJSUFF) \
$(COMMDIR)/valgen.$(OBJSUFF) \
$(COMMDIR)/validate.$(OBJSUFF) \
$(COMMDIR)/valtext.$(OBJSUFF) \
$(COMMDIR)/variant.$(OBJSUFF) \
$(COMMDIR)/wfstream.$(OBJSUFF) \
$(COMMDIR)/wincmn.$(OBJSUFF) \
$(COMMDIR)/wxchar.$(OBJSUFF) \
$(COMMDIR)/xpmdecod.$(OBJSUFF)
HTMLOBJS = \
$(HTMLDIR)/helpctrl.$(OBJSUFF) \
$(HTMLDIR)/helpdata.$(OBJSUFF) \
$(HTMLDIR)/helpfrm.$(OBJSUFF) \
$(HTMLDIR)/htmlcell.$(OBJSUFF) \
$(HTMLDIR)/htmlfilt.$(OBJSUFF) \
$(HTMLDIR)/htmlpars.$(OBJSUFF) \
$(HTMLDIR)/htmltag.$(OBJSUFF) \
$(HTMLDIR)/htmlwin.$(OBJSUFF) \
$(HTMLDIR)/htmprint.$(OBJSUFF) \
$(HTMLDIR)/m_dflist.$(OBJSUFF) \
$(HTMLDIR)/m_fonts.$(OBJSUFF) \
$(HTMLDIR)/m_hline.$(OBJSUFF) \
$(HTMLDIR)/m_image.$(OBJSUFF) \
$(HTMLDIR)/m_layout.$(OBJSUFF) \
$(HTMLDIR)/m_links.$(OBJSUFF) \
$(HTMLDIR)/m_list.$(OBJSUFF) \
$(HTMLDIR)/m_meta.$(OBJSUFF) \
$(HTMLDIR)/m_pre.$(OBJSUFF) \
$(HTMLDIR)/m_tables.$(OBJSUFF) \
$(HTMLDIR)/winpars.$(OBJSUFF)
MSWOBJS = \
$(MICROWINDIR)/app.$(OBJSUFF) \
$(MICROWINDIR)/bitmap.$(OBJSUFF) \
$(MICROWINDIR)/brush.$(OBJSUFF) \
$(MICROWINDIR)/caret.$(OBJSUFF) \
$(MICROWINDIR)/clipbrd.$(OBJSUFF) \
$(MICROWINDIR)/colour.$(OBJSUFF) \
$(MICROWINDIR)/cursor.$(OBJSUFF) \
$(MICROWINDIR)/data.$(OBJSUFF) \
$(MICROWINDIR)/dc.$(OBJSUFF) \
$(MICROWINDIR)/dcclient.$(OBJSUFF) \
$(MICROWINDIR)/dcmemory.$(OBJSUFF) \
$(MICROWINDIR)/dcprint.$(OBJSUFF) \
$(MICROWINDIR)/dcscreen.$(OBJSUFF) \
$(MICROWINDIR)/dde.$(OBJSUFF) \
$(MICROWINDIR)/dialog.$(OBJSUFF) \
$(MICROWINDIR)/dialup.$(OBJSUFF) \
$(UNIXDIR)/dir.$(OBJSUFF) \
$(MICROWINDIR)/evtloop.$(OBJSUFF) \
$(MICROWINDIR)/font.$(OBJSUFF) \
$(MICROWINDIR)/fontenum.$(OBJSUFF) \
$(MICROWINDIR)/fontutil.$(OBJSUFF) \
$(MICROWINDIR)/gdiimage.$(OBJSUFF) \
$(MICROWINDIR)/gdiobj.$(OBJSUFF) \
$(MICROWINDIR)/icon.$(OBJSUFF) \
$(MICROWINDIR)/main.$(OBJSUFF) \
$(MICROWINDIR)/microwin.$(OBJSUFF) \
$(MICROWINDIR)/palette.$(OBJSUFF) \
$(MICROWINDIR)/pen.$(OBJSUFF) \
$(MICROWINDIR)/region.$(OBJSUFF) \
$(MICROWINDIR)/settings.$(OBJSUFF) \
$(MICROWINDIR)/snglinst.$(OBJSUFF) \
$(MICROWINDIR)/thread.$(OBJSUFF) \
$(MICROWINDIR)/timer.$(OBJSUFF) \
$(MICROWINDIR)/toplevel.$(OBJSUFF) \
$(MICROWINDIR)/utils.$(OBJSUFF) \
$(MICROWINDIR)/window.$(OBJSUFF) \
$(OLEDIR)/dataobj.$(OBJSUFF)
UNIVOBJS_TODO = $(UNIVDIR)/choice.$(OBJSUFF) \
$(UNIVDIR)/colordlg.$(OBJSUFF) \
UNIVOBJS = \
$(UNIVDIR)/bmpbuttn.$(OBJSUFF) \
$(UNIVDIR)/button.$(OBJSUFF) \
$(UNIVDIR)/checkbox.$(OBJSUFF) \
$(UNIVDIR)/checklst.$(OBJSUFF) \
$(UNIVDIR)/colschem.$(OBJSUFF) \
$(UNIVDIR)/combobox.$(OBJSUFF) \
$(UNIVDIR)/control.$(OBJSUFF) \
$(UNIVDIR)/framuniv.$(OBJSUFF) \
$(UNIVDIR)/gauge.$(OBJSUFF) \
$(UNIVDIR)/inphand.$(OBJSUFF) \
$(UNIVDIR)/inpcons.$(OBJSUFF) \
$(UNIVDIR)/listbox.$(OBJSUFF) \
$(UNIVDIR)/menu.$(OBJSUFF) \
$(UNIVDIR)/notebook.$(OBJSUFF) \
$(UNIVDIR)/radiobox.$(OBJSUFF) \
$(UNIVDIR)/radiobut.$(OBJSUFF) \
$(UNIVDIR)/renderer.$(OBJSUFF) \
$(UNIVDIR)/scrarrow.$(OBJSUFF) \
$(UNIVDIR)/scrolbar.$(OBJSUFF) \
$(UNIVDIR)/scrthumb.$(OBJSUFF) \
$(UNIVDIR)/slider.$(OBJSUFF) \
$(UNIVDIR)/spinbutt.$(OBJSUFF) \
$(UNIVDIR)/statbmp.$(OBJSUFF) \
$(UNIVDIR)/statbox.$(OBJSUFF) \
$(UNIVDIR)/statline.$(OBJSUFF) \
$(UNIVDIR)/stattext.$(OBJSUFF) \
$(UNIVDIR)/statusbr.$(OBJSUFF) \
$(UNIVDIR)/textctrl.$(OBJSUFF) \
$(UNIVDIR)/theme.$(OBJSUFF) \
$(UNIVDIR)/topluniv.$(OBJSUFF) \
$(UNIVDIR)/winuniv.$(OBJSUFF) \
$(UNIVDIR)/themes/gtk.$(OBJSUFF) \
$(UNIVDIR)/themes/win32.$(OBJSUFF)
include $(CONFIG)
######################## Additional Flags section ############################
# Directories list for header files
INCLUDEDIRS += -I$(WXDIR)/include
# Defines for preprocessor
DEFINES += -DMWIN -D__WXMSW__ -D__WXMICROWIN__ -D__WXUNIVERSAL__ -D__WIN32__ -D__WIN95__ -DHAVE_BOOL -DMICROWIN_TODO=1 -D__UNIX__ -DHAVE_NANOSLEEP -DMICROWIN_NOCONTROLS -D__WXDEBUG__ -DwxSIZE_T_IS_UINT
# Compilation flags for C files OTHER than include directories
CFLAGS +=
# Preprocessor flags OTHER than defines
CPPFLAGS +=
# Linking flags
LDFLAGS +=
############################# targets section ################################
# If you want to create a library with the objects files, define the name here
LIBNAME =
# If we put it below OBJS=, Makefile.rules includes .depend
# and it continually looks for .c files to satisfy .o.cpp
# dependency. What's going on there?
include $(TOP)/Makefile.rules
# List of objects to compile
OBJS = $(COMMONOBJS) $(MSWOBJS) $(GENERICOBJS) $(UNIVOBJS)
all: $(WXLIB)
######################### Makefile.rules section #############################
######################## Tools targets section ###############################
#ntest: $(OBJS) $(NANOXCLIENTLIBS) $(TOP)/config
# $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -o $@ $(NANOXCLIENTLIBS)
$(WXLIB): $(OBJS)
ar $(AROPTIONS) $@ $(OBJS)
$(RANLIB) $@
#.SUFFIXES: .cpp .cxx .c
#.c.o:
# $(CC) -c $(CFLAGS) $(CFLAGS) -o $@ $*.c
.cxx.o:
$(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $*.cxx
.cpp.o:
$(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $*.cpp
#$(COMMDIR)/appcmn.o: $(COMMDIR)/appcmn.cpp
# $(CC) -c $(CPPFLAGS) -o $@ $*.cpp
#appcmn.o: $(COMMDIR)/appcmn.cpp
# $(CC) $(CPPFLAGS) -c -o $@ $<
cleanwx:
-$(RM) *.o
-$(RM) *.bak
-$(RM) core
-$(RM) ole/*.o
-$(RM) ../common/y_tab.c
-$(RM) ../common/lex_yy.c
-$(RM) ../common/*.o
-$(RM) ../common/*.bak
-$(RM) ../generic/*.o
-$(RM) ../generic/*.bak
-$(RM) ../univ/*.o
-$(RM) ../univ/*.bak
-$(RM) ../univ/themes/*.o
-$(RM) ../univ/themes/*.bak
-$(RM) ../unix/*.o
-$(RM) ../unix/*.bak
-$(RM) ../html/*.o
-$(RM) ../zlib/*.o
-$(RM) ../zlib/*.bak
-$(RM) ../png/*.o
-$(RM) ../png/*.bak
-$(RM) ../jpeg/*.o
-$(RM) ../jpeg/*.bak
-$(RM) ../tiff/*.o
-$(RM) ../tiff/*.bak

1
src/xrc/xh_toolb.cpp
View File

@@ -36,7 +36,6 @@ wxToolBarXmlHandler::wxToolBarXmlHandler()
XRC_ADD_STYLE(wxTB_DOCKABLE);
XRC_ADD_STYLE(wxTB_VERTICAL);
XRC_ADD_STYLE(wxTB_HORIZONTAL);
XRC_ADD_STYLE(wxTB_3DBUTTONS);
XRC_ADD_STYLE(wxTB_TEXT);
XRC_ADD_STYLE(wxTB_NOICONS);
XRC_ADD_STYLE(wxTB_NODIVIDER);

2
tests/drawing/fonttest.cpp
View File

@@ -60,7 +60,7 @@ void GraphicsContextDrawingTestCase::DoFontDrawings (wxGraphicsContext *gc)
gc->DrawText( wxT("That is text"), 20, 10, wxDegToRad(-45), gbTextBackground );
// use wxSWISS_FONT and not wxNORMAL_FONT as the latter can't be rotated
// under Win9x (it is not TrueType)
// (it is not TrueType)
gc->SetFont( wxFont(wxFontInfo(12).Family(wxFONTFAMILY_SWISS)), *wxBLACK );
wxString text;

2
utils/emulator/src/emulator.cpp
View File

@@ -46,7 +46,7 @@
// resources
// ----------------------------------------------------------------------------
// the application icon (under Windows and OS/2 it is in resources)
// the application icon (under Windows it is in resources)
#ifndef wxHAS_IMAGES_IN_RESOURCES
#include "emulator.xpm"
#endif