added wx/font.h include to fix PCH-less build

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

diff --git a/include/wx/listbox.h b/include/wx/listbox.h
index 7c46b0cca5e9388f3ad223390eb726e11e56af0d..219eccff3837298db7e483fe84d3d99c27a5c997 100644 (file)
--- a/include/wx/listbox.h
+++ b/include/wx/listbox.h
@@ -16,10 +16,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "listboxbase.h"
-#endif
-

 #include "wx/defs.h"
 
 #if wxUSE_LISTBOX
 #include "wx/defs.h"
 
 #if wxUSE_LISTBOX


@@ -34,7 +30,7 @@ class WXDLLIMPEXP_BASE wxArrayString;
 // global data
 // ----------------------------------------------------------------------------
 
 // global data
 // ----------------------------------------------------------------------------
 

-extern WXDLLEXPORT_DATA(const wxChar*) wxListBoxNameStr;
+extern WXDLLEXPORT_DATA(const wxChar) wxListBoxNameStr[];

 
 // ----------------------------------------------------------------------------
 // wxListBox interface is defined by the class wxListBoxBase
 
 // ----------------------------------------------------------------------------
 // wxListBox interface is defined by the class wxListBoxBase


@@ -47,16 +43,16 @@ public:
     virtual ~wxListBoxBase();
 
     // all generic methods are in wxControlWithItems, except for the following
     virtual ~wxListBoxBase();
 
     // all generic methods are in wxControlWithItems, except for the following

-    // ones which are not yet implemented by wxChoice/wxCombobox
-    void Insert(const wxString& item, int pos)
+    // ones which are not yet implemented by wxChoice/wxComboBox
+    void Insert(const wxString& item, unsigned int pos)

         { DoInsert(item, pos); }
         { DoInsert(item, pos); }

-    void Insert(const wxString& item, int pos, void *clientData)
+    void Insert(const wxString& item, unsigned int pos, void *clientData)

         { DoInsert(item, pos); SetClientData(pos, clientData); }
         { DoInsert(item, pos); SetClientData(pos, clientData); }

-    void Insert(const wxString& item, int pos, wxClientData *clientData)
+    void Insert(const wxString& item, unsigned int pos, wxClientData *clientData)

         { DoInsert(item, pos); SetClientObject(pos, clientData); }
 
         { DoInsert(item, pos); SetClientObject(pos, clientData); }
 

-    void InsertItems(int nItems, const wxString *items, int pos);
-    void InsertItems(const wxArrayString& items, int pos)
+    void InsertItems(unsigned int nItems, const wxString *items, unsigned int pos);
+    void InsertItems(const wxArrayString& items, unsigned int pos)

         { DoInsertItems(items, pos); }
 
     void Set(int n, const wxString* items, void **clientData = NULL);
         { DoInsertItems(items, pos); }
 
     void Set(int n, const wxString* items, void **clientData = NULL);


@@ -111,20 +107,27 @@ public:
     // instead
     bool Selected(int n) const { return IsSelected(n); }
 
     // instead
     bool Selected(int n) const { return IsSelected(n); }
 

+    // returns the item number at a point or wxNOT_FOUND
+    int HitTest(const wxPoint& point) const { return DoListHitTest(point); }
+

 protected:
     // NB: due to wxGTK implementation details, DoInsert() is implemented
     //     using DoInsertItems() and not the other way round
 protected:
     // NB: due to wxGTK implementation details, DoInsert() is implemented
     //     using DoInsertItems() and not the other way round

-    virtual int DoInsert(const wxString& item, int pos)
+    virtual int DoInsert(const wxString& item, unsigned int pos)

         { InsertItems(1, &item, pos); return pos; }
 
     // to be implemented in derived classes
         { InsertItems(1, &item, pos); return pos; }
 
     // to be implemented in derived classes

-    virtual void DoInsertItems(const wxArrayString& items, int pos) = 0;
+    virtual void DoInsertItems(const wxArrayString& items, unsigned int pos) = 0;

     virtual void DoSetItems(const wxArrayString& items, void **clientData) = 0;
 
     virtual void DoSetFirstItem(int n) = 0;
 
     virtual void DoSetSelection(int n, bool select) = 0;
 
     virtual void DoSetItems(const wxArrayString& items, void **clientData) = 0;
 
     virtual void DoSetFirstItem(int n) = 0;
 
     virtual void DoSetSelection(int n, bool select) = 0;
 

+    // there is already wxWindow::DoHitTest() so call this one differently
+    virtual int DoListHitTest(const wxPoint& WXUNUSED(point)) const
+        { return wxNOT_FOUND; }
+

 
     DECLARE_NO_COPY_CLASS(wxListBoxBase)
 };
 
     DECLARE_NO_COPY_CLASS(wxListBoxBase)
 };


@@ -139,8 +142,10 @@ protected:
     #include "wx/msw/listbox.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/listbox.h"
     #include "wx/msw/listbox.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/listbox.h"

-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)

     #include "wx/gtk/listbox.h"
     #include "wx/gtk/listbox.h"

+#elif defined(__WXGTK__)
+  #include "wx/gtk1/listbox.h"

 #elif defined(__WXMAC__)
     #include "wx/mac/listbox.h"
 #elif defined(__WXPM__)
 #elif defined(__WXMAC__)
     #include "wx/mac/listbox.h"
 #elif defined(__WXPM__)