X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/99ab3e3f56ab43fe1127eb565cad1a619cad0499..9f8845289521c7f53e95b6dfd8275daab8b05639:/include/wx/motif/listbox.h

diff --git a/include/wx/motif/listbox.h b/include/wx/motif/listbox.h
index 5f5cbc99c8..07c77df706 100644
--- a/include/wx/motif/listbox.h
+++ b/include/wx/motif/listbox.h
@@ -12,20 +12,16 @@
 #ifndef _WX_LISTBOX_H_
 #define _WX_LISTBOX_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "listbox.h"
 #endif
 
 #include "wx/ctrlsub.h"
 #include "wx/clntdata.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxListBoxNameStr;
-
 // forward decl for GetSelections()
 class WXDLLEXPORT wxArrayInt;
 
-WXDLLEXPORT_DATA(extern const char*) wxEmptyString;
-
 // List box item
 class WXDLLEXPORT wxListBox: public wxListBoxBase
 {
@@ -44,6 +40,17 @@ public:
         Create(parent, id, pos, size, n, choices, style, validator, name);
     }
     
+    wxListBox(wxWindow *parent, wxWindowID id,
+        const wxPoint& pos,
+        const wxSize& size,
+        const wxArrayString& choices,
+        long style = 0,
+        const wxValidator& validator = wxDefaultValidator,
+        const wxString& name = wxListBoxNameStr)
+    {
+        Create(parent, id, pos, size, choices, style, validator, name);
+    }
+    
     bool Create(wxWindow *parent, wxWindowID id,
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize,
@@ -52,6 +59,14 @@ public:
         const wxValidator& validator = wxDefaultValidator,
         const wxString& name = wxListBoxNameStr);
     
+    bool Create(wxWindow *parent, wxWindowID id,
+        const wxPoint& pos,
+        const wxSize& size,
+        const wxArrayString& choices,
+        long style = 0,
+        const wxValidator& validator = wxDefaultValidator,
+        const wxString& name = wxListBoxNameStr);
+    
     ~wxListBox();
     
     // implementation of wxControlWithItems
@@ -88,6 +103,8 @@ public:
     virtual void DoToggleItem(int item, int x) {};
 #endif
 protected:
+    virtual wxSize DoGetBestSize() const;
+
     int       m_noItems;
     
     // List mapping positions->client data