added default parameter values to the overloaded Show() and Enable() versions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15743 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1,10 +1,10 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Name: button.h
|
||||
// Name: wx/gtk/button.h
|
||||
// Purpose:
|
||||
// Author: Robert Roebling
|
||||
// Id: $Id$
|
||||
// Copyright: (c) 1998 Robert Roebling
|
||||
// Licence: wxWindows licence
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef __GTKBUTTONH__
|
||||
@@ -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,23 +47,25 @@ 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();
|
||||
|
||||
|
||||
// implementation
|
||||
// --------------
|
||||
|
||||
void ApplyWidgetStyle();
|
||||
|
||||
|
||||
void ApplyWidgetStyle();
|
||||
|
||||
protected:
|
||||
virtual wxSize DoGetBestSize() const;
|
||||
|
||||
|
@@ -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
|
||||
// --------------
|
||||
@@ -54,7 +54,7 @@ public:
|
||||
|
||||
GtkWidget *m_widgetCheckbox;
|
||||
GtkWidget *m_widgetLabel;
|
||||
|
||||
|
||||
bool m_blockEvent;
|
||||
|
||||
protected:
|
||||
|
@@ -1,10 +1,10 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Name: radiobox.h
|
||||
// Name: wx/gtk/radiobox.h
|
||||
// Purpose:
|
||||
// Author: Robert Roebling
|
||||
// Id: $Id$
|
||||
// Copyright: (c) 1998 Robert Roebling
|
||||
// Licence: wxWindows licence
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
|
||||
@@ -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
|
||||
// --------------
|
||||
|
@@ -1,10 +1,10 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Name: radiobut.h
|
||||
// Name: wx/gtk/radiobut.h
|
||||
// Purpose:
|
||||
// Author: Robert Roebling
|
||||
// Id: $Id$
|
||||
// Copyright: (c) 1998 Robert Roebling
|
||||
// Licence: wxWindows licence
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
@@ -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 );
|
||||
|
Reference in New Issue
Block a user