great copy ctor/assignment operators cleanup by Paul Cornett (patch 1307665)

[wxWidgets.git] / src / mac / classic / combobox.cpp

diff --git a/src/mac/classic/combobox.cpp b/src/mac/classic/combobox.cpp
index 4991d4587cd9cbaea713b9084f6d02813455ed05..16612c1f81cd63c74dde5a22743214e81c189a3b 100644 (file)
--- a/src/mac/classic/combobox.cpp
+++ b/src/mac/classic/combobox.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        combobox.cpp
+// Name:        src/mac/classic/combobox.cpp
 // Purpose:     wxComboBox class
 // Author:      Stefan Csomor
 // Modified by:
@@ -9,18 +9,12 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "combobox.h"
-#endif
-
 #include "wx/combobox.h"
 #include "wx/button.h"
 #include "wx/menu.h"
 #include "wx/mac/uma.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)
-#endif
 
 // composite combobox implementation by Dan "Bud" Keith bud@otsys.com
 
@@ -492,9 +486,9 @@ void wxComboBox::SetSelection(int n)
     }
 }
 
-int wxComboBox::FindString(const wxString& s) const
+int wxComboBox::FindString(const wxString& s, bool bCase ) const
 {
-    return m_choice->FindString( s );
+    return m_choice->FindString( s , bCase );
 }
 
 wxString wxComboBox::GetString(int n) const
@@ -511,18 +505,6 @@ wxString wxComboBox::GetStringSelection() const
         return wxEmptyString;
 }
 
-bool wxComboBox::SetStringSelection(const wxString& sel)
-{
-    int s = FindString (sel);
-    if (s > -1)
-        {
-            SetSelection (s);
-            return true;
-        }
-    else
-        return false;
-}
-
 void wxComboBox::SetString(int n, const wxString& s)
 {
     m_choice->SetString( n , s ) ;
@@ -599,4 +581,3 @@ void wxComboBox::MacHandleControlClick( WXWidget WXUNUSED(control) , wxInt16 WXU
     event.SetString(GetStringSelection());
     ProcessCommand(event);
 }
-