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

Reverted patch [ 832096 ] Final separation for GUI and console for Open Watcom

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25182 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2004-01-15 13:49:22 +00:00
parent d896a793a0
commit 6463b9f539
119 changed files with 267 additions and 1088 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
include/wx/univ/combobox.h
View File

@@ -99,7 +99,10 @@ class WXDLLEXPORT wxComboControl : public wxControl
{
public:
// construction
wxComboControl();
wxComboControl()
{
Init();
}
wxComboControl(wxWindow *parent,
wxWindowID id,
@@ -108,7 +111,12 @@ public:
const wxSize& size = wxDefaultSize,
long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxComboBoxNameStr);
const wxString& name = wxComboBoxNameStr)
{
Init();
(void)Create(parent, id, value, pos, size, style, validator, name);
}
bool Create(wxWindow *parent,
wxWindowID id,
@@ -205,7 +213,7 @@ class WXDLLEXPORT wxComboBox : public wxComboControl, public wxComboBoxBase
{
public:
// ctors and such
wxComboBox();
wxComboBox() { Init(); }
wxComboBox(wxWindow *parent,
wxWindowID id,
@@ -216,7 +224,13 @@ public:
const wxString *choices = (const wxString *) NULL,
long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxComboBoxNameStr);
const wxString& name = wxComboBoxNameStr)
{
Init();
(void)Create(parent, id, value, pos, size, n, choices,
style, validator, name);
}
bool Create(wxWindow *parent,
wxWindowID id,