only one of SetSize()s, SetClientSize()s, GetPosition()s &c is virtual now

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

diff --git a/include/wx/msw/listbox.h b/include/wx/msw/listbox.h
index b11df5edd389fcf9488bb8b7cca16a68313a0aff..f64c4741e2bc5d0b7fba025974c21af8e4fc4917 100644 (file)
--- a/include/wx/msw/listbox.h
+++ b/include/wx/msw/listbox.h
@@ -20,12 +20,18 @@
 
 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>
   class WXDLLEXPORT wxOwnerDrawn;
 
   // define the array of list box items
   #include  <wx/dynarray.h>

+
+  #undef WXDLLEXPORTLOCAL
+  #define WXDLLEXPORTLOCAL WXDLLEXPORT

   WX_DEFINE_ARRAY(wxOwnerDrawn *, wxListBoxItemsArray);
   WX_DEFINE_ARRAY(wxOwnerDrawn *, wxListBoxItemsArray);

+  #undef  WXDLLEXPORTLOCAL
+  #define WXDLLEXPORTLOCAL
+

 #endif
 
 // forward decl for GetSelections()
 #endif
 
 // forward decl for GetSelections()


@@ -63,7 +69,7 @@ class WXDLLEXPORT wxListBox: public wxControl
 
   bool MSWCommand(WXUINT param, WXWORD id);
 
 
   bool MSWCommand(WXUINT param, WXWORD id);
 

-#if USE_OWNER_DRAWN
+#if wxUSE_OWNER_DRAWN

   bool MSWOnMeasure(WXMEASUREITEMSTRUCT *item);
   bool MSWOnDraw(WXDRAWITEMSTRUCT *item);
 
   bool MSWOnMeasure(WXMEASUREITEMSTRUCT *item);
   bool MSWOnDraw(WXDRAWITEMSTRUCT *item);
 


@@ -95,6 +101,9 @@ class WXDLLEXPORT wxListBox: public wxControl
   virtual bool Selected(int n) const ;
   virtual wxString GetString(int n) const ;
   virtual void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
   virtual bool Selected(int n) const ;
   virtual wxString GetString(int n) const ;
   virtual void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);

+  void SetSize(const wxRect& rect, int sizeFlags = wxSIZE_AUTO)
+    { wxWindow::SetSize(rect, sizeFlags); }
+  void SetSize(const wxSize& size) { wxWindow::SetSize(size); }

 
   // Set the specified item at the first visible item
   // or scroll to max range.
 
   // Set the specified item at the first visible item
   // or scroll to max range.


@@ -125,7 +134,7 @@ class WXDLLEXPORT wxListBox: public wxControl
   int m_noItems;
   int m_selected;
 
   int m_noItems;
   int m_selected;
 

-#if USE_OWNER_DRAWN
+#if wxUSE_OWNER_DRAWN

   // control items
   wxListBoxItemsArray m_aItems;
 #endif
   // control items
   wxListBoxItemsArray m_aItems;
 #endif