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

added default parameter values to the overloaded Show() and Enable() versions

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15743 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-06-04 18:09:20 +00:00
parent db1a42b874
commit 6b0d8a01d1
14 changed files with 106 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/wx/gtk/button.h
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: button.h
// Name: wx/gtk/button.h
// Purpose:
// Author: Robert Roebling
// Id: $Id$
@@ -39,7 +39,7 @@ class wxButton: public wxControl
{
public:
wxButton();
inline wxButton(wxWindow *parent, wxWindowID id, const wxString& label,
wxButton(wxWindow *parent, wxWindowID id, const wxString& label,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 0,
const wxValidator& validator = wxDefaultValidator,
@@ -47,15 +47,17 @@ public:
{
Create(parent, id, label, pos, size, style, validator, name);
}
~wxButton();
virtual ~wxButton();
bool Create(wxWindow *parent, wxWindowID id, const wxString& label,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxButtonNameStr);
virtual void SetDefault();
void SetLabel( const wxString &label );
bool Enable( bool enable );
virtual void SetLabel( const wxString &label );
virtual bool Enable( bool enable = TRUE );
static wxSize GetDefaultSize();

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

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: checkbox.h
// Name: wx/gtk/checkbox.h
// Purpose:
// Author: Robert Roebling
// Id: $Id$
@@ -42,8 +42,8 @@ public:
void SetValue( bool state );
bool GetValue() const;
void SetLabel( const wxString& label );
bool Enable( bool enable );
virtual void SetLabel( const wxString& label );
virtual bool Enable( bool enable = TRUE );
// implementation
// --------------

12
include/wx/gtk/radiobox.h
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: radiobox.h
// Name: wx/gtk/radiobox.h
// Purpose:
// Author: Robert Roebling
// Id: $Id$
@@ -42,7 +42,7 @@ public:
Create( parent, id, title, pos, size, n, choices, majorDim, style, val, name );
}
~wxRadioBox();
virtual ~wxRadioBox();
bool Create(wxWindow *parent,
wxWindowID id,
const wxString& title,
@@ -81,10 +81,10 @@ public:
#endif // WXWIN_COMPATIBILITY_2_2
// we have to override those to avoid virtual function name hiding
wxString GetLabel() const { return wxControl::GetLabel(); }
void SetLabel( const wxString& label );
bool Show( bool show );
bool Enable( bool enable );
virtual wxString GetLabel() const { return wxControl::GetLabel(); }
virtual void SetLabel( const wxString& label );
virtual bool Show( bool show = TRUE );
virtual bool Enable( bool enable = TRUE );
// implementation
// --------------

4
include/wx/gtk/radiobut.h
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: radiobut.h
// Name: wx/gtk/radiobut.h
// Purpose:
// Author: Robert Roebling
// Id: $Id$
@@ -47,7 +47,7 @@ public:
virtual void SetLabel(const wxString& label);
virtual void SetValue(bool val);
virtual bool GetValue() const;
virtual bool Enable( bool enable );
virtual bool Enable( bool enable = TRUE );
// implementation

10
include/wx/gtk/textctrl.h
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: textctrl.h
// Name: wx/gtk/textctrl.h
// Purpose:
// Author: Robert Roebling
// Created: 01/02/97
@@ -15,12 +15,6 @@
#pragma interface "textctrl.h"
#endif
//-----------------------------------------------------------------------------
// classes
//-----------------------------------------------------------------------------
class wxTextCtrl;
//-----------------------------------------------------------------------------
// wxTextCtrl
//-----------------------------------------------------------------------------
@@ -114,7 +108,7 @@ public:
virtual void SetSelection(long from, long to);
virtual void SetEditable(bool editable);
virtual bool Enable( bool enable );
virtual bool Enable( bool enable = TRUE );
// Implementation from now on
void OnDropFiles( wxDropFilesEvent &event );

12
include/wx/gtk1/button.h
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: button.h
// Name: wx/gtk/button.h
// Purpose:
// Author: Robert Roebling
// Id: $Id$
@@ -39,7 +39,7 @@ class wxButton: public wxControl
{
public:
wxButton();
inline wxButton(wxWindow *parent, wxWindowID id, const wxString& label,
wxButton(wxWindow *parent, wxWindowID id, const wxString& label,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 0,
const wxValidator& validator = wxDefaultValidator,
@@ -47,15 +47,17 @@ public:
{
Create(parent, id, label, pos, size, style, validator, name);
}
~wxButton();
virtual ~wxButton();
bool Create(wxWindow *parent, wxWindowID id, const wxString& label,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxButtonNameStr);
virtual void SetDefault();
void SetLabel( const wxString &label );
bool Enable( bool enable );
virtual void SetLabel( const wxString &label );
virtual bool Enable( bool enable = TRUE );
static wxSize GetDefaultSize();

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

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: checkbox.h
// Name: wx/gtk/checkbox.h
// Purpose:
// Author: Robert Roebling
// Id: $Id$
@@ -42,8 +42,8 @@ public:
void SetValue( bool state );
bool GetValue() const;
void SetLabel( const wxString& label );
bool Enable( bool enable );
virtual void SetLabel( const wxString& label );
virtual bool Enable( bool enable = TRUE );
// implementation
// --------------

12
include/wx/gtk1/radiobox.h
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: radiobox.h
// Name: wx/gtk/radiobox.h
// Purpose:
// Author: Robert Roebling
// Id: $Id$
@@ -42,7 +42,7 @@ public:
Create( parent, id, title, pos, size, n, choices, majorDim, style, val, name );
}
~wxRadioBox();
virtual ~wxRadioBox();
bool Create(wxWindow *parent,
wxWindowID id,
const wxString& title,
@@ -81,10 +81,10 @@ public:
#endif // WXWIN_COMPATIBILITY_2_2
// we have to override those to avoid virtual function name hiding
wxString GetLabel() const { return wxControl::GetLabel(); }
void SetLabel( const wxString& label );
bool Show( bool show );
bool Enable( bool enable );
virtual wxString GetLabel() const { return wxControl::GetLabel(); }
virtual void SetLabel( const wxString& label );
virtual bool Show( bool show = TRUE );
virtual bool Enable( bool enable = TRUE );
// implementation
// --------------

4
include/wx/gtk1/radiobut.h
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: radiobut.h
// Name: wx/gtk/radiobut.h
// Purpose:
// Author: Robert Roebling
// Id: $Id$
@@ -47,7 +47,7 @@ public:
virtual void SetLabel(const wxString& label);
virtual void SetValue(bool val);
virtual bool GetValue() const;
virtual bool Enable( bool enable );
virtual bool Enable( bool enable = TRUE );
// implementation

10
include/wx/gtk1/textctrl.h
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: textctrl.h
// Name: wx/gtk/textctrl.h
// Purpose:
// Author: Robert Roebling
// Created: 01/02/97
@@ -15,12 +15,6 @@
#pragma interface "textctrl.h"
#endif
//-----------------------------------------------------------------------------
// classes
//-----------------------------------------------------------------------------
class wxTextCtrl;
//-----------------------------------------------------------------------------
// wxTextCtrl
//-----------------------------------------------------------------------------
@@ -114,7 +108,7 @@ public:
virtual void SetSelection(long from, long to);
virtual void SetEditable(bool editable);
virtual bool Enable( bool enable );
virtual bool Enable( bool enable = TRUE );
// Implementation from now on
void OnDropFiles( wxDropFilesEvent &event );

8
include/wx/mac/radiobox.h
View File

@@ -58,10 +58,10 @@ public:
virtual int GetRowCount() const ;
bool Enable(bool enable);
wxString GetLabel() const;
void SetLabel(const wxString& label) ;
bool Show(bool show);
virtual bool Enable(bool enable = TRUE);
virtual wxString GetLabel() const;
virtual void SetLabel(const wxString& label) ;
virtual bool Show(bool show = TRUE);
// Other external functions
void Command(wxCommandEvent& event);

4
include/wx/motif/radiobox.h
View File

@@ -56,10 +56,10 @@ public:
void SetLabel(int item, const wxString& label) ;
wxString GetLabel(int item) const;
wxString GetLabel() const { return wxControl::GetLabel(); };
bool Enable(bool enable);
virtual bool Enable(bool enable = TRUE);
void Enable(int item, bool enable);
void Show(int item, bool show) ;
bool Show(bool show) ;
virtual bool Show(bool show = TRUE) ;
virtual wxString GetStringSelection() const;
virtual bool SetStringSelection(const wxString& s);

4
include/wx/msw/radiobox.h
View File

@@ -66,9 +66,9 @@ public:
virtual int GetColumnCount() const;
virtual int GetRowCount() const;
bool Show(bool show);
virtual bool Show(bool show = TRUE);
void SetFocus();
bool Enable(bool enable);
virtual bool Enable(bool enable = TRUE);
void SetLabelFont(const wxFont& WXUNUSED(font)) {};
void SetButtonFont(const wxFont& font) { SetFont(font); }

4
include/wx/x11/textctrl.h
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: textctrl.h
// Name: wx/x11/textctrl.h
// Purpose:
// Author: Robert Roebling
// Created: 01/02/97
@@ -182,7 +182,7 @@ public:
virtual void SetSelection(long from, long to);
virtual void SetEditable(bool editable);
virtual bool Enable( bool enable );
virtual bool Enable( bool enable = TRUE );
void OnCut(wxCommandEvent& event);
void OnCopy(wxCommandEvent& event);