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

Added some missing STL-like wxArray/wxArrayString constructors.

Browse Source 
Added helper class wxCArrayString, better replacement for
wxArrayString::GetStringArray.
  Added overloaded constructors and Create() methods taking
a wxArrayString for wxCheckListBox, wxChoice, wxComboBox,
wxListBox, wxRadioBox, wxSingleChoiceDialog, wxMultipleChoiceDialog.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25440 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2004-01-31 18:21:45 +00:00
parent 55945915c9
commit 584ad2a32f
95 changed files with 1707 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/wx/os2/checklst.h
View File

@@ -38,6 +38,15 @@ public:
,const wxValidator& rValidator = wxDefaultValidator
,const wxString& rsName = wxListBoxNameStr
);
wxCheckListBox( wxWindow* pParent
,wxWindowID vId
,const wxPoint& rPos
,const wxSize& vSize
,const wxArrayString& asChoices
,long lStyle = 0
,const wxValidator& rValidator = wxDefaultValidator
,const wxString& rsName = wxListBoxNameStr
);
//
// Override base class virtuals

31
include/wx/os2/choice.h
View File

@@ -44,6 +44,27 @@ public:
);
}
inline wxChoice( wxWindow* pParent
,wxWindowID vId
,const wxPoint& rPos
,const wxSize& rSize
,const wxArrayString& asChoices
,long lStyle = 0
,const wxValidator& rValidator = wxDefaultValidator
,const wxString& rsName = wxChoiceNameStr
)
{
Create( pParent
,vId
,rPos
,rSize
,asChoices
,lStyle
,rValidator
,rsName
);
}
bool Create( wxWindow* pParent
,wxWindowID vId
,const wxPoint& rPos = wxDefaultPosition
@@ -55,6 +76,16 @@ public:
,const wxString& rsName = wxChoiceNameStr
);
bool Create( wxWindow* pParent
,wxWindowID vId
,const wxPoint& rPos
,const wxSize& rSize
,const wxArrayString& asChoices
,long lStyle = 0
,const wxValidator& rValidator = wxDefaultValidator
,const wxString& rsName = wxChoiceNameStr
);
//
// Implement base class virtuals
//

34
include/wx/os2/combobox.h
View File

@@ -48,6 +48,29 @@ class WXDLLEXPORT wxComboBox : public wxChoice
);
}
inline wxComboBox( wxWindow* pParent
,wxWindowID vId
,const wxString& rsValue
,const wxPoint& rPos
,const wxSize& rSize
,const wxArrayString& asChoices
,long lStyle = 0
,const wxValidator& rValidator = wxDefaultValidator
,const wxString& rsName = wxComboBoxNameStr
)
{
Create( pParent
,vId
,rsValue
,rPos
,rSize
,asChoices
,lStyle
,rValidator
,rsName
);
}
bool Create( wxWindow* pParent
,wxWindowID vId
,const wxString& rsValue = wxEmptyString
@@ -60,6 +83,17 @@ class WXDLLEXPORT wxComboBox : public wxChoice
,const wxString& rsName = wxComboBoxNameStr
);
bool Create( wxWindow* pParent
,wxWindowID vId
,const wxString& rsValue
,const wxPoint& rPos
,const wxSize& rSize
,const wxArrayString& asChoices
,long lStyle = 0
,const wxValidator& rValidator = wxDefaultValidator
,const wxString& rsName = wxComboBoxNameStr
);
//
// List functions: see wxChoice
//

28
include/wx/os2/listbox.h
View File

@@ -58,6 +58,25 @@ public:
,rsName
);
}
wxListBox( wxWindow* pParent
,wxWindowID vId
,const wxPoint& rPos
,const wxSize& rSize
,const wxArrayString& asChoices
,long lStyle = 0
,const wxValidator& rValidator = wxDefaultValidator
,const wxString& rsName = wxListBoxNameStr)
{
Create( pParent
,vId
,rPos
,rSize
,asChoices
,lStyle
,rValidator
,rsName
);
}
bool Create( wxWindow* pParent
,wxWindowID vId
@@ -69,6 +88,15 @@ public:
,const wxValidator& rValidator = wxDefaultValidator
,const wxString& rsName = wxListBoxNameStr
);
bool Create( wxWindow* pParent
,wxWindowID vId
,const wxPoint& rPos
,const wxSize& rSize
,const wxArrayString& asChoices
,long lStyle = 0
,const wxValidator& rValidator = wxDefaultValidator
,const wxString& rsName = wxListBoxNameStr
);
virtual ~wxListBox();

37
include/wx/os2/radiobox.h
View File

@@ -47,6 +47,31 @@ public:
);
}
inline wxRadioBox( wxWindow* pParent
,wxWindowID vId
,const wxString& rsTitle
,const wxPoint& rPos
,const wxSize& rSize
,const wxArrayString& asChoices
,int nMajorDim = 0
,long lStyle = wxRA_HORIZONTAL
,const wxValidator& rVal = wxDefaultValidator
,const wxString& rsName = wxRadioBoxNameStr
)
{
Create( pParent
,vId
,rsTitle
,rPos
,rSize
,asChoices
,nMajorDim
,lStyle
,rVal
,rsName
);
}
~wxRadioBox();
bool Create( wxWindow* pParent
@@ -62,6 +87,18 @@ public:
,const wxString& rsName = wxRadioBoxNameStr
);
bool Create( wxWindow* pParent
,wxWindowID vId
,const wxString& rsTitle
,const wxPoint& rPos
,const wxSize& rSize
,const wxArrayString& asChoices
,int nMajorDim = 0
,long lStyle = wxRA_HORIZONTAL
,const wxValidator& rVal = wxDefaultValidator
,const wxString& rsName = wxRadioBoxNameStr
);
void Command(wxCommandEvent& rEvent);
bool ContainsHWND(WXHWND hWnd) const;
virtual bool Enable(bool bEnable = TRUE);