1. libtool 1.2d => 1.3 (should speed up configure checks for it because it

[wxWidgets.git] / include / wx / msw / combobox.h

diff --git a/include/wx/msw/combobox.h b/include/wx/msw/combobox.h
index e9dd3f758ce95e9d0836d668085a758dd9906cda..a44538e7ff5633615260b9e1c45b36de46c1b6b2 100644 (file)
--- a/include/wx/msw/combobox.h
+++ b/include/wx/msw/combobox.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __COMBOBOXH__
-#define __COMBOBOXH__
+#ifndef _WX_COMBOBOX_H_
+#define _WX_COMBOBOX_H_
 
 #ifdef __GNUG__
 #pragma interface "combobox.h"
@@ -18,10 +18,10 @@
 
 #include "wx/choice.h"
 
-#if USE_COMBOBOX
+#if wxUSE_COMBOBOX
 
-WXDLLEXPORT_DATA(extern const char*) wxComboBoxNameStr;
-WXDLLEXPORT_DATA(extern const char*) wxEmptyString;
+WXDLLEXPORT_DATA(extern const wxChar*) wxComboBoxNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
 
 // Combobox item
 class WXDLLEXPORT wxComboBox: public wxChoice
@@ -68,12 +68,16 @@ class WXDLLEXPORT wxComboBox: public wxChoice
   virtual long GetLastPosition(void) const ;
   virtual void Replace(long from, long to, const wxString& value);
   virtual void Remove(long from, long to);
+  virtual void SetSelection(int n)
+  {
+    wxChoice::SetSelection(n);
+  }
   virtual void SetSelection(long from, long to);
   virtual void SetEditable(bool editable);
 
   virtual bool MSWCommand(WXUINT param, WXWORD id);
 };
 
-#endif // USE_COMBOBOX
+#endif // wxUSE_COMBOBOX
 #endif
-    // __COMBOBOXH__
+    // _WX_COMBOBOX_H_