projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add support for retrieving the currently selected text. Implement on all backends...
[wxWidgets.git]
/
include
/
wx
/
gtk1
/
choice.h
diff --git
a/include/wx/gtk1/choice.h
b/include/wx/gtk1/choice.h
index 5d8579b731587cee9054910279d4e17fbcbb5796..139b8811e20ce2acaa09c41fe1fbe7b84948e86e 100644
(file)
--- a/
include/wx/gtk1/choice.h
+++ b/
include/wx/gtk1/choice.h
@@
-29,7
+29,7
@@
public:
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxChoiceNameStr )
{
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxChoiceNameStr )
{
- m_strings =
(wxSortedArrayString *)
NULL;
+ m_strings = NULL;
Create(parent, id, pos, size, n, choices, style, validator, name);
}
Create(parent, id, pos, size, n, choices, style, validator, name);
}
@@
-41,7
+41,7
@@
public:
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxChoiceNameStr )
{
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxChoiceNameStr )
{
- m_strings =
(wxSortedArrayString *)
NULL;
+ m_strings = NULL;
Create(parent, id, pos, size, choices, style, validator, name);
}
Create(parent, id, pos, size, choices, style, validator, name);
}
@@
-49,7
+49,7
@@
public:
bool Create( wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
bool Create( wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
- int n = 0, const wxString choices[] =
(wxString *)
NULL,
+ int n = 0, const wxString choices[] = NULL,
long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxChoiceNameStr );
long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxChoiceNameStr );
@@
-62,8
+62,8
@@
public:
const wxString& name = wxChoiceNameStr );
// implement base class pure virtuals
const wxString& name = wxChoiceNameStr );
// implement base class pure virtuals
- void D
elete
(unsigned int n);
- void Clear();
+ void D
oDeleteOneItem
(unsigned int n);
+ void
Do
Clear();
int GetSelection() const;
virtual void SetSelection(int n);
int GetSelection() const;
virtual void SetSelection(int n);
@@
-80,20
+80,19
@@
protected:
wxList m_clientList; // contains the client data for the items
void DoApplyWidgetStyle(GtkRcStyle *style);
wxList m_clientList; // contains the client data for the items
void DoApplyWidgetStyle(GtkRcStyle *style);
- virtual int DoAppend(const wxString& item);
- virtual int DoInsert(const wxString& item, unsigned int pos);
+ virtual int DoInsertItems(const wxArrayStringsAdapter& items,
+ unsigned int pos,
+ void **clientData, wxClientDataType type);
virtual void DoSetItemClientData(unsigned int n, void* clientData);
virtual void* DoGetItemClientData(unsigned int n) const;
virtual void DoSetItemClientData(unsigned int n, void* clientData);
virtual void* DoGetItemClientData(unsigned int n) const;
- virtual void DoSetItemClientObject(unsigned int n, wxClientData* clientData);
- virtual wxClientData* DoGetItemClientObject(unsigned int n) const;
virtual wxSize DoGetBestSize() const;
virtual bool IsOwnGtkWindow( GdkWindow *window );
private:
virtual wxSize DoGetBestSize() const;
virtual bool IsOwnGtkWindow( GdkWindow *window );
private:
- //
common part of Create() and DoAppend()
+ //
DoInsertItems() helper
int GtkAddHelper(GtkWidget *menu, unsigned int pos, const wxString& item);
// this array is only used for controls with wxCB_SORT style, so only
int GtkAddHelper(GtkWidget *menu, unsigned int pos, const wxString& item);
// this array is only used for controls with wxCB_SORT style, so only