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

wxItemContainerImmutable::FindString unified.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35741 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-09-27 16:54:43 +00:00
parent f7c40316d5
commit 853dcc57c6
34 changed files with 203 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
// Name: checklst.h
// Name: wx/motif/checklst.h
// Purpose: wxCheckListBox class - a listbox with checkable items
// Note: this is an optional class.
// Author: Julian Smart
@@ -18,14 +18,14 @@
class WXDLLIMPEXP_CORE wxCheckListBox : public wxCheckListBoxBase
{
DECLARE_DYNAMIC_CLASS(wxCheckListBox)
public:
// ctors
wxCheckListBox();
wxCheckListBox(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
int nStrings = 0,
int nStrings = 0,
const wxString choices[] = NULL,
long style = 0,
const wxValidator& validator = wxDefaultValidator,
@@ -46,7 +46,7 @@ public:
long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxListBoxNameStr);
bool Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos,
const wxSize& size,
@@ -54,14 +54,14 @@ public:
long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxListBoxNameStr);
// items may be checked
bool IsChecked(size_t uiIndex) const;
void Check(size_t uiIndex, bool bCheck = true);
// override base class functions
virtual int DoAppend(const wxString& item);
virtual int FindString(const wxString& s) const;
virtual int FindString(const wxString& s, bool bCase = false) const;
virtual void SetString(int n, const wxString& s);
virtual wxString GetString(int n) const;

20
include/wx/motif/choice.h
View File

@@ -1,12 +1,12 @@
/////////////////////////////////////////////////////////////////////////////
// Name: choice.h
// Name: wx/motif/choice.h
// Purpose: wxChoice class
// Author: Julian Smart
// Modified by:
// Created: 17/09/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_CHOICE_H_
@@ -29,7 +29,7 @@ class WXDLLEXPORT wxChoice: public wxChoiceBase
public:
wxChoice();
~wxChoice();
wxChoice(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
@@ -41,7 +41,7 @@ public:
Init();
Create(parent, id, pos, size, n, choices, style, validator, name);
}
wxChoice(wxWindow *parent, wxWindowID id,
const wxPoint& pos,
const wxSize& size,
@@ -80,7 +80,7 @@ public:
virtual wxClientData* DoGetItemClientObject(int n) const;
virtual int GetSelection() const;
virtual void Delete(int n);
virtual int FindString(const wxString& s) const;
virtual int FindString(const wxString& s, bool bCase = false) const;
virtual void Clear();
virtual void SetString(int n, const wxString& s);
virtual wxString GetString(int n) const;
@@ -89,12 +89,12 @@ public:
virtual void SetSelection(int n);
virtual void SetColumns(int n = 1 );
virtual int GetColumns() const ;
// Original API
// Original API
virtual void Command(wxCommandEvent& event);
void SetFocus();
// Implementation
virtual void ChangeFont(bool keepOriginalSize = true);
virtual void ChangeBackgroundColour();
@@ -120,7 +120,7 @@ protected:
WXWidget m_formWidget;
wxStringList m_stringList;
wxClientDataDictionary m_clientDataDict;
virtual void DoSetSize(int x, int y,
int width, int height,
int sizeFlags = wxSIZE_AUTO);

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

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: combobox.h
// Name: wx/motif/combobox.h
// Purpose: wxComboBox class
// Author: Julian Smart
// Modified by:
@@ -76,7 +76,7 @@ public:
virtual void Clear();
virtual int GetSelection() const ;
virtual void SetSelection(int n);
virtual int FindString(const wxString& s) const;
virtual int FindString(const wxString& s, bool bCase = false) const;
virtual wxString GetString(int n) const ;
virtual void SetString(int n, const wxString& s);

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

@@ -1,12 +1,12 @@
/////////////////////////////////////////////////////////////////////////////
// Name: listbox.h
// Name: wx/motif/listbox.h
// Purpose: wxListBox class
// Author: Julian Smart
// Modified by:
// Created: 17/09/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_LISTBOX_H_
@@ -22,7 +22,7 @@ class WXDLLEXPORT wxArrayInt;
class WXDLLEXPORT wxListBox: public wxListBoxBase
{
DECLARE_DYNAMIC_CLASS(wxListBox)
public:
wxListBox();
wxListBox(wxWindow *parent, wxWindowID id,
@@ -35,7 +35,7 @@ public:
{
Create(parent, id, pos, size, n, choices, style, validator, name);
}
wxListBox(wxWindow *parent, wxWindowID id,
const wxPoint& pos,
const wxSize& size,
@@ -46,7 +46,7 @@ public:
{
Create(parent, id, pos, size, choices, style, validator, name);
}
bool Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
@@ -54,7 +54,7 @@ public:
long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxListBoxNameStr);
bool Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos,
const wxSize& size,
@@ -62,9 +62,9 @@ public:
long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxListBoxNameStr);
~wxListBox();
// implementation of wxControlWithItems
virtual int GetCount() const;
virtual int DoAppend(const wxString& item);
@@ -74,7 +74,7 @@ public:
virtual wxClientData* DoGetItemClientObject(int n) const;
virtual int GetSelection() const;
virtual void Delete(int n);
virtual int FindString(const wxString& s) const;
virtual int FindString(const wxString& s, bool bCase = false) const;
virtual void Clear();
virtual void SetString(int n, const wxString& s);
virtual wxString GetString(int n) const;
@@ -89,7 +89,7 @@ public:
// For single or multiple choice list item
void Command(wxCommandEvent& event);
// Implementation
virtual void ChangeBackgroundColour();
virtual void ChangeForegroundColour();
@@ -102,7 +102,7 @@ protected:
virtual wxSize DoGetBestSize() const;
int m_noItems;
// List mapping positions->client data
wxClientDataDictionary m_clientDataDict;
private:

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

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: radiobox.h
// Name: wx/motif/radiobox.h
// Purpose: wxRadioBox class
// Author: Julian Smart
// Modified by:
@@ -72,7 +72,6 @@ public:
const wxValidator& val = wxDefaultValidator,
const wxString& name = wxRadioBoxNameStr);
int FindString(const wxString& s) const;
void SetSelection(int N);
int GetSelection() const;
@@ -123,4 +122,3 @@ private:
};
#endif // _WX_MOTIF_RADIOBOX_H_