2nd attempt at MDI in wxMotif, using wxNotebook this time (still some probs).

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

diff --git a/include/wx/msw/listbox.h b/include/wx/msw/listbox.h
index ff26cefab5d9c113e8752e58d585a68cfdf16358..ac0efc056fbc51340a2fcbbf5707da80ed9d2d8c 100644 (file)
--- a/include/wx/msw/listbox.h
+++ b/include/wx/msw/listbox.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __LISTBOXH__
-#define __LISTBOXH__
+#ifndef _WX_LISTBOX_H_
+#define _WX_LISTBOX_H_
 
 #ifdef __GNUG__
 #pragma interface "listbox.h"
@@ -18,15 +18,20 @@
 
 #include "wx/control.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxListBoxNameStr;
 WXDLLEXPORT_DATA(extern const char*) wxListBoxNameStr;
 
-#if USE_OWNER_DRAWN
+#if wxUSE_OWNER_DRAWN
   class WXDLLEXPORT wxOwnerDrawn;
 
   // define the array of list box items
   #include  <wx/dynarray.h>
+
+  #undef WXDLLEXPORTLOCAL
+  #define WXDLLEXPORTLOCAL WXDLLEXPORT
   WX_DEFINE_ARRAY(wxOwnerDrawn *, wxListBoxItemsArray);
+  #undef  WXDLLEXPORTLOCAL
+  #define WXDLLEXPORTLOCAL
+
 #endif
 
 // forward decl for GetSelections()
@@ -64,15 +69,15 @@ class WXDLLEXPORT wxListBox: public wxControl
 
   bool MSWCommand(WXUINT param, WXWORD id);
 
-#if USE_OWNER_DRAWN
+#if wxUSE_OWNER_DRAWN
   bool MSWOnMeasure(WXMEASUREITEMSTRUCT *item);
   bool MSWOnDraw(WXDRAWITEMSTRUCT *item);
 
   // plug-in for derived classes
-  virtual wxOwnerDrawn *CreateItem(uint n);
+  virtual wxOwnerDrawn *CreateItem(size_t n);
 
   // allows to get the item and use SetXXX functions to set it's appearance
-  wxOwnerDrawn *GetItem(uint n) const { return m_aItems[n]; }
+  wxOwnerDrawn *GetItem(size_t n) const { return m_aItems[n]; }
 #endif
 
   virtual void Append(const wxString& item);
@@ -126,7 +131,7 @@ class WXDLLEXPORT wxListBox: public wxControl
   int m_noItems;
   int m_selected;
 
-#if USE_OWNER_DRAWN
+#if wxUSE_OWNER_DRAWN
   // control items
   wxListBoxItemsArray m_aItems;
 #endif
@@ -134,4 +139,4 @@ class WXDLLEXPORT wxListBox: public wxControl
 };
 
 #endif
-    // __LISTBOXH__
+    // _WX_LISTBOX_H_