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

Removed obsolete symbols from comments.

Browse Source
This commit is contained in:
Catalin
2016-02-21 10:39:19 +02:00
parent cd4942bf8a
commit 338629e314
19 changed files with 38 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/filefn.h
View File

@@ -592,7 +592,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
@@ -601,7 +601,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.
*/

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

@@ -58,8 +58,7 @@ class wxMSWListItemData;
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.
@@ -67,9 +66,6 @@ class wxMSWListItemData;
- 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.
@@ -251,12 +247,6 @@ public:
wxImageList *GetImageList(int which) const;
// 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);
void AssignImageList(wxImageList *imageList, int which);

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

@@ -900,10 +900,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 +1091,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

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

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

@@ -1249,15 +1249,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__)

2
include/wx/utils.h
View File

@@ -196,7 +196,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

@@ -597,7 +597,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))

2
src/common/combocmn.cpp
View File

@@ -2303,7 +2303,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();

7
src/common/filefn.cpp
View File

@@ -1157,7 +1157,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__)) || \
@@ -1169,7 +1169,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
@@ -1617,8 +1617,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;