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

Source cleaning: whitespaces, tabs, -1/wxID_ANY/wxDefaultCoord, TRUE/true, FALSE/false.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29230 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-09-20 11:31:49 +00:00
parent a203f6c099
commit 7e548f6b13
16 changed files with 129 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/wx/notebook.h
View File

@@ -116,19 +116,19 @@ END_DECLARE_EVENT_TYPES()
typedef void (wxEvtHandler::*wxNotebookEventFunction)(wxNotebookEvent&);
#define EVT_NOTEBOOK_PAGE_CHANGED(winid, fn) \
DECLARE_EVENT_TABLE_ENTRY( \
wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, \
DECLARE_EVENT_TABLE_ENTRY( \
wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, \
winid, \
-1, \
wxID_ANY, \
(wxObjectEventFunction)(wxEventFunction) wxStaticCastEvent( wxNotebookEventFunction, &fn ), \
NULL \
NULL \
),
#define EVT_NOTEBOOK_PAGE_CHANGING(winid, fn) \
DECLARE_EVENT_TABLE_ENTRY( \
wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, \
DECLARE_EVENT_TABLE_ENTRY( \
wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, \
winid, \
-1, \
wxID_ANY, \
(wxObjectEventFunction)(wxEventFunction) wxStaticCastEvent( wxNotebookEventFunction, &fn ), \
NULL \
),

10
include/wx/object.h
View File

@@ -73,7 +73,7 @@ public:
, m_baseInfo1(baseInfo1)
, m_baseInfo2(baseInfo2)
, m_next(sm_first)
{
{
sm_first = this;
Register();
}
@@ -114,7 +114,7 @@ public:
wxDEPRECATED( static void CleanUpClasses() );
#endif
static void CleanUp();
public:
const wxChar *m_className;
int m_objectSize;
@@ -140,8 +140,8 @@ private:
static wxClassInfo *GetBaseByName(const wxChar *name);
DECLARE_NO_COPY_CLASS(wxClassInfo)
protected:
protected:
// registers the class
void Register();
void Unregister();
@@ -547,7 +547,7 @@ public:
// get the runtime identity of this object
wxClassInfo *GetClassInfo() const
{
return wx_const_cast(wxClassInfo *, m_classInfo);
return wx_const_cast(wxClassInfo *, m_classInfo);
}
wxObject* GetSuperClassInstance() const

30
include/wx/ownerdrw.h
View File

@@ -36,23 +36,23 @@ class WXDLLEXPORT wxOwnerDrawn
public:
// ctor & dtor
wxOwnerDrawn(const wxString& str = wxEmptyString,
bool bCheckable = FALSE,
bool bMenuItem = FALSE); // FIXME kludge for colors
bool bCheckable = false,
bool bMenuItem = false); // FIXME kludge for colors
virtual ~wxOwnerDrawn() { }
// fix appearance
void SetFont(const wxFont& font)
{ m_font = font; m_bOwnerDrawn = TRUE; }
{ m_font = font; m_bOwnerDrawn = true; }
wxFont& GetFont() const { return (wxFont &)m_font; }
void SetTextColour(const wxColour& colText)
{ m_colText = colText; m_bOwnerDrawn = TRUE; }
{ m_colText = colText; m_bOwnerDrawn = true; }
wxColour& GetTextColour() const { return (wxColour&) m_colText; }
void SetBackgroundColour(const wxColour& colBack)
{ m_colBack = colBack; m_bOwnerDrawn = TRUE; }
{ m_colBack = colBack; m_bOwnerDrawn = true; }
wxColour& GetBackgroundColour() const
{ return (wxColour&) m_colBack ; }
@@ -61,17 +61,17 @@ public:
const wxBitmap& bmpUnchecked = wxNullBitmap)
{ m_bmpChecked = bmpChecked;
m_bmpUnchecked = bmpUnchecked;
m_bOwnerDrawn = TRUE; }
m_bOwnerDrawn = true; }
void SetBitmap(const wxBitmap& bmpChecked)
{ m_bmpChecked = bmpChecked;
m_bOwnerDrawn = TRUE; }
m_bOwnerDrawn = true; }
void SetDisabledBitmap( const wxBitmap& bmpDisabled )
{ m_bmpDisabled = bmpDisabled;
m_bOwnerDrawn = TRUE; }
m_bOwnerDrawn = true; }
const wxBitmap& GetBitmap(bool bChecked = TRUE) const
const wxBitmap& GetBitmap(bool bChecked = true) const
{ return (bChecked ? m_bmpChecked : m_bmpUnchecked); }
const wxBitmap& GetDisabledBitmap() const
@@ -87,7 +87,7 @@ public:
{
ms_nLastMarginWidth = m_nMarginWidth = (size_t) nWidth;
if ( ((size_t) nWidth) != ms_nDefaultMarginWidth )
m_bOwnerDrawn = TRUE;
m_bOwnerDrawn = true;
}
int GetMarginWidth() const { return (int) m_nMarginWidth; }
@@ -103,16 +103,16 @@ public:
// menu item if not empty
void SetAccelString(const wxString& strAccel) { m_strAccel = strAccel; }
// this function might seem strange, but if it returns FALSE it means that
// this function might seem strange, but if it returns false it means that
// no non-standard attribute are set, so there is no need for this control
// to be owner-drawn. Moreover, you can force owner-drawn to FALSE if you
// to be owner-drawn. Moreover, you can force owner-drawn to false if you
// want to change, say, the color for the item but only if it is owner-drawn
// (see wxMenuItem::wxMenuItem for example)
bool IsOwnerDrawn() const { return m_bOwnerDrawn; }
// switch on/off owner-drawing the item
void SetOwnerDrawn(bool ownerDrawn = TRUE) { m_bOwnerDrawn = ownerDrawn; }
void ResetOwnerDrawn() { m_bOwnerDrawn = FALSE; }
void SetOwnerDrawn(bool ownerDrawn = true) { m_bOwnerDrawn = ownerDrawn; }
void ResetOwnerDrawn() { m_bOwnerDrawn = false; }
public:
// constants used in OnDrawItem
@@ -134,7 +134,7 @@ public:
wxODDefault = 0x0020 // item is the default item
};
// virtual functions to implement drawing (return TRUE if processed)
// virtual functions to implement drawing (return true if processed)
virtual bool OnMeasureItem(size_t *pwidth, size_t *pheight);
virtual bool OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODStatus stat);

2
include/wx/paper.h
View File

@@ -6,7 +6,7 @@
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_PAPERH__

6
include/wx/popupwin.h
View File

@@ -46,7 +46,7 @@ public:
virtual void Position(const wxPoint& ptOrigin,
const wxSize& size);
virtual bool IsTopLevel() const { return TRUE; }
virtual bool IsTopLevel() const { return true; }
DECLARE_NO_COPY_CLASS(wxPopupWindowBase)
};
@@ -97,9 +97,9 @@ public:
//
// VZ: where is this used??
virtual bool CanDismiss()
{ return TRUE; }
{ return true; }
// called when a mouse is pressed while the popup is shown: return TRUE
// called when a mouse is pressed while the popup is shown: return true
// from here to prevent its normal processing by the popup (which consists
// in dismissing it if the mouse is cilcked outside it)
virtual bool ProcessLeftDown(wxMouseEvent& event);

10
include/wx/prntbase.h
View File

@@ -63,22 +63,22 @@ public:
wxPrintDialogData& GetPrintDialogData() const
{ return (wxPrintDialogData&) m_printDialogData; }
bool GetAbort() const { return sm_abortIt; }
static wxPrinterError GetLastError() { return sm_lastError; }
///////////////////////////////////////////////////////////////////////////
// OVERRIDES
virtual bool Setup(wxWindow *parent) = 0;
virtual bool Print(wxWindow *parent, wxPrintout *printout, bool prompt = TRUE) = 0;
virtual bool Print(wxWindow *parent, wxPrintout *printout, bool prompt = true) = 0;
virtual wxDC* PrintDialog(wxWindow *parent) = 0;
protected:
wxPrintDialogData m_printDialogData;
wxPrintout* m_currentPrintout;
static wxPrinterError sm_lastError;
public:
static wxWindow* sm_abortWindow;
static bool sm_abortIt;
@@ -407,7 +407,7 @@ public:
const wxSize& size = wxDefaultSize,
long style = 0,
const wxString& name = wxT("dialog"))
: wxDialog(parent, -1, title, pos, size, style, name)
: wxDialog(parent, wxID_ANY, title, pos, size, style, name)
{
}

14
include/wx/process.h
View File

@@ -59,10 +59,10 @@ public:
// ctors
wxProcess(wxEvtHandler *parent = (wxEvtHandler *) NULL, int id = -1)
wxProcess(wxEvtHandler *parent = (wxEvtHandler *) NULL, int id = wxID_ANY)
{ Init(parent, id, wxPROCESS_DEFAULT); }
wxProcess(int flags) { Init(NULL, -1, flags); }
wxProcess(int flags) { Init(NULL, wxID_ANY, flags); }
virtual ~wxProcess();
@@ -72,7 +72,7 @@ public:
// call this before passing the object to wxExecute() to redirect the
// launched process stdin/stdout, then use GetInputStream() and
// GetOutputStream() to get access to them
void Redirect() { m_redirect = TRUE; }
void Redirect() { m_redirect = true; }
bool IsRedirected() const { return m_redirect; }
// detach from the parent - should be called by the parent if it's deleted
@@ -88,10 +88,10 @@ public:
// close the output stream indicating that nothing more will be written
void CloseOutput() { delete m_outputStream; m_outputStream = NULL; }
// return TRUE if the child process stdout is not closed
// return true if the child process stdout is not closed
bool IsInputOpened() const;
// return TRUE if any input is available on the child process stdout/err
// return true if any input is available on the child process stdout/err
bool IsInputAvailable() const;
bool IsErrorAvailable() const;
@@ -108,7 +108,7 @@ public:
// for backwards compatibility only, don't use
#if WXWIN_COMPATIBILITY_2_2
wxProcess(wxEvtHandler *parent, bool redirect)
{ Init(parent, -1, redirect ? wxPROCESS_REDIRECT : wxPROCESS_DEFAULT); }
{ Init(parent, wxID_ANY, redirect ? wxPROCESS_REDIRECT : wxPROCESS_DEFAULT); }
#endif // WXWIN_COMPATIBILITY_2_2
protected:
@@ -170,7 +170,7 @@ typedef void (wxEvtHandler::*wxProcessEventFunction)(wxProcessEvent&);
#define EVT_END_PROCESS(id, func) \
DECLARE_EVENT_TABLE_ENTRY( \
wxEVT_END_PROCESS, id, -1, \
wxEVT_END_PROCESS, id, wxID_ANY, \
(wxObjectEventFunction) (wxEventFunction) wxStaticCastEvent( wxProcessEventFunction, & func ), NULL),
#endif

2
include/wx/ptr_scpd.h
View File

@@ -10,7 +10,7 @@
/////////////////////////////////////////////////////////////////////////////
// This class closely follows the implementation of the boost
// library scoped_ptr and is an adaption for c++ macro's in
// library scoped_ptr and is an adaption for c++ macro's in
// the wxWidgets project. The original authors of the boost
// scoped_ptr are given below with their respective copyrights.

2
include/wx/quantize.h
View File

@@ -65,7 +65,7 @@ DECLARE_DYNAMIC_CLASS(wxQuantize)
//// Helpers
// Converts input bitmap(s) into 8bit representation with custom palette
// in_rows and out_rows are arrays [0..h-1] of pointer to rows
// (in_rows contains w * 3 bytes per row, out_rows w bytes per row)
// fills out_rows with indexes into palette (which is also stored into palette variable)