wxWidgets3: update to svn r70933

This commit is contained in:
Shawn Hoffman
2012-03-17 18:12:27 -07:00
parent 0ed8af2287
commit a648aca65c
906 changed files with 39468 additions and 17244 deletions

View File

@ -4,7 +4,7 @@
// Author: Stefan Csomor
// Modified by:
// Created: 1998-01-01
// RCS-ID: $Id: combobox_osx.cpp 67243 2011-03-19 08:36:23Z SC $
// RCS-ID: $Id: combobox_osx.cpp 69948 2011-12-07 23:41:06Z VZ $
// Copyright: (c) Stefan Csomor
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@ -25,10 +25,6 @@ wxComboBox::~wxComboBox()
{
}
void wxComboBox::Init()
{
}
bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
const wxString& value,
const wxPoint& pos,
@ -219,4 +215,14 @@ wxComboWidgetImpl* wxComboBox::GetComboPeer() const
return dynamic_cast<wxComboWidgetImpl*> (GetPeer());
}
void wxComboBox::Popup()
{
GetComboPeer()->Popup();
}
void wxComboBox::Dismiss()
{
GetComboPeer()->Dismiss();
}
#endif // wxUSE_COMBOBOX && wxOSX_USE_COCOA