Support for G_FILENAME_ENCODING=@locale

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

diff --git a/include/wx/combobox.h b/include/wx/combobox.h
index 51b88e169f4c06bbcbf5bacc3971b540e321e15b..051737b64677c4a63b7e33df13cd4c9943bd3aee 100644 (file)
--- a/include/wx/combobox.h
+++ b/include/wx/combobox.h
@@ -16,12 +16,13 @@
 
 #if wxUSE_COMBOBOX
 
 
 #if wxUSE_COMBOBOX
 

-WXDLLEXPORT_DATA(extern const wxChar*) wxComboBoxNameStr;
+extern WXDLLEXPORT_DATA(const wxChar*) wxComboBoxNameStr;

 
 // ----------------------------------------------------------------------------
 // wxComboBoxBase: this interface defines the methods wxComboBox must implement
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // wxComboBoxBase: this interface defines the methods wxComboBox must implement
 // ----------------------------------------------------------------------------
 

+#include "wx/textctrl.h"

 #include "wx/ctrlsub.h"
 
 class WXDLLEXPORT wxComboBoxBase : public wxItemContainer
 #include "wx/ctrlsub.h"
 
 class WXDLLEXPORT wxComboBoxBase : public wxItemContainer


@@ -36,7 +37,7 @@ public:
     virtual void Paste() = 0;
     virtual void SetInsertionPoint(long pos) = 0;
     virtual long GetInsertionPoint() const = 0;
     virtual void Paste() = 0;
     virtual void SetInsertionPoint(long pos) = 0;
     virtual long GetInsertionPoint() const = 0;

-    virtual long GetLastPosition() const = 0;
+    virtual wxTextPos GetLastPosition() const = 0;

     virtual void Replace(long from, long to, const wxString& value) = 0;
     virtual void SetSelection(long from, long to) = 0;
     virtual void SetEditable(bool editable) = 0;
     virtual void Replace(long from, long to, const wxString& value) = 0;
     virtual void SetSelection(long from, long to) = 0;
     virtual void SetEditable(bool editable) = 0;


@@ -58,6 +59,10 @@ public:
     virtual bool CanUndo() const = 0;
     virtual bool CanRedo() const = 0;
 
     virtual bool CanUndo() const = 0;
     virtual bool CanRedo() const = 0;
 

+
+    // redeclare inherited SetSelection() overload here as well to avoid
+    // virtual function hiding
+    virtual void SetSelection(int n) = 0;

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------