Updated Scintilla to 1.52 (on the trunk this time too)

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

diff --git a/include/wx/gtk1/listbox.h b/include/wx/gtk1/listbox.h
index 8038c9c0abc6a154539704c6041547f92448808e..f9632f26b17c50229e19fd8ee7c7bf0ab1a741ca 100644 (file)
--- a/include/wx/gtk1/listbox.h
+++ b/include/wx/gtk1/listbox.h
@@ -11,8 +11,8 @@
 #ifndef __GTKLISTBOXH__
 #define __GTKLISTBOXH__
 
 #ifndef __GTKLISTBOXH__
 #define __GTKLISTBOXH__
 

-#ifdef __GNUG__
-#pragma interface
+#if defined(__GNUG__) && !defined(__APPLE__)
+#pragma interface "listbox.h"

 #endif
 
 #include "wx/list.h"
 #endif
 
 #include "wx/list.h"


@@ -76,8 +76,6 @@ public:
 
     // implementation from now on
 
 
     // implementation from now on
 

-    void GtkDisableEvents();
-    void GtkEnableEvents();

     void GtkAddItem( const wxString &item, int pos=-1 );
     int GtkGetIndex( GtkWidget *item ) const;
     GtkWidget *GetConnectWidget();
     void GtkAddItem( const wxString &item, int pos=-1 );
     int GtkGetIndex( GtkWidget *item ) const;
     GtkWidget *GetConnectWidget();


@@ -96,6 +94,17 @@ public:
     bool       m_hasCheckBoxes;
 #endif // wxUSE_CHECKLISTBOX
 
     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)
 private:
     // this array is only used for controls with wxCB_SORT style, so only
     // allocate it if it's needed (hence using pointer)