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

removed SetAutoLayout(true) calls when a corresponding SetSizer() was also called (the latter already calls SetAutoLayout(true) in case of a non-NULL window); usual cleanup: removing tabs and end of line whitespace, TRUE->true, FALSE->false, -1->wxID_ANY, Enable(false)->Disable(), ""->wxEmptyString

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27764 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Dimitri Schoolwerth
2004-06-12 23:44:08 +00:00
parent 3d4875664f
commit dabbc6a5a1
47 changed files with 560 additions and 584 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/file.h
View File

@@ -82,7 +82,7 @@ public:
// open/close
// create a new file (with the default value of bOverwrite, it will fail if
// the file already exists, otherwise it will overwrite it and succeed)
bool Create(const wxChar *szFileName, bool bOverwrite = FALSE,
bool Create(const wxChar *szFileName, bool bOverwrite = false,
int access = wxS_DEFAULT);
bool Open(const wxChar *szFileName, OpenMode mode = read,
int access = wxS_DEFAULT);

30
include/wx/fontenum.h
View File

@@ -33,11 +33,11 @@ public:
// start enumerating font facenames (either all of them or those which
// support the given encoding) - will result in OnFacename() being
// called for each available facename (until they are exhausted or
// OnFacename returns FALSE)
// OnFacename returns false)
virtual bool EnumerateFacenames
(
wxFontEncoding encoding = wxFONTENCODING_SYSTEM, // all
bool fixedWidthOnly = FALSE
bool fixedWidthOnly = false
);
// enumerate the different encodings either for given font facename or for
@@ -46,43 +46,43 @@ public:
virtual bool EnumerateEncodings(const wxString& facename = wxEmptyString);
// callbacks which are called after one of EnumerateXXX() functions from
// above is invoked - all of them may return FALSE to stop enumeration or
// TRUE to continue with it
// above is invoked - all of them may return false to stop enumeration or
// true to continue with it
// called by EnumerateFacenames
virtual bool OnFacename(const wxString& facename)
{
{
if (m_Facenames == NULL) m_Facenames = new wxArrayString;
m_Facenames -> Add(facename);
return TRUE;
return true;
}
// called by EnumerateEncodings
virtual bool OnFontEncoding(const wxString& WXUNUSED(facename),
const wxString& encoding)
{
{
if (m_Encodings == NULL) m_Encodings = new wxArrayString;
m_Encodings -> Add(encoding);
return TRUE;
return true;
}
// convenience function that returns array of facenames. Cannot be called
// before EnumerateFacenames.
wxArrayString *GetFacenames()
wxArrayString *GetFacenames()
{ return m_Facenames; }
// convenience function that returns array of encodings.
// Cannot be called before EnumerateEncodings.
wxArrayString *GetEncodings()
wxArrayString *GetEncodings()
{ return m_Encodings; }
// virtual dtor for the base class
virtual ~wxFontEnumerator()
{
virtual ~wxFontEnumerator()
{
if (m_Facenames) delete m_Facenames;
if (m_Encodings) delete m_Encodings;
}
private:
wxArrayString *m_Facenames, *m_Encodings;

8
include/wx/generic/logg.h
View File

@@ -90,14 +90,14 @@ class WXDLLEXPORT wxLogWindow : public wxLogPassThrough
public:
wxLogWindow(wxFrame *pParent, // the parent frame (can be NULL)
const wxChar *szTitle, // the title of the frame
bool bShow = TRUE, // show window immediately?
bool bPassToOld = TRUE); // pass messages to the old target?
bool bShow = true, // show window immediately?
bool bPassToOld = true); // pass messages to the old target?
~wxLogWindow();
// window operations
// show/hide the log window
void Show(bool bShow = TRUE);
void Show(bool bShow = true);
// retrieve the pointer to the frame
wxFrame *GetFrame() const;
@@ -107,7 +107,7 @@ public:
virtual void OnFrameCreate(wxFrame *frame);
// called if the user closes the window interactively, will not be
// called if it is destroyed for another reason (such as when program
// exits) - return TRUE from here to allow the frame to close, FALSE
// exits) - return true from here to allow the frame to close, false
// to prevent this from happening
virtual bool OnFrameClose(wxFrame *frame);
// called right before the log frame is going to be deleted: will

4
include/wx/generic/progdlgg.h
View File

@@ -55,7 +55,7 @@ public:
@param newmsg if used, new message to display
@returns true if ABORT button has not been pressed
*/
virtual bool Update(int value, const wxString& newmsg = wxT(""));
virtual bool Update(int value, const wxString& newmsg = wxEmptyString);
/* Can be called to continue after the cancel button has been pressed, but
the program decided to continue the operation (e.g., user didn't
@@ -63,7 +63,7 @@ public:
*/
void Resume();
bool Show( bool show = TRUE );
bool Show( bool show = true );
protected:
// callback for optional abort button

6
include/wx/gtk/font.h
View File

@@ -51,7 +51,7 @@ public:
int family,
int style,
int weight,
bool underlined = FALSE,
bool underlined = false,
const wxString& face = wxEmptyString,
wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
{
@@ -64,7 +64,7 @@ public:
int family,
int style,
int weight,
bool underlined = FALSE,
bool underlined = false,
const wxString& face = wxEmptyString,
wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
@@ -95,7 +95,7 @@ public:
virtual void SetUnderlined( bool underlined );
virtual void SetEncoding(wxFontEncoding encoding);
virtual void SetNoAntiAliasing( bool no = TRUE );
virtual void SetNoAntiAliasing( bool no = true );
virtual bool GetNoAntiAliasing();
// implementation from now on

6
include/wx/gtk1/font.h
View File

@@ -51,7 +51,7 @@ public:
int family,
int style,
int weight,
bool underlined = FALSE,
bool underlined = false,
const wxString& face = wxEmptyString,
wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
{
@@ -64,7 +64,7 @@ public:
int family,
int style,
int weight,
bool underlined = FALSE,
bool underlined = false,
const wxString& face = wxEmptyString,
wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
@@ -95,7 +95,7 @@ public:
virtual void SetUnderlined( bool underlined );
virtual void SetEncoding(wxFontEncoding encoding);
virtual void SetNoAntiAliasing( bool no = TRUE );
virtual void SetNoAntiAliasing( bool no = true );
virtual bool GetNoAntiAliasing();
// implementation from now on

8
include/wx/html/helpfrm.h
View File

@@ -113,8 +113,8 @@ public:
// Displays help window and focuses index.
bool DisplayIndex();
// Searches for keyword. Returns TRUE and display page if found, return
// FALSE otherwise
// Searches for keyword. Returns true and display page if found, return
// false otherwise
// Syntax of keyword is Altavista-like:
// * words are separated by spaces
// (but "\"hello world\"" is only one world "hello world")
@@ -139,10 +139,10 @@ public:
// call this to let wxHtmlHelpFrame know page changed
void NotifyPageChanged();
// Refreshes Contents and Index tabs
void RefreshLists();
protected:
void Init(wxHtmlHelpData* data = NULL);

6
include/wx/motif/frame.h
View File

@@ -43,7 +43,7 @@ public:
virtual ~wxFrame();
virtual bool Show(bool show = TRUE);
virtual bool Show(bool show = true);
// Set menu bar
void SetMenuBar(wxMenuBar *menu_bar);
@@ -62,7 +62,7 @@ public:
// Create toolbar
#if wxUSE_TOOLBAR
virtual wxToolBar* CreateToolBar(long style = -1,
wxWindowID id = -1,
wxWindowID id = wxID_ANY,
const wxString& name = wxToolBarNameStr);
virtual void SetToolBar(wxToolBar *toolbar);
virtual void PositionToolBar();
@@ -74,7 +74,7 @@ public:
void OnSysColourChanged(wxSysColourChangedEvent& event);
void OnActivate(wxActivateEvent& event);
virtual void ChangeFont(bool keepOriginalSize = TRUE);
virtual void ChangeFont(bool keepOriginalSize = true);
virtual void ChangeBackgroundColour();
virtual void ChangeForegroundColour();
WXWidget GetMenuBarWidget() const;

6
include/wx/msw/font.h
View File

@@ -31,7 +31,7 @@ public:
int family,
int style,
int weight,
bool underlined = FALSE,
bool underlined = false,
const wxString& face = wxEmptyString,
wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
{
@@ -53,7 +53,7 @@ public:
int family,
int style,
int weight,
bool underlined = FALSE,
bool underlined = false,
const wxString& face = wxEmptyString,
wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
@@ -90,7 +90,7 @@ public:
virtual bool IsFree() const;
virtual bool RealizeResource();
virtual WXHANDLE GetResourceHandle() const;
virtual bool FreeResource(bool force = FALSE);
virtual bool FreeResource(bool force = false);
// for consistency with other wxMSW classes
WXHFONT GetHFONT() const;

28
include/wx/msw/treectrl.h
View File

@@ -69,7 +69,7 @@ public:
// --------
wxTreeCtrl() { Init(); }
wxTreeCtrl(wxWindow *parent, wxWindowID id = -1,
wxTreeCtrl(wxWindow *parent, wxWindowID id = wxID_ANY,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT,
@@ -81,7 +81,7 @@ public:
virtual ~wxTreeCtrl();
bool Create(wxWindow *parent, wxWindowID id = -1,
bool Create(wxWindow *parent, wxWindowID id = wxID_ANY,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT,
@@ -163,13 +163,13 @@ public:
// allow the user to expand the items which don't have any children now
// - but instead add them only when needed, thus minimizing memory
// usage and loading time.
void SetItemHasChildren(const wxTreeItemId& item, bool has = TRUE);
void SetItemHasChildren(const wxTreeItemId& item, bool has = true);
// the item will be shown in bold
void SetItemBold(const wxTreeItemId& item, bool bold = TRUE);
void SetItemBold(const wxTreeItemId& item, bool bold = true);
// the item will be shown with a drop highlight
void SetItemDropHighlight(const wxTreeItemId& item, bool highlight = TRUE);
void SetItemDropHighlight(const wxTreeItemId& item, bool highlight = true);
// set the items text colour
void SetItemTextColour(const wxTreeItemId& item, const wxColour& col);
@@ -197,15 +197,15 @@ public:
// number of children
// ------------------
// if 'recursively' is FALSE, only immediate children count, otherwise
// if 'recursively' is false, only immediate children count, otherwise
// the returned number is the number of all items in this branch
size_t GetChildrenCount(const wxTreeItemId& item,
bool recursively = TRUE) const;
bool recursively = true) const;
// navigation
// ----------
// wxTreeItemId.IsOk() will return FALSE if there is no such item
// wxTreeItemId.IsOk() will return false if there is no such item
// get the root tree item
wxTreeItemId GetRootItem() const;
@@ -225,9 +225,9 @@ public:
#if WXWIN_COMPATIBILITY_2_2
// deprecated: Use GetItemParent instead.
wxTreeItemId GetParent(const wxTreeItemId& item) const
{ return GetItemParent( item ); }
{ return GetItemParent( item ); }
// Expose the base class method hidden by the one above.
// Expose the base class method hidden by the one above.
wxWindow *GetParent() const { return wxControl::GetParent(); }
#endif // WXWIN_COMPATIBILITY_2_2
@@ -340,7 +340,7 @@ public:
// edited simultaneously)
wxTextCtrl* GetEditControl() const;
// end editing and accept or discard the changes to item label
void EndEditLabel(const wxTreeItemId& item, bool discardChanges = FALSE);
void EndEditLabel(const wxTreeItemId& item, bool discardChanges = false);
// sorting
// this function is called to compare 2 items and should return -1, 0
@@ -371,7 +371,7 @@ public:
// get the bounding rectangle of the item (or of its label only)
bool GetBoundingRect(const wxTreeItemId& item,
wxRect& rect,
bool textOnly = FALSE) const;
bool textOnly = false) const;
// deprecated
// ----------
@@ -433,7 +433,7 @@ public:
// get/set the check state for the item (only for wxTR_MULTIPLE)
bool IsItemChecked(const wxTreeItemId& item) const;
void SetItemCheck(const wxTreeItemId& item, bool check = TRUE);
void SetItemCheck(const wxTreeItemId& item, bool check = true);
// set/get the item state.image (state == -1 means cycle to the next one)
void SetState(const wxTreeItemId& node, int state);
@@ -491,7 +491,7 @@ private:
// the hash storing the items attributes (indexed by item ids)
wxMapTreeAttr m_attrs;
// TRUE if the hash above is not empty
// true if the hash above is not empty
bool m_hasAnyAttr;
// used for dragging

6
include/wx/os2/font.h
View File

@@ -32,7 +32,7 @@ public:
,int nFamily
,int nStyle
,int nWeight
,bool bUnderlined = FALSE
,bool bUnderlined = false
,const wxString& rsFace = wxEmptyString
,wxFontEncoding vEncoding = wxFONTENCODING_DEFAULT
)
@@ -67,7 +67,7 @@ public:
,int nFamily
,int nStyle
,int nWeight
,bool bUnderlined = FALSE
,bool bUnderlined = false
,const wxString& rsFace = wxEmptyString
,wxFontEncoding vEncoding = wxFONTENCODING_DEFAULT
);
@@ -116,7 +116,7 @@ public:
virtual bool IsFree(void) const;
virtual bool RealizeResource(void);
virtual WXHANDLE GetResourceHandle(void);
virtual bool FreeResource(bool bForce = FALSE);
virtual bool FreeResource(bool bForce = false);
WXHFONT GetHFONT(void) const;