added fix for MSL under Win32 (by Steve Hartwell)

[wxWidgets.git] / include / wx / gtk1 / listbox.h

diff --git a/include/wx/gtk1/listbox.h b/include/wx/gtk1/listbox.h
index 20eb87cac5f91b668146eebe4695d17273dbfb66..7974011566c330fd78e44a99574c26bb6963a52c 100644 (file)
--- a/include/wx/gtk1/listbox.h
+++ b/include/wx/gtk1/listbox.h
@@ -11,12 +11,14 @@
 #ifndef __GTKLISTBOXH__
 #define __GTKLISTBOXH__
 
-#ifdef __GNUG__
-#pragma interface
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+#pragma interface "listbox.h"
 #endif
 
 #include "wx/list.h"
 
+class WXDLLIMPEXP_BASE wxSortedArrayString;
+
 //-----------------------------------------------------------------------------
 // wxListBox
 //-----------------------------------------------------------------------------
@@ -39,6 +41,19 @@ public:
 #endif // wxUSE_CHECKLISTBOX
         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 )
+    {
+#if wxUSE_CHECKLISTBOX
+        m_hasCheckBoxes = FALSE;
+#endif // wxUSE_CHECKLISTBOX
+        Create(parent, id, pos, size, choices, style, validator, name);
+    }
     virtual ~wxListBox();
 
     bool Create(wxWindow *parent, wxWindowID id,
@@ -48,6 +63,13 @@ public:
                 long style = 0,
                 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);
 
     // implement base class pure virtuals
     virtual void Clear();
@@ -76,8 +98,6 @@ public:
 
     // implementation from now on
 
-    void GtkDisableEvents();
-    void GtkEnableEvents();
     void GtkAddItem( const wxString &item, int pos=-1 );
     int GtkGetIndex( GtkWidget *item ) const;
     GtkWidget *GetConnectWidget();
@@ -96,9 +116,17 @@ public:
     bool       m_hasCheckBoxes;
 #endif // wxUSE_CHECKLISTBOX
 
+    int        m_prevSelection;
+    bool       m_blockEvent;
+
+    virtual void FixUpMouseEvent(GtkWidget *widget, wxCoord& x, wxCoord& y);
+
 protected:
     virtual wxSize DoGetBestSize() const;
 
+    // return the string label for the given item
+    wxString GetRealLabel(struct _GList *item) const;
+
 private:
     // this array is only used for controls with wxCB_SORT style, so only
     // allocate it if it's needed (hence using pointer)