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

Calss interface updates (wxMotif-only).

Browse Source 
Made wxCheckBox inherit from wxChekBoxBase.
Corrected virtual function hiding in wxListBox.
Made wxRadioBox inherit from wxRadioBoxBase.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16306 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2002-07-28 20:50:37 +00:00
parent 4e9cbd33d0
commit 18128cbb47
4 changed files with 32 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/motif/checkbox.h
View File

@@ -22,7 +22,7 @@ WXDLLEXPORT_DATA(extern const char*) wxCheckBoxNameStr;
// Checkbox item (single checkbox)
class WXDLLEXPORT wxBitmap;
class WXDLLEXPORT wxCheckBox: public wxControl
class WXDLLEXPORT wxCheckBox: public wxCheckBoxBase
{
DECLARE_DYNAMIC_CLASS(wxCheckBox)

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

@@ -70,6 +70,8 @@ public:
virtual void Append(const wxString& item);
virtual void Append(const wxString& item, void *clientData);
virtual void Set(int n, const wxString* choices, void **clientData = NULL);
void Set(const wxArrayString& items, void **clientData = NULL)
{ DoSetItems(items, clientData); }
virtual int FindString(const wxString& s) const ;
virtual void Clear();
virtual void SetSelection(int n, bool select = TRUE);
@@ -96,7 +98,9 @@ public:
virtual void SetFirstItem(const wxString& s) ;
virtual void InsertItems(int nItems, const wxString items[], int pos);
void InsertItems(const wxArrayString& items, int pos)
{ DoInsertItems(items, pos); }
virtual wxString GetStringSelection() const ;
virtual bool SetStringSelection(const wxString& s, bool flag = TRUE);
virtual int Number() const ;

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

@@ -23,7 +23,7 @@ WXDLLEXPORT_DATA(extern const char*) wxRadioBoxNameStr;
// List box item
class WXDLLEXPORT wxBitmap ;
class WXDLLEXPORT wxRadioBox : public wxControl
class WXDLLEXPORT wxRadioBox : public wxControl, public wxRadioBoxBase
{
DECLARE_DYNAMIC_CLASS(wxRadioBox)
@@ -50,12 +50,9 @@ public:
int FindString(const wxString& s) const;
void SetSelection(int N);
int GetSelection() const;
wxString GetString(int N) const;
void SetLabel(const wxString& label) { wxControl::SetLabel(label); };
void SetLabel(int item, const wxString& label) ;
wxString GetLabel(int item) const;
wxString GetLabel() const { return wxControl::GetLabel(); };
void SetString(int item, const wxString& label) ;
wxString GetString(int item) const;
virtual bool Enable(bool enable = TRUE);
void Enable(int item, bool enable);
void Show(int item, bool show) ;
@@ -66,6 +63,9 @@ public:
virtual int GetCount() const { return m_noItems; } ;
void Command(wxCommandEvent& event);
int GetColumnCount() const;
int GetRowCount() const;
int GetNumberOfRowsOrCols() const { return m_noRowsOrCols; }
void SetNumberOfRowsOrCols(int n) { m_noRowsOrCols = n; }