X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6c8a980fc412792e64256724e02e9d387ee38e21..ae54422d9d02ebd0a244998ef9117beff1432268:/include/wx/msw/listbox.h

diff --git a/include/wx/msw/listbox.h b/include/wx/msw/listbox.h
index c702b8c1b7..9574e73e9f 100644
--- 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
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_LISTBOX_H_
 #define _WX_LISTBOX_H_
 
-#ifdef __GNUG__
-#pragma interface "listbox.h"
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+    #pragma interface "listbox.h"
 #endif
 
+#if wxUSE_LISTBOX
+
 // ----------------------------------------------------------------------------
 // simple types
 // ----------------------------------------------------------------------------
@@ -24,9 +26,9 @@
   class WXDLLEXPORT wxOwnerDrawn;
 
   // define the array of list box items
-  #include  <wx/dynarray.h>
+  #include  "wx/dynarray.h"
 
-  WX_DEFINE_EXPORTED_ARRAY(wxOwnerDrawn *, wxListBoxItemsArray);
+  WX_DEFINE_EXPORTED_ARRAY_PTR(wxOwnerDrawn *, wxListBoxItemsArray);
 #endif // wxUSE_OWNER_DRAWN
 
 // forward decl for GetSelections()
@@ -93,7 +95,7 @@ public:
     bool MSWOnDraw(WXDRAWITEMSTRUCT *item);
 
     // plug-in for derived classes
-    virtual wxOwnerDrawn *CreateItem(size_t n);
+    virtual wxOwnerDrawn *CreateLboxItem(size_t n);
 
     // allows to get the item and use SetXXX functions to set it's appearance
     wxOwnerDrawn *GetItem(size_t n) const { return m_aItems[n]; }
@@ -108,22 +110,18 @@ public:
     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:
-    // do we have multiple selections?
-    bool HasMultipleSelection() const;
+    // free memory (common part of Clear() and dtor)
+    void Free();
 
     int m_noItems;
     int m_selected;
 
-    virtual wxSize DoGetBestSize();
+    virtual wxSize DoGetBestSize() const;
 
 #if wxUSE_OWNER_DRAWN
     // control items
@@ -131,8 +129,10 @@ protected:
 #endif
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxListBox)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxListBox)
 };
 
+#endif // wxUSE_LISTBOX
+
 #endif
     // _WX_LISTBOX_H_