Derive wxBitmap from wxBitmapBase in wxMotif, with the appropriate

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

diff --git a/include/wx/univ/listbox.h b/include/wx/univ/listbox.h
index 03f87df5c084d947607396c36fe3ff2e106ff7ff..363f523ac8947f42ac50c9e37b5018e31f516fed 100644 (file)
--- a/include/wx/univ/listbox.h
+++ b/include/wx/univ/listbox.h
@@ -13,7 +13,7 @@
 #define _WX_UNIV_LISTBOX_H_
 
 #ifdef __GNUG__
-    #pragma implementation "univlistbox.h"
+    #pragma interface "univlistbox.h"
 #endif
 
 #include "wx/scrolwin.h"    // for wxScrollHelper
@@ -50,7 +50,7 @@
 // wxListBox: a list of selectable items
 // ----------------------------------------------------------------------------
 
-class wxListBox : public wxListBoxBase, public wxScrollHelper
+class WXDLLEXPORT wxListBox : public wxListBoxBase, public wxScrollHelper
 {
 public:
     // ctors and such
@@ -129,10 +129,10 @@ public:
     void Activate(int item = -1);
 
     // select or unselect the specified or current (if -1) item
-    void Select(bool sel = TRUE, int item = -1);
+    void DoSelect(int item = -1, bool sel = TRUE);
 
     // more readable wrapper
-    void Unselect(int item) { Select(FALSE, item); }
+    void DoUnselect(int item) { DoSelect(item, FALSE); }
 
     // select an item and send a notification about it
     void SelectAndNotify(int item);
@@ -290,12 +290,12 @@ public:
                              bool toggleOnPressAlways = TRUE);
 
     // base class methods
-    virtual bool HandleKey(wxControl *control,
+    virtual bool HandleKey(wxInputConsumer *consumer,
                            const wxKeyEvent& event,
                            bool pressed);
-    virtual bool HandleMouse(wxControl *control,
+    virtual bool HandleMouse(wxInputConsumer *consumer,
                              const wxMouseEvent& event);
-    virtual bool HandleMouseMove(wxControl *control,
+    virtual bool HandleMouseMove(wxInputConsumer *consumer,
                                  const wxMouseEvent& event);
 
 protected: