wxItemContainerImmutable::FindString unified.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35741 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -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);
|
||||
|
Reference in New Issue
Block a user