Toolbar/tooltip udates

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

diff --git a/include/wx/msw/listbox.h b/include/wx/msw/listbox.h
index c702b8c1b7e3485700f782b9c43758d543ee1831..0021cc304f87df6aa46924f118e65e9c6f791b9e 100644 (file)
--- a/include/wx/msw/listbox.h
+++ b/include/wx/msw/listbox.h
@@ -6,16 +6,18 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_LISTBOX_H_
 #define _WX_LISTBOX_H_
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_LISTBOX_H_
 #define _WX_LISTBOX_H_
 
 #ifdef __GNUG__

-#pragma interface "listbox.h"
+    #pragma interface "listbox.h"

 #endif
 
 #endif
 

+#if wxUSE_LISTBOX
+

 // ----------------------------------------------------------------------------
 // simple types
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // simple types
 // ----------------------------------------------------------------------------


@@ -24,7 +26,7 @@
   class WXDLLEXPORT wxOwnerDrawn;
 
   // define the array of list box items
   class WXDLLEXPORT wxOwnerDrawn;
 
   // define the array of list box items

-  #include  <wx/dynarray.h>
+  #include  "wx/dynarray.h"

 
   WX_DEFINE_EXPORTED_ARRAY(wxOwnerDrawn *, wxListBoxItemsArray);
 #endif // wxUSE_OWNER_DRAWN
 
   WX_DEFINE_EXPORTED_ARRAY(wxOwnerDrawn *, wxListBoxItemsArray);
 #endif // wxUSE_OWNER_DRAWN


@@ -108,22 +110,18 @@ public:
     virtual void SetHorizontalExtent(const wxString& s = wxEmptyString);
 
     // Windows callbacks
     virtual void SetHorizontalExtent(const wxString& s = wxEmptyString);
 
     // Windows callbacks

-    virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
-                                WXUINT message,
-                                WXWPARAM wParam, WXLPARAM lParam);
-

     bool MSWCommand(WXUINT param, WXWORD id);
 
     virtual void SetupColours();
 
 protected:
     bool MSWCommand(WXUINT param, WXWORD id);
 
     virtual void SetupColours();
 
 protected:

-    // do we have multiple selections?
-    bool HasMultipleSelection() const;
+    // free memory (common part of Clear() and dtor)
+    void Free();

 
     int m_noItems;
     int m_selected;
 
 
     int m_noItems;
     int m_selected;
 

-    virtual wxSize DoGetBestSize();
+    virtual wxSize DoGetBestSize() const;

 
 #if wxUSE_OWNER_DRAWN
     // control items
 
 #if wxUSE_OWNER_DRAWN
     // control items


@@ -134,5 +132,7 @@ private:
     DECLARE_DYNAMIC_CLASS(wxListBox)
 };
 
     DECLARE_DYNAMIC_CLASS(wxListBox)
 };
 

+#endif // wxUSE_LISTBOX
+

 #endif
     // _WX_LISTBOX_H_
 #endif
     // _WX_LISTBOX_H_