Source cleaning: -1/wxID_ANY/wxDefaultCoord, ::, !!, TRUE/true, FALSE/false, whitespaces, tabs.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28966 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -6,7 +6,7 @@
|
||||
// Created: 01/02/97
|
||||
// RCS-ID: $Id$
|
||||
// Copyright: (c) Julian Smart
|
||||
// Licence: wxWindows licence
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef _WX_JOYSTICK_H_
|
||||
|
@@ -91,7 +91,7 @@ public:
|
||||
virtual int FindString(const wxString& s) const;
|
||||
|
||||
virtual bool IsSelected(int n) const;
|
||||
virtual void SetSelection(int n, bool select = TRUE);
|
||||
virtual void SetSelection(int n, bool select = true);
|
||||
virtual int GetSelection() const;
|
||||
virtual int GetSelections(wxArrayInt& aSelections) const;
|
||||
|
||||
|
@@ -90,7 +90,7 @@ public:
|
||||
wxListCtrl() { Init(); }
|
||||
|
||||
wxListCtrl(wxWindow *parent,
|
||||
wxWindowID id = -1,
|
||||
wxWindowID id = wxID_ANY,
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
const wxSize& size = wxDefaultSize,
|
||||
long style = wxLC_ICON,
|
||||
@@ -105,7 +105,7 @@ public:
|
||||
virtual ~wxListCtrl();
|
||||
|
||||
bool Create(wxWindow *parent,
|
||||
wxWindowID id = -1,
|
||||
wxWindowID id = wxID_ANY,
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
const wxSize& size = wxDefaultSize,
|
||||
long style = wxLC_ICON,
|
||||
@@ -214,7 +214,7 @@ public:
|
||||
long GetTopItem() const ;
|
||||
|
||||
// Add or remove a single window style
|
||||
void SetSingleStyle(long style, bool add = TRUE) ;
|
||||
void SetSingleStyle(long style, bool add = true) ;
|
||||
|
||||
// Set the whole window style
|
||||
void SetWindowStyleFlag(long style) ;
|
||||
@@ -280,7 +280,7 @@ public:
|
||||
|
||||
// Find an item whose label matches this string, starting from the item after 'start'
|
||||
// or the beginning if 'start' is -1.
|
||||
long FindItem(long start, const wxString& str, bool partial = FALSE);
|
||||
long FindItem(long start, const wxString& str, bool partial = false);
|
||||
|
||||
// Find an item whose data matches this data, starting from the item after 'start'
|
||||
// or the beginning if 'start' is -1.
|
||||
@@ -390,10 +390,10 @@ protected:
|
||||
// ListView_GetItemCount
|
||||
bool m_ignoreChangeMessages;
|
||||
|
||||
// TRUE if we have any internal data (user data & attributes)
|
||||
// true if we have any internal data (user data & attributes)
|
||||
bool m_AnyInternalData;
|
||||
|
||||
// TRUE if we have any items with custom attributes
|
||||
// true if we have any items with custom attributes
|
||||
bool m_hasAnyAttr;
|
||||
|
||||
// these functions are only used for virtual list view controls, i.e. the
|
||||
|
@@ -106,7 +106,7 @@ protected:
|
||||
wxMDIChildFrame * m_currentChild;
|
||||
wxMenu* m_windowMenu;
|
||||
|
||||
// TRUE if MDI Frame is intercepting commands, not child
|
||||
// true if MDI Frame is intercepting commands, not child
|
||||
bool m_parentFrameActive;
|
||||
|
||||
private:
|
||||
@@ -148,10 +148,10 @@ public:
|
||||
long style = wxDEFAULT_FRAME_STYLE,
|
||||
const wxString& name = wxFrameNameStr);
|
||||
|
||||
virtual bool IsTopLevel() const { return FALSE; }
|
||||
virtual bool IsTopLevel() const { return false; }
|
||||
|
||||
// MDI operations
|
||||
virtual void Maximize(bool maximize = TRUE);
|
||||
virtual void Maximize(bool maximize = true);
|
||||
virtual void Restore();
|
||||
virtual void Activate();
|
||||
|
||||
@@ -178,7 +178,7 @@ protected:
|
||||
virtual void DoGetPosition(int *x, int *y) const;
|
||||
virtual void DoSetClientSize(int width, int height);
|
||||
virtual void InternalSetMenuBar();
|
||||
virtual bool IsMDIChild() const { return TRUE; }
|
||||
virtual bool IsMDIChild() const { return true; }
|
||||
|
||||
virtual WXHICON GetDefaultIcon() const;
|
||||
|
||||
|
@@ -116,7 +116,7 @@ private:
|
||||
// terminate the current radio group, if any
|
||||
void EndRadioGroup();
|
||||
|
||||
// if TRUE, insert a breal before appending the next item
|
||||
// if true, insert a breal before appending the next item
|
||||
bool m_doBreak;
|
||||
|
||||
// the position of the first item in the current radio group or -1
|
||||
@@ -143,7 +143,7 @@ public :
|
||||
wxMenuInfo() { m_menu = NULL ; }
|
||||
virtual ~wxMenuInfo() { }
|
||||
|
||||
void Create( wxMenu *menu , const wxString &title )
|
||||
void Create( wxMenu *menu , const wxString &title )
|
||||
{ m_menu = menu ; m_title = title ; }
|
||||
wxMenu* GetMenu() const { return m_menu ; }
|
||||
wxString GetTitle() const { return m_title ; }
|
||||
@@ -159,7 +159,7 @@ WX_DECLARE_EXPORTED_LIST(wxMenuInfo, wxMenuInfoList );
|
||||
class WXDLLEXPORT wxMenuBar : public wxMenuBarBase
|
||||
{
|
||||
public:
|
||||
// ctors & dtor
|
||||
// ctors & dtor
|
||||
// default constructor
|
||||
wxMenuBar();
|
||||
// unused under MSW
|
||||
|
@@ -47,8 +47,8 @@ public:
|
||||
virtual void SetText(const wxString& strName);
|
||||
virtual void SetCheckable(bool checkable);
|
||||
|
||||
virtual void Enable(bool bDoEnable = TRUE);
|
||||
virtual void Check(bool bDoCheck = TRUE);
|
||||
virtual void Enable(bool bDoEnable = true);
|
||||
virtual void Check(bool bDoCheck = true);
|
||||
virtual bool IsChecked() const;
|
||||
|
||||
// unfortunately needed to resolve ambiguity between
|
||||
@@ -79,7 +79,7 @@ private:
|
||||
|
||||
// the positions of the first and last items of the radio group this item
|
||||
// belongs to or -1: start is the radio group start and is valid for all
|
||||
// but first radio group items (m_isRadioGroupStart == FALSE), end is valid
|
||||
// but first radio group items (m_isRadioGroupStart == false), end is valid
|
||||
// only for the first one
|
||||
union
|
||||
{
|
||||
|
@@ -106,7 +106,7 @@ public:
|
||||
virtual void SetMapMode(int mode);
|
||||
virtual void GetTextExtent(const wxString& string, long *x, long *y,
|
||||
long *descent = NULL, long *externalLeading = NULL,
|
||||
wxFont *theFont = NULL, bool use16bit = FALSE) const;
|
||||
wxFont *theFont = NULL, bool use16bit = false) const;
|
||||
|
||||
// Implementation
|
||||
wxMetafile *GetMetaFile() const { return m_metaFile; }
|
||||
@@ -133,7 +133,7 @@ private:
|
||||
bool WXDLLEXPORT wxMakeMetafilePlaceable(const wxString& filename, float scale = 1.0);
|
||||
|
||||
// Optional origin and extent
|
||||
bool WXDLLEXPORT wxMakeMetaFilePlaceable(const wxString& filename, int x1, int y1, int x2, int y2, float scale = 1.0, bool useOriginAndExtent = TRUE);
|
||||
bool WXDLLEXPORT wxMakeMetaFilePlaceable(const wxString& filename, int x1, int y1, int x2, int y2, float scale = 1.0, bool useOriginAndExtent = true);
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxMetafileDataObject is a specialization of wxDataObject for metafile data
|
||||
|
@@ -33,7 +33,7 @@ HCURSOR SetCursor(HCURSOR hCursor);
|
||||
int GetScrollPosWX (HWND hWnd, int iSBar);
|
||||
|
||||
BOOL ScrollWindow(HWND, int xAmount, int yAmount,
|
||||
CONST RECT* lpRect, CONST RECT* lpClipRect);
|
||||
CONST RECT* lpRect, CONST RECT* lpClipRect);
|
||||
|
||||
HWND WindowFromPoint(POINT pt);
|
||||
SHORT GetKeyState(int nVirtKey);
|
||||
@@ -51,7 +51,7 @@ COLORREF GetTextColor(HDC hdc);
|
||||
COLORREF GetBkColor(HDC hdc);
|
||||
HPALETTE SelectPalette(HDC hdc, HPALETTE hPalette, BOOL b);
|
||||
BOOL IntersectClipRect(HDC hdc, int x, int y,
|
||||
int w, int h);
|
||||
int w, int h);
|
||||
BOOL GetClipBox(HDC hdc, RECT* rect);
|
||||
BOOL DrawIconEx(HDC hdc, int x, int y, HICON hIcon, int w, int h, UINT istepIfAniCur, HBRUSH hbrFlickerFreeDraw, UINT diFlags);
|
||||
BOOL SetViewportExtEx(HDC hdc, int x, int y, LPSIZE lpSize);
|
||||
@@ -73,8 +73,8 @@ BOOL GetScrollPos (HWND hWnd, int iSBar, int* pPos);
|
||||
BOOL GetScrollRange (HWND hWnd, int iSBar, int* pMinPos, int* pMaxPos);
|
||||
BOOL SetScrollPos (HWND hWnd, int iSBar, int iNewPos);
|
||||
BOOL SetScrollRange (HWND hWnd, int iSBar, int iMinPos, int iMaxPos);
|
||||
BOOL SetScrollInfo (HWND hWnd, int iSBar,
|
||||
LPCSCROLLINFO lpsi, BOOL fRedraw);
|
||||
BOOL SetScrollInfo (HWND hWnd, int iSBar,
|
||||
LPCSCROLLINFO lpsi, BOOL fRedraw);
|
||||
BOOL GetScrollInfo(HWND hWnd, int iSBar, LPSCROLLINFO lpsi);
|
||||
BOOL ShowScrollBar (HWND hWnd, int iSBar, BOOL bShow);
|
||||
HBITMAP WINAPI
|
||||
|
@@ -57,10 +57,10 @@ public:
|
||||
bool Unassociate();
|
||||
|
||||
// set an arbitrary command, ask confirmation if it already exists and
|
||||
// overwriteprompt is TRUE
|
||||
// overwriteprompt is true
|
||||
bool SetCommand(const wxString& cmd,
|
||||
const wxString& verb,
|
||||
bool overwriteprompt = TRUE);
|
||||
bool overwriteprompt = true);
|
||||
|
||||
bool SetDefaultIcon(const wxString& cmd = wxEmptyString, int index = 0);
|
||||
|
||||
@@ -76,7 +76,7 @@ private:
|
||||
wxString GetVerbPath(const wxString& verb) const;
|
||||
|
||||
// check that the registry key for our extension exists, create it if it
|
||||
// doesn't, return FALSE if this failed
|
||||
// doesn't, return false if this failed
|
||||
bool EnsureExtKeyExists();
|
||||
|
||||
wxString m_strFileType, // may be empty
|
||||
@@ -107,10 +107,10 @@ public:
|
||||
size_t EnumAllFileTypes(wxArrayString& mimetypes);
|
||||
|
||||
// this are NOPs under Windows
|
||||
bool ReadMailcap(const wxString& WXUNUSED(filename), bool WXUNUSED(fallback) = TRUE)
|
||||
{ return TRUE; }
|
||||
bool ReadMailcap(const wxString& WXUNUSED(filename), bool WXUNUSED(fallback) = true)
|
||||
{ return true; }
|
||||
bool ReadMimeTypes(const wxString& WXUNUSED(filename))
|
||||
{ return TRUE; }
|
||||
{ return true; }
|
||||
|
||||
// create a new filetype association
|
||||
wxFileType *Associate(const wxFileTypeInfo& ftInfo);
|
||||
|
@@ -185,7 +185,7 @@ typedef struct {
|
||||
#endif
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// Toolbar define value missing
|
||||
// Toolbar define value missing
|
||||
// ----------------------------------------------------------------------------
|
||||
#if !defined(CCS_VERT)
|
||||
#define CCS_VERT 0x00000080L
|
||||
@@ -430,13 +430,13 @@ typedef struct {
|
||||
#define TVM_SETTEXTCOLOR (TV_FIRST + 30)
|
||||
#endif
|
||||
|
||||
#ifndef TVS_INFOTIP
|
||||
#ifndef TVS_INFOTIP
|
||||
#define TVS_INFOTIP 2048
|
||||
#endif
|
||||
|
||||
#ifndef TVN_GETINFOTIPA
|
||||
#define TVN_GETINFOTIPA (TVN_FIRST-13)
|
||||
#define TVN_GETINFOTIPW (TVN_FIRST-14)
|
||||
#define TVN_GETINFOTIPA (TVN_FIRST-13)
|
||||
#define TVN_GETINFOTIPW (TVN_FIRST-14)
|
||||
#endif
|
||||
|
||||
#ifndef TVN_GETINFOTIP
|
||||
@@ -497,24 +497,24 @@ typedef struct {
|
||||
#define HANGUL_CHARSET 129
|
||||
#endif
|
||||
|
||||
#ifndef TME_HOVER
|
||||
#define TME_HOVER 1
|
||||
#ifndef TME_HOVER
|
||||
#define TME_HOVER 1
|
||||
#endif
|
||||
|
||||
#ifndef TME_LEAVE
|
||||
#define TME_LEAVE 2
|
||||
#ifndef TME_LEAVE
|
||||
#define TME_LEAVE 2
|
||||
#endif
|
||||
|
||||
#ifndef TME_QUERY
|
||||
#define TME_QUERY 0x40000000
|
||||
#ifndef TME_QUERY
|
||||
#define TME_QUERY 0x40000000
|
||||
#endif
|
||||
|
||||
#ifndef TME_CANCEL
|
||||
#define TME_CANCEL 0x80000000
|
||||
#ifndef TME_CANCEL
|
||||
#define TME_CANCEL 0x80000000
|
||||
#endif
|
||||
|
||||
#ifndef HOVER_DEFAULT
|
||||
#define HOVER_DEFAULT 0xFFFFFFFF
|
||||
#ifndef HOVER_DEFAULT
|
||||
#define HOVER_DEFAULT 0xFFFFFFFF
|
||||
#endif
|
||||
|
||||
#ifdef __DMC__
|
||||
|
@@ -6,7 +6,7 @@
|
||||
// Created: 01/02/97
|
||||
// RCS-ID: $Id$
|
||||
// Copyright: (c) Julian Smart
|
||||
// Licence: wxWindows licence
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef _WX_MSGBOXDLG_H_
|
||||
|
@@ -17,7 +17,7 @@
|
||||
#include "wx/wxchar.h"
|
||||
|
||||
#if !wxUSE_UNICODE_MSLU
|
||||
inline bool wxUsingUnicowsDll() { return FALSE; }
|
||||
inline bool wxUsingUnicowsDll() { return false; }
|
||||
#else
|
||||
|
||||
// Returns true if we are running under Unicode emulation in Win9x environment.
|
||||
@@ -33,9 +33,9 @@ inline bool wxUsingUnicowsDll()
|
||||
|
||||
#if wxUSE_GUI
|
||||
|
||||
WXDLLEXPORT int wxMSLU_DrawStateW(WXHDC dc, WXHBRUSH br, WXFARPROC outputFunc,
|
||||
WXLPARAM lData, WXWPARAM wData,
|
||||
int x, int y, int cx, int cy,
|
||||
WXDLLEXPORT int wxMSLU_DrawStateW(WXHDC dc, WXHBRUSH br, WXFARPROC outputFunc,
|
||||
WXLPARAM lData, WXWPARAM wData,
|
||||
int x, int y, int cx, int cy,
|
||||
unsigned int flags);
|
||||
#define DrawStateW(dc, br, func, ld, wd, x, y, cx, cy, flags) \
|
||||
wxMSLU_DrawStateW((WXHDC)dc,(WXHBRUSH)br,(WXFARPROC)func, \
|
||||
|
Reference in New Issue
Block a user