Applied rowspan patch #15276 (dghart)

[wxWidgets.git] / include / wx / editlbox.h

diff --git a/include/wx/editlbox.h b/include/wx/editlbox.h
index 212028b716f8508d1d0d5defebb3b925072f37d9..946fea8a2c626347448e941a30bf4ac8f2d571f5 100644 (file)
--- a/include/wx/editlbox.h
+++ b/include/wx/editlbox.h
@@ -17,9 +17,9 @@
 
 #include "wx/panel.h"
 
 
 #include "wx/panel.h"
 

-class WXDLLEXPORT wxBitmapButton;
-class WXDLLEXPORT wxListCtrl;
-class WXDLLEXPORT wxListEvent;
+class WXDLLIMPEXP_FWD_CORE wxBitmapButton;
+class WXDLLIMPEXP_FWD_CORE wxListCtrl;
+class WXDLLIMPEXP_FWD_CORE wxListEvent;

 
 #define wxEL_ALLOW_NEW          0x0100
 #define wxEL_ALLOW_EDIT         0x0200
 
 #define wxEL_ALLOW_NEW          0x0100
 #define wxEL_ALLOW_EDIT         0x0200


@@ -27,7 +27,7 @@ class WXDLLEXPORT wxListEvent;
 #define wxEL_NO_REORDER         0x0800
 #define wxEL_DEFAULT_STYLE      (wxEL_ALLOW_NEW | wxEL_ALLOW_EDIT | wxEL_ALLOW_DELETE)
 
 #define wxEL_NO_REORDER         0x0800
 #define wxEL_DEFAULT_STYLE      (wxEL_ALLOW_NEW | wxEL_ALLOW_EDIT | wxEL_ALLOW_DELETE)
 

-extern WXDLLIMPEXP_DATA_ADV(const wxChar) wxEditableListBoxNameStr[];
+extern WXDLLIMPEXP_DATA_ADV(const char) wxEditableListBoxNameStr[];

 
 // This class provides a composite control that lets the
 // user easily enter list of strings
 
 // This class provides a composite control that lets the
 // user easily enter list of strings


@@ -89,6 +89,10 @@ protected:
 
     DECLARE_CLASS(wxEditableListBox)
     DECLARE_EVENT_TABLE()
 
     DECLARE_CLASS(wxEditableListBox)
     DECLARE_EVENT_TABLE()

+
+private:
+    void SwapItems(long i1, long i2);
+

 };
 
 #endif  // wxUSE_EDITABLELISTBOX
 };
 
 #endif  // wxUSE_EDITABLELISTBOX