more fixes to dllexport/import stuff for operator<<()s (still bug 1104372)

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

diff --git a/include/wx/motif/combobox.h b/include/wx/motif/combobox.h
index 20681ffb4f864e6672ddeb672a2dad91cff972c3..d0b5b2532c18253915b959cde6ce42dc2448ec1c 100644 (file)
--- a/include/wx/motif/combobox.h
+++ b/include/wx/motif/combobox.h
@@ -12,15 +12,12 @@
 #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
 {
@@ -44,6 +41,20 @@ public:
                style, validator, name);
     }
     
+    inline wxComboBox(wxWindow *parent, wxWindowID id,
+        const wxString& value,
+        const wxPoint& pos,
+        const wxSize& size,
+        const wxArrayString& choices,
+        long style = 0,
+        const wxValidator& validator = wxDefaultValidator,
+        const wxString& name = wxComboBoxNameStr)
+    {
+        m_inSetSelection = false;
+        Create(parent, id, value, pos, size, choices,
+               style, validator, name);
+    }
+    
     bool Create(wxWindow *parent, wxWindowID id,
         const wxString& value = wxEmptyString,
         const wxPoint& pos = wxDefaultPosition,
@@ -53,8 +64,18 @@ public:
         const wxValidator& validator = wxDefaultValidator,
         const wxString& name = wxComboBoxNameStr);
     
+    bool Create(wxWindow *parent, wxWindowID id,
+        const wxString& value,
+        const wxPoint& pos,
+        const wxSize& size,
+        const wxArrayString& choices,
+        long style = 0,
+        const wxValidator& validator = wxDefaultValidator,
+        const wxString& name = wxComboBoxNameStr);
+    
     // 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 ;