From ba692f57886eca7875ea794564e4a0ee3e1a281e Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Wed, 11 Jun 2003 21:38:32 +0000 Subject: [PATCH] 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 --- wxPython/src/controls.i | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/wxPython/src/controls.i b/wxPython/src/controls.i index 81806eaf6c..2dd01c31b3 100644 --- a/wxPython/src/controls.i +++ b/wxPython/src/controls.i @@ -381,11 +381,11 @@ public: //---------------------------------------------------------------------- -// wxGTK's wxComboBox doesn't derive from wxChoice like wxMSW, or -// even wxControlWithItems, so we have to duplicate the methods -// here... +// wxGTK's wxComboBox doesn't derive from wxChoice like wxMSW, or even +// wxControlWithItems, so we have to duplicate the methods here... +// wcMac's inheritace is weird too so we'll fake it with this one too. -#ifdef __WXGTK__ +#ifndef __WXMSW__ class wxComboBox : public wxControl { public: @@ -477,8 +477,8 @@ public: -#else // For all but wxGTK - +#else +// MSW's version derives from wxChoice class wxComboBox : public wxChoice { public: