Fixes for wxMac combobox wrappers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@21058 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -381,11 +381,11 @@ public:
|
|||||||
|
|
||||||
//----------------------------------------------------------------------
|
//----------------------------------------------------------------------
|
||||||
|
|
||||||
// wxGTK's wxComboBox doesn't derive from wxChoice like wxMSW, or
|
// wxGTK's wxComboBox doesn't derive from wxChoice like wxMSW, or even
|
||||||
// even wxControlWithItems, so we have to duplicate the methods
|
// wxControlWithItems, so we have to duplicate the methods here... <blech!>
|
||||||
// here... <blech!>
|
// wcMac's inheritace is weird too so we'll fake it with this one too.
|
||||||
|
|
||||||
#ifdef __WXGTK__
|
#ifndef __WXMSW__
|
||||||
class wxComboBox : public wxControl
|
class wxComboBox : public wxControl
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
@@ -477,8 +477,8 @@ public:
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
#else // For all but wxGTK
|
#else
|
||||||
|
// MSW's version derives from wxChoice
|
||||||
|
|
||||||
class wxComboBox : public wxChoice {
|
class wxComboBox : public wxChoice {
|
||||||
public:
|
public:
|
||||||
|
Reference in New Issue
Block a user