added definition of TARGET_CARBON when compiling with non generated setup.h

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

diff --git a/include/wx/gtk1/listbox.h b/include/wx/gtk1/listbox.h
index 5ffaa706c4e9cc6136f742fb4d58beb97f87897c..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"


@@ -96,10 +96,15 @@ public:
 
     int        m_prevSelection;
     bool       m_blockEvent;
 
     int        m_prevSelection;
     bool       m_blockEvent;

-    
+
+    virtual void FixUpMouseEvent(GtkWidget *widget, wxCoord& x, wxCoord& y);
+

 protected:
     virtual wxSize DoGetBestSize() const;
 
 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)