avoid a bug in Carbon headers

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

diff --git a/include/wx/motif/combobox.h b/include/wx/motif/combobox.h
index 059c12c36a463a697d2fef40c8ccb86dd37cb0e1..c3f748e0fe7c327e2107e6f1495896372deb5133 100644 (file)
--- a/include/wx/motif/combobox.h
+++ b/include/wx/motif/combobox.h
@@ -12,22 +12,19 @@
 #ifndef _WX_COMBOBOX_H_
 #define _WX_COMBOBOX_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "combobox.h"
 #endif
 
 #include "wx/choice.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxComboBoxNameStr;
-WXDLLEXPORT_DATA(extern const char*) wxEmptyString;
-
 // Combobox item
 class WXDLLEXPORT wxComboBox: public wxChoice
 {
     DECLARE_DYNAMIC_CLASS(wxComboBox)
         
 public:
-    wxComboBox() {}
+    wxComboBox() { m_inSetSelection = false; }
     ~wxComboBox();
     
     inline wxComboBox(wxWindow *parent, wxWindowID id,
@@ -39,6 +36,7 @@ public:
         const wxValidator& validator = wxDefaultValidator,
         const wxString& name = wxComboBoxNameStr)
     {
+        m_inSetSelection = false;
         Create(parent, id, value, pos, size, n, choices,
                style, validator, name);
     }
@@ -54,13 +52,15 @@ public:
     
     // implementation of wxControlWithItems
     virtual int DoAppend(const wxString& item);
+    virtual int DoInsert(const wxString& item, int pos);
     virtual void Delete(int n);
     virtual void Clear();
     virtual int GetSelection() const ;
     virtual void SetSelection(int n);
     virtual int FindString(const wxString& s) const;
     virtual wxString GetString(int n) const ;
-    
+    virtual void SetString(int n, const wxString& s);
+
     // Text field functions
     virtual wxString GetValue() const ;
     virtual void SetValue(const wxString& value);
@@ -90,6 +90,13 @@ protected:
     virtual void DoSetSize(int x, int y,
         int width, int height,
         int sizeFlags = wxSIZE_AUTO);
+private:
+    // only implemented for native combo box
+    void AdjustDropDownListSize();
+
+    // implementation detail, should really be private
+public:
+    bool m_inSetSelection;
 };
 
 #endif