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

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

View File

@@ -213,25 +213,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)
// wxComboControl creation
// ----------------------------------------------------------------------------
wxComboControl::wxComboControl()
{
Init();
}
wxComboControl::wxComboControl(wxWindow *parent,
wxWindowID id,
const wxString& value,
const wxPoint& pos,
const wxSize& size,
long style,
const wxValidator& validator,
const wxString& name)
{
Init();
(void)Create(parent, id, value, pos, size, style, validator, name);
}
void wxComboControl::Init()
{
m_popup = (wxComboPopup *)NULL;
@@ -671,28 +652,6 @@ wxSize wxComboListBox::DoGetBestClientSize() const
// wxComboBox
// ----------------------------------------------------------------------------
wxComboBox::wxComboBox()
{
Init();
}
wxComboBox::wxComboBox(wxWindow *parent,
wxWindowID id,
const wxString& value,
const wxPoint& pos,
const wxSize& size,
int n,
const wxString *choices,
long style,
const wxValidator& validator,
const wxString& name)
{
Init();
(void)Create(parent, id, value, pos, size, n, choices,
style, validator, name);
}
void wxComboBox::Init()
{
m_lbox = (wxListBox *)NULL;