Warning fix (instead of silencing int->short with typecast, have the same type intern...

[wxWidgets.git] / include / wx / mac / classic / combobox.h

diff --git a/include/wx/mac/classic/combobox.h b/include/wx/mac/classic/combobox.h
index 1e79cf50c2d7fb4417e3b02858289e813418fc02..d207bbdb945ea69d842a091e0c457d3786042dd6 100644 (file)
--- a/include/wx/mac/classic/combobox.h
+++ b/include/wx/mac/classic/combobox.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        combobox.h
+// Name:        wx/mac/classic/combobox.h

 // Purpose:     wxComboBox class
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxComboBox class
 // Author:      Stefan Csomor
 // Modified by:


@@ -12,10 +12,6 @@
 #ifndef _WX_COMBOBOX_H_
 #define _WX_COMBOBOX_H_
 
 #ifndef _WX_COMBOBOX_H_
 #define _WX_COMBOBOX_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "combobox.h"
-#endif
-

 #include "wx/choice.h"
 
 WXDLLEXPORT_DATA(extern const wxChar*) wxComboBoxNameStr;
 #include "wx/choice.h"
 
 WXDLLEXPORT_DATA(extern const wxChar*) wxComboBoxNameStr;


@@ -87,7 +83,7 @@ class WXDLLEXPORT wxComboBox : public wxControl, public wxComboBoxBase
 
     virtual int GetSelection() const ;
     virtual void SetSelection(int n);
 
     virtual int GetSelection() const ;
     virtual void SetSelection(int n);

-    virtual int FindString(const wxString& s) const;
+    virtual int FindString(const wxString& s, bool bCase = false) const;

     virtual wxString GetString(int n) const ;
     virtual wxString GetStringSelection() const ;
     virtual void SetString(int n, const wxString& s) ;
     virtual wxString GetString(int n) const ;
     virtual wxString GetStringSelection() const ;
     virtual void SetString(int n, const wxString& s) ;