Removed small OGL glitches; added new sample

[wxWidgets.git] / include / wx / generic / listctrl.h

diff --git a/include/wx/generic/listctrl.h b/include/wx/generic/listctrl.h
index 45dcc2bdb50ebb9f8079cd0f2bf008425b030bdd..697ce88046e45694492d6e2a5d30229e0c61d97b 100644 (file)
--- a/include/wx/generic/listctrl.h
+++ b/include/wx/generic/listctrl.h
@@ -12,38 +12,43 @@
 #define __LISTCTRLH_G__
 
 #ifdef __GNUG__
 #define __LISTCTRLH_G__
 
 #ifdef __GNUG__

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

 #endif
 
 #include "wx/defs.h"
 #include "wx/object.h"
 #endif
 
 #include "wx/defs.h"
 #include "wx/object.h"

-#include "wx/imaglist.h"
+#include "wx/generic/imaglist.h"

 #include "wx/control.h"
 #include "wx/timer.h"
 #include "wx/control.h"
 #include "wx/timer.h"

+#include "wx/textctrl.h"

 #include "wx/dcclient.h"
 #include "wx/scrolwin.h"
 #include "wx/settings.h"
 
 #include "wx/dcclient.h"
 #include "wx/scrolwin.h"
 #include "wx/settings.h"
 

+#if wxUSE_DRAG_AND_DROP
+class WXDLLEXPORT wxDropTarget;
+#endif
+

 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 

-class wxListItem;
-class wxListEvent;
-class wxListCtrl;
+class WXDLLEXPORT wxListItem;
+class WXDLLEXPORT wxListEvent;
+class WXDLLEXPORT wxListCtrl;

 
 //-----------------------------------------------------------------------------
 // internal classes
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // internal classes
 //-----------------------------------------------------------------------------
 

-class wxListHeaderData;
-class wxListItemData;
-class wxListLineData;
+class WXDLLEXPORT wxListHeaderData;
+class WXDLLEXPORT wxListItemData;
+class WXDLLEXPORT wxListLineData;

 
 

-class wxListHeaderWindow;
-class wxListMainWindow;
+class WXDLLEXPORT wxListHeaderWindow;
+class WXDLLEXPORT wxListMainWindow;

 
 

-class wxListRenameTimer;
+class WXDLLEXPORT wxListRenameTimer;

 //class wxListTextCtrl;
 
 //-----------------------------------------------------------------------------
 //class wxListTextCtrl;
 
 //-----------------------------------------------------------------------------


@@ -51,7 +56,7 @@ class wxListRenameTimer;
 //-----------------------------------------------------------------------------
 
 // type of compare function for wxListCtrl sort operation
 //-----------------------------------------------------------------------------
 
 // type of compare function for wxListCtrl sort operation

-typedef int (*wxListCtrlCompare)(const long item1, const long item2, long sortData);
+typedef int (*wxListCtrlCompare)(long item1, long item2, long sortData);

 
 //-----------------------------------------------------------------------------
 // wxListCtrl flags
 
 //-----------------------------------------------------------------------------
 // wxListCtrl flags


@@ -69,7 +74,7 @@ typedef int (*wxListCtrlCompare)(const long item1, const long item2, long sortDa
 #define wxLC_NO_HEADER       0x0800  // not supported in wxGLC
 #define wxLC_NO_SORT_HEADER  0x1000  // not supported in wxGLC
 #define wxLC_SINGLE_SEL      0x2000
 #define wxLC_NO_HEADER       0x0800  // not supported in wxGLC
 #define wxLC_NO_SORT_HEADER  0x1000  // not supported in wxGLC
 #define wxLC_SINGLE_SEL      0x2000

-#define wxLC_SORT_ASCENDING  0x4000  
+#define wxLC_SORT_ASCENDING  0x4000

 #define wxLC_SORT_DESCENDING 0x8000  // not supported in wxGLC
 
 #define wxLC_MASK_TYPE       (wxLC_ICON | wxLC_SMALL_ICON | wxLC_LIST | wxLC_REPORT)
 #define wxLC_SORT_DESCENDING 0x8000  // not supported in wxGLC
 
 #define wxLC_MASK_TYPE       (wxLC_ICON | wxLC_SMALL_ICON | wxLC_LIST | wxLC_REPORT)


@@ -95,7 +100,7 @@ typedef int (*wxListCtrlCompare)(const long item1, const long item2, long sortDa
 #define wxLIST_STATE_DONTCARE       0x0000
 #define wxLIST_STATE_DROPHILITED    0x0001  // not supported in wxGLC
 #define wxLIST_STATE_FOCUSED        0x0002
 #define wxLIST_STATE_DONTCARE       0x0000
 #define wxLIST_STATE_DROPHILITED    0x0001  // not supported in wxGLC
 #define wxLIST_STATE_FOCUSED        0x0002

-#define wxLIST_STATE_SELECTED       0x0004  
+#define wxLIST_STATE_SELECTED       0x0004

 #define wxLIST_STATE_CUT            0x0008  // not supported in wxGLC
 
 // Hit test flags, used in HitTest // wxGLC suppots 20 and 80
 #define wxLIST_STATE_CUT            0x0008  // not supported in wxGLC
 
 // Hit test flags, used in HitTest // wxGLC suppots 20 and 80


@@ -119,7 +124,7 @@ enum {
     wxLIST_NEXT_ALL,            // Searches for subsequent item by index
     wxLIST_NEXT_BELOW,          // Searches for an item below the specified item
     wxLIST_NEXT_LEFT,           // Searches for an item to the left of the specified item
     wxLIST_NEXT_ALL,            // Searches for subsequent item by index
     wxLIST_NEXT_BELOW,          // Searches for an item below the specified item
     wxLIST_NEXT_LEFT,           // Searches for an item to the left of the specified item

-    wxLIST_NEXT_RIGHT,          // Searches for an item to the right of the specified item
+    wxLIST_NEXT_RIGHT           // Searches for an item to the right of the specified item

 };
 
 // Alignment flags for Arrange  // always wxLIST_ALIGN_LEFT in wxGLC
 };
 
 // Alignment flags for Arrange  // always wxLIST_ALIGN_LEFT in wxGLC


@@ -159,19 +164,11 @@ enum {
     wxLIST_FIND_RIGHT
 };
 
     wxLIST_FIND_RIGHT
 };
 

-// Flag values for Set/GetImageList
-enum {
-    wxIMAGE_LIST_NORMAL, // Normal icons
-    wxIMAGE_LIST_SMALL,  // Small icons
-    wxIMAGE_LIST_STATE   // State icons: unimplemented (see WIN32 documentation)
-                         // not implemented in wxGLC (see non-existing documentation..)
-};
-

 //-----------------------------------------------------------------------------
 // wxListItem
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // wxListItem
 //-----------------------------------------------------------------------------
 

-class wxListItem: public wxObject
+class WXDLLEXPORT wxListItem: public wxObject

 {
   DECLARE_DYNAMIC_CLASS(wxListItem)
 
 {
   DECLARE_DYNAMIC_CLASS(wxListItem)
 


@@ -197,12 +194,12 @@ class wxListItem: public wxObject
 // wxListEvent
 //-----------------------------------------------------------------------------
 
 // wxListEvent
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxListEvent: public wxCommandEvent
+class WXDLLEXPORT wxListEvent: public wxNotifyEvent

 {
   DECLARE_DYNAMIC_CLASS(wxListEvent)
 
  public:
 {
   DECLARE_DYNAMIC_CLASS(wxListEvent)
 
  public:

-  wxListEvent(WXTYPE commandType = 0, int id = 0);
+  wxListEvent(wxEventType commandType = wxEVT_NULL, int id = 0);

 
   int           m_code;
   long          m_itemIndex;
 
   int           m_code;
   long          m_itemIndex;


@@ -216,50 +213,52 @@ class WXDLLEXPORT wxListEvent: public wxCommandEvent
 
 typedef void (wxEvtHandler::*wxListEventFunction)(wxListEvent&);
 
 
 typedef void (wxEvtHandler::*wxListEventFunction)(wxListEvent&);
 

-#define EVT_LIST_BEGIN_DRAG(id, fn) { wxEVT_COMMAND_LIST_BEGIN_DRAG, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxListEventFunction) & fn, NULL },
-#define EVT_LIST_BEGIN_RDRAG(id, fn) { wxEVT_COMMAND_LIST_BEGIN_RDRAG, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxListEventFunction) & fn, NULL },
-#define EVT_LIST_BEGIN_LABEL_EDIT(id, fn) { wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxListEventFunction) & fn, NULL },
-#define EVT_LIST_END_LABEL_EDIT(id, fn) { wxEVT_COMMAND_LIST_END_LABEL_EDIT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxListEventFunction) & fn, NULL },
-#define EVT_LIST_DELETE_ITEM(id, fn) { wxEVT_COMMAND_LIST_DELETE_ITEM, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxListEventFunction) & fn, NULL },
-#define EVT_LIST_DELETE_ALL_ITEMS(id, fn) { wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxListEventFunction) & fn, NULL },
-#define EVT_LIST_GET_INFO(id, fn) { wxEVT_COMMAND_LIST_GET_INFO, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxListEventFunction) & fn, NULL },
-#define EVT_LIST_SET_INFO(id, fn) { wxEVT_COMMAND_LIST_SET_INFO, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxListEventFunction) & fn, NULL },
-#define EVT_LIST_ITEM_SELECTED(id, fn) { wxEVT_COMMAND_LIST_ITEM_SELECTED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxListEventFunction) & fn, NULL },
-#define EVT_LIST_ITEM_DESELECTED(id, fn) { wxEVT_COMMAND_LIST_ITEM_DESELECTED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxListEventFunction) & fn, NULL },
-#define EVT_LIST_KEY_DOWN(id, fn) { wxEVT_COMMAND_LIST_KEY_DOWN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxListEventFunction) & fn, NULL },
-#define EVT_LIST_INSERT_ITEM(id, fn) { wxEVT_COMMAND_LIST_INSERT_ITEM, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxListEventFunction) & fn, NULL },
-#define EVT_LIST_COL_CLICK(id, fn) { wxEVT_COMMAND_LIST_COL_CLICK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxListEventFunction) & fn, NULL },
-
+#define EVT_LIST_BEGIN_DRAG(id, fn) { wxEVT_COMMAND_LIST_BEGIN_DRAG, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxListEventFunction) & fn, (wxObject *) NULL },
+#define EVT_LIST_BEGIN_RDRAG(id, fn) { wxEVT_COMMAND_LIST_BEGIN_RDRAG, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxListEventFunction) & fn, (wxObject *) NULL },
+#define EVT_LIST_BEGIN_LABEL_EDIT(id, fn) { wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxListEventFunction) & fn, (wxObject *) NULL },
+#define EVT_LIST_END_LABEL_EDIT(id, fn) { wxEVT_COMMAND_LIST_END_LABEL_EDIT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxListEventFunction) & fn, (wxObject *) NULL },
+#define EVT_LIST_DELETE_ITEM(id, fn) { wxEVT_COMMAND_LIST_DELETE_ITEM, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxListEventFunction) & fn, (wxObject *) NULL },
+#define EVT_LIST_DELETE_ALL_ITEMS(id, fn) { wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxListEventFunction) & fn, (wxObject *) NULL },
+#define EVT_LIST_GET_INFO(id, fn) { wxEVT_COMMAND_LIST_GET_INFO, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxListEventFunction) & fn, (wxObject *) NULL },
+#define EVT_LIST_SET_INFO(id, fn) { wxEVT_COMMAND_LIST_SET_INFO, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxListEventFunction) & fn, (wxObject *) NULL },
+#define EVT_LIST_ITEM_SELECTED(id, fn) { wxEVT_COMMAND_LIST_ITEM_SELECTED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxListEventFunction) & fn, (wxObject *) NULL },
+#define EVT_LIST_ITEM_DESELECTED(id, fn) { wxEVT_COMMAND_LIST_ITEM_DESELECTED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxListEventFunction) & fn, (wxObject *) NULL },
+#define EVT_LIST_KEY_DOWN(id, fn) { wxEVT_COMMAND_LIST_KEY_DOWN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxListEventFunction) & fn, (wxObject *) NULL },
+#define EVT_LIST_INSERT_ITEM(id, fn) { wxEVT_COMMAND_LIST_INSERT_ITEM, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxListEventFunction) & fn, (wxObject *) NULL },
+#define EVT_LIST_COL_CLICK(id, fn) { wxEVT_COMMAND_LIST_COL_CLICK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxListEventFunction) & fn, (wxObject *) NULL },
+#define EVT_LIST_ITEM_RIGHT_CLICK(id, fn) { wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxListEventFunction) & fn, (wxObject *) NULL },
+#define EVT_LIST_ITEM_MIDDLE_CLICK(id, fn) { wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxListEventFunction) & fn, (wxObject *) NULL },
+#define EVT_LIST_ITEM_ACTIVATED(id, fn) { wxEVT_COMMAND_LIST_ITEM_ACTIVATED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxListEventFunction) & fn, (wxObject *) NULL },

 
 //-----------------------------------------------------------------------------
 //  wxListItemData (internal)
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 //  wxListItemData (internal)
 //-----------------------------------------------------------------------------
 

-class wxListItemData : public wxObject
+class WXDLLEXPORT wxListItemData : public wxObject

 {
   DECLARE_DYNAMIC_CLASS(wxListItemData);
 
 {
   DECLARE_DYNAMIC_CLASS(wxListItemData);
 

-  protected:
+  public:

     wxString   m_text;
     int        m_image;
     long       m_data;
     int        m_xpos,m_ypos;
     int        m_width,m_height;
     wxColour   *m_colour;
     wxString   m_text;
     int        m_image;
     long       m_data;
     int        m_xpos,m_ypos;
     int        m_width,m_height;
     wxColour   *m_colour;

-    
+

   public:
     wxListItemData(void);
     wxListItemData( const wxListItem &info );
     void SetItem( const wxListItem &info );
     void SetText( const wxString &s );
   public:
     wxListItemData(void);
     wxListItemData( const wxListItem &info );
     void SetItem( const wxListItem &info );
     void SetText( const wxString &s );

-    void SetImage( const int image );
-    void SetData( const long data );
-    void SetPosition( const int x, const int y );
-    void SetSize( const int width, const int height );
+    void SetImage( int image );
+    void SetData( long data );
+    void SetPosition( int x, int y );
+    void SetSize( int width, int height );

     void SetColour( wxColour *col );
     bool HasImage(void) const;
     bool HasText(void) const;
     void SetColour( wxColour *col );
     bool HasImage(void) const;
     bool HasText(void) const;

-    bool IsHit( const int x, const int y ) const;
+    bool IsHit( int x, int y ) const;

     void GetText( wxString &s );
     int GetX( void ) const;
     int GetY( void ) const;
     void GetText( wxString &s );
     int GetX( void ) const;
     int GetY( void ) const;


@@ -274,7 +273,7 @@ class wxListItemData : public wxObject
 //  wxListHeaderData (internal)
 //-----------------------------------------------------------------------------
 
 //  wxListHeaderData (internal)
 //-----------------------------------------------------------------------------
 

-class wxListHeaderData : public wxObject
+class WXDLLEXPORT wxListHeaderData : public wxObject

 {
   DECLARE_DYNAMIC_CLASS(wxListHeaderData);
 
 {
   DECLARE_DYNAMIC_CLASS(wxListHeaderData);
 


@@ -286,18 +285,18 @@ class wxListHeaderData : public wxObject
     int       m_width;
     int       m_xpos,m_ypos;
     int       m_height;
     int       m_width;
     int       m_xpos,m_ypos;
     int       m_height;

-    
+

   public:
     wxListHeaderData(void);
     wxListHeaderData( const wxListItem &info );
     void SetItem( const wxListItem &item );
   public:
     wxListHeaderData(void);
     wxListHeaderData( const wxListItem &info );
     void SetItem( const wxListItem &item );

-    void SetPosition( const int x, const int y );
-    void SetWidth( const int w );
-    void SetFormat( const int format );
-    void SetHeight( const int h );
+    void SetPosition( int x, int y );
+    void SetWidth( int w );
+    void SetFormat( int format );
+    void SetHeight( int h );

     bool HasImage(void) const;
     bool HasText(void) const;
     bool HasImage(void) const;
     bool HasText(void) const;

-    bool IsHit( const int x, const int y ) const;
+    bool IsHit( int x, int y ) const;

     void GetItem( wxListItem &item );
     void GetText( wxString &s );
     int GetImage(void) const;
     void GetItem( wxListItem &item );
     void GetText( wxString &s );
     int GetImage(void) const;


@@ -309,56 +308,56 @@ class wxListHeaderData : public wxObject
 //  wxListLineData (internal)
 //-----------------------------------------------------------------------------
 
 //  wxListLineData (internal)
 //-----------------------------------------------------------------------------
 

-class wxListLineData : public wxObject
+class WXDLLEXPORT wxListLineData : public wxObject

 {
   DECLARE_DYNAMIC_CLASS(wxListLineData);
 
 {
   DECLARE_DYNAMIC_CLASS(wxListLineData);
 

-  protected:
+  public:

     wxList              m_items;
     wxList              m_items;

-    wxRectangle         m_bound_all;
-    wxRectangle         m_bound_label;
-    wxRectangle         m_bound_icon;
-    wxRectangle         m_bound_hilight;
+    wxRect         m_bound_all;
+    wxRect         m_bound_label;
+    wxRect         m_bound_icon;
+    wxRect         m_bound_hilight;

     int                 m_mode;
     bool                m_hilighted;
     wxBrush            *m_hilightBrush;
     int                 m_spacing;
     wxListMainWindow   *m_owner;
 
     int                 m_mode;
     bool                m_hilighted;
     wxBrush            *m_hilightBrush;
     int                 m_spacing;
     wxListMainWindow   *m_owner;
 

-    void DoDraw( wxPaintDC *dc, const bool hilight, const bool paintBG );
+    void DoDraw( wxDC *dc, bool hilight, bool paintBG );

 
   public:
     wxListLineData( void ) {};
 
   public:
     wxListLineData( void ) {};

-    wxListLineData( wxListMainWindow *owner, const int mode, wxBrush *hilightBrush );
-    void CalculateSize( wxPaintDC *dc, const int spacing );
-    void SetPosition( wxPaintDC *dc, const int x, const int y,  const int window_width );
-    void SetColumnPosition( const int index, const int x );
+    wxListLineData( wxListMainWindow *owner, int mode, wxBrush *hilightBrush );
+    void CalculateSize( wxDC *dc, int spacing );
+    void SetPosition( wxDC *dc, int x, int y,  int window_width );
+    void SetColumnPosition( int index, int x );

     void GetSize( int &width, int &height );
     void GetExtent( int &x, int &y, int &width, int &height );
     void GetLabelExtent( int &x, int &y, int &width, int &height );
     void GetSize( int &width, int &height );
     void GetExtent( int &x, int &y, int &width, int &height );
     void GetLabelExtent( int &x, int &y, int &width, int &height );

-    long IsHit( const int x, const int y );
-    void InitItems( const int num );
-    void SetItem( const int index, const wxListItem &info );
-    void GetItem( const int index, wxListItem &info );
-    void GetText( const int index, wxString &s );
-    void SetText( const int index, const wxString s );
-    int GetImage( const int index );
-    void GetRect( wxRectangle &rect );
-    void Hilight( const bool on );
+    long IsHit( int x, int y );
+    void InitItems( int num );
+    void SetItem( int index, const wxListItem &info );
+    void GetItem( int index, wxListItem &info );
+    void GetText( int index, wxString &s );
+    void SetText( int index, const wxString s );
+    int GetImage( int index );
+    void GetRect( wxRect &rect );
+    void Hilight( bool on );

     void ReverseHilight( void );
     void ReverseHilight( void );

-    void DrawRubberBand( wxPaintDC *dc, const bool on );
-    void Draw( wxPaintDC *dc );
-    bool IsInRect( const int x, const int y, const wxRectangle &rect );
+    void DrawRubberBand( wxDC *dc, bool on );
+    void Draw( wxDC *dc );
+    bool IsInRect( int x, int y, const wxRect &rect );

     bool IsHilighted( void );
     bool IsHilighted( void );

-    void AssignRect( wxRectangle &dest, const int x, const int y, const int width, const int height );
-    void AssignRect( wxRectangle &dest, const wxRectangle &source );
+    void AssignRect( wxRect &dest, int x, int y, int width, int height );
+    void AssignRect( wxRect &dest, const wxRect &source );

 };
 
 //-----------------------------------------------------------------------------
 //  wxListHeaderWindow (internal)
 //-----------------------------------------------------------------------------
 
 };
 
 //-----------------------------------------------------------------------------
 //  wxListHeaderWindow (internal)
 //-----------------------------------------------------------------------------
 

-class wxListHeaderWindow : public wxWindow
+class WXDLLEXPORT wxListHeaderWindow : public wxWindow

 {
   DECLARE_DYNAMIC_CLASS(wxListHeaderWindow)
 
 {
   DECLARE_DYNAMIC_CLASS(wxListHeaderWindow)
 


@@ -366,17 +365,23 @@ class wxListHeaderWindow : public wxWindow
     wxListMainWindow  *m_owner;
     wxCursor          *m_currentCursor;
     wxCursor          *m_resizeCursor;
     wxListMainWindow  *m_owner;
     wxCursor          *m_currentCursor;
     wxCursor          *m_resizeCursor;

+    bool               m_isDraging;
+    int                m_column;
+    int                m_minX;
+    int                m_currentX;

 
   public:
     wxListHeaderWindow( void );
 
   public:
     wxListHeaderWindow( void );

-    wxListHeaderWindow( wxWindow *win, const wxWindowID id, wxListMainWindow *owner, 
-      const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, 
-      const long style = 0, const wxString &name = "columntitles" );
-    void DoDrawRect( wxPaintDC *dc, int x, int y, int w, int h );
+    ~wxListHeaderWindow( void );
+    wxListHeaderWindow( wxWindow *win, wxWindowID id, wxListMainWindow *owner,
+      const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
+      long style = 0, const wxString &name = "columntitles" );
+    void DoDrawRect( wxDC *dc, int x, int y, int w, int h );

     void OnPaint( wxPaintEvent &event );
     void OnPaint( wxPaintEvent &event );

+    void DrawCurrent();

     void OnMouse( wxMouseEvent &event );
     void OnSetFocus( wxFocusEvent &event );
     void OnMouse( wxMouseEvent &event );
     void OnSetFocus( wxFocusEvent &event );

-    
+

   DECLARE_EVENT_TABLE()
 };
 
   DECLARE_EVENT_TABLE()
 };
 


@@ -384,91 +389,59 @@ class wxListHeaderWindow : public wxWindow
 // wxListRenameTimer (internal)
 //-----------------------------------------------------------------------------
 
 // wxListRenameTimer (internal)
 //-----------------------------------------------------------------------------
 

-class wxListRenameTimer: public wxTimer
+class WXDLLEXPORT wxListRenameTimer: public wxTimer

 {
  private:
    wxListMainWindow   *m_owner;
 {
  private:
    wxListMainWindow   *m_owner;

-   
+

  public:
    wxListRenameTimer( wxListMainWindow *owner );
    void Notify();
 };
 
  public:
    wxListRenameTimer( wxListMainWindow *owner );
    void Notify();
 };
 

-/*
-

 //-----------------------------------------------------------------------------
 //  wxListTextCtrl (internal)
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 //  wxListTextCtrl (internal)
 //-----------------------------------------------------------------------------
 

-class wxListTextCtrl: public wxTextCtrl
+class WXDLLEXPORT wxListTextCtrl: public wxTextCtrl

 {
   DECLARE_DYNAMIC_CLASS(wxListTextCtrl);
 {
   DECLARE_DYNAMIC_CLASS(wxListTextCtrl);

-  
+

   private:
     bool               *m_accept;
     wxString           *m_res;
     wxListMainWindow   *m_owner;
 
   public:
   private:
     bool               *m_accept;
     wxString           *m_res;
     wxListMainWindow   *m_owner;
 
   public:

-    wxListTextCtrl(void) : wxTextCtrl() {};
-    wxListTextCtrl(  wxWindow *parent, const char *value = "", 
-      bool *accept, wxString *res, wxListMainWindow *owner,
-      int x = -1, int y = -1, int w = -1, int h = -1, int style = 0, char *name = "rawtext" ) :
-      wxTextCtrl( parent, value, x, y, w, h, style, name ) 
-      {
-        m_res = res;
-        m_accept = accept;
-       m_owner = owner;
-      };
-    void OnChar( wxKeyEvent &event )
-      {
-        if (event.keyCode == WXK_RETURN)
-        {
-          (*m_accept) = TRUE;
-         (*m_res) = GetValue();
-         m_owner->OnRenameAccept();
-//       Show( FALSE );
-          delete this;
-         return;
-       };
-        if (event.keyCode == WXK_ESCAPE)
-        {
-          (*m_accept) = FALSE;
-         (*m_res) = "";
-//       Show( FALSE );
-          delete this;
-         return;
-       };
-      };
-    void OnKillFocus(void)
-      {
-        (*m_accept) = FALSE;
-        (*m_res) = "";
-//      Show( FALSE );
-        delete this;
-        return;
-      };
+    wxListTextCtrl(void) {};
+    wxListTextCtrl( wxWindow *parent, const wxWindowID id, 
+                    bool *accept, wxString *res, wxListMainWindow *owner,
+                    const wxString &value = "",
+                    const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
+                    int style = 0, const wxValidator& validator = wxDefaultValidator,
+                    const wxString &name = "wxListTextCtrlText" );
+    void OnChar( wxKeyEvent &event );
+    void OnKillFocus( wxFocusEvent &event );
+    
+  DECLARE_EVENT_TABLE()

 };
 
 };
 

-*/
-

 //-----------------------------------------------------------------------------
 //  wxListMainWindow (internal)
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 //  wxListMainWindow (internal)
 //-----------------------------------------------------------------------------
 

-class wxListMainWindow: public wxScrolledWindow
+class WXDLLEXPORT wxListMainWindow: public wxScrolledWindow

 {
   DECLARE_DYNAMIC_CLASS(wxListMainWindow);
 
   public:
     long                 m_mode;
     wxList               m_lines;
 {
   DECLARE_DYNAMIC_CLASS(wxListMainWindow);
 
   public:
     long                 m_mode;
     wxList               m_lines;

-    wxList               m_columns; 
+    wxList               m_columns;

     wxListLineData      *m_current;
     int                  m_visibleLines;
     wxBrush             *m_hilightBrush;
     wxColour            *m_hilightColour;
     wxListLineData      *m_current;
     int                  m_visibleLines;
     wxBrush             *m_hilightBrush;
     wxColour            *m_hilightColour;

-    wxFont              *m_myFont;

     int                  m_xScroll,m_yScroll;
     bool                 m_dirty;
     wxImageList         *m_small_image_list;
     int                  m_xScroll,m_yScroll;
     bool                 m_dirty;
     wxImageList         *m_small_image_list;


@@ -483,25 +456,25 @@ class wxListMainWindow: public wxScrolledWindow
     bool                 m_renameAccept;
     wxString             m_renameRes;
     bool                 m_isCreated;
     bool                 m_renameAccept;
     wxString             m_renameRes;
     bool                 m_isCreated;

-    bool                 m_isDragging;
+    int                  m_dragCount;

 
   public:
 
   public:

-    wxListMainWindow(void); 
-    wxListMainWindow( wxWindow *parent, const wxWindowID id, 
-      const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, 
-      const long style = 0, const wxString &name = "listctrl" );
+    wxListMainWindow(void);
+    wxListMainWindow( wxWindow *parent, wxWindowID id,
+      const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
+      long style = 0, const wxString &name = "listctrl" );

     ~wxListMainWindow(void);
     void RefreshLine( wxListLineData *line );
     void OnPaint( wxPaintEvent &event );
     ~wxListMainWindow(void);
     void RefreshLine( wxListLineData *line );
     void OnPaint( wxPaintEvent &event );

-    void HilightAll( const bool on );
-    void ActivateLine( wxListLineData *line );
-    void SendNotify( wxListLineData *line, long command );
+    void HilightAll( bool on );
+    void SendNotify( wxListLineData *line, wxEventType command );

     void FocusLine( wxListLineData *line );
     void UnfocusLine( wxListLineData *line );
     void SelectLine( wxListLineData *line );
     void DeselectLine( wxListLineData *line );
     void DeleteLine( wxListLineData *line );
     void RenameLine( wxListLineData *line, const wxString &newName );
     void FocusLine( wxListLineData *line );
     void UnfocusLine( wxListLineData *line );
     void SelectLine( wxListLineData *line );
     void DeselectLine( wxListLineData *line );
     void DeleteLine( wxListLineData *line );
     void RenameLine( wxListLineData *line, const wxString &newName );

+    void StartLabelEdit( wxListLineData *line );

     void OnRenameTimer(void);
     void OnRenameAccept(void);
     void OnMouse( wxMouseEvent &event );
     void OnRenameTimer(void);
     void OnRenameAccept(void);
     void OnMouse( wxMouseEvent &event );


@@ -511,46 +484,47 @@ class wxListMainWindow: public wxScrolledWindow
     void OnSetFocus( wxFocusEvent &event );
     void OnKillFocus( wxFocusEvent &event );
     void OnSize( wxSizeEvent &event );
     void OnSetFocus( wxFocusEvent &event );
     void OnKillFocus( wxFocusEvent &event );
     void OnSize( wxSizeEvent &event );

-    wxFont *GetMyFont( void );
-    void DrawImage( int index, wxPaintDC *dc, int x, int y );
+    void DrawImage( int index, wxDC *dc, int x, int y );

     void GetImageSize( int index, int &width, int &height );
     int GetIndexOfLine( const wxListLineData *line );
     int GetTextLength( wxString &s );  // should be const
 
     void GetImageSize( int index, int &width, int &height );
     int GetIndexOfLine( const wxListLineData *line );
     int GetTextLength( wxString &s );  // should be const
 

-    void SetImageList( wxImageList *imageList, const int which );
-    void SetItemSpacing( const int spacing, const bool isSmall = FALSE );
-    int GetItemSpacing( const bool isSmall = FALSE );
-    void SetColumn( const int col, wxListItem &item );
-    void SetColumnWidth( const int col, const int width );
-    void GetColumn( const int col, wxListItem &item );
-    int GetColumnWidth( const int vol );
+    void SetImageList( wxImageList *imageList, int which );
+    void SetItemSpacing( int spacing, bool isSmall = FALSE );
+    int GetItemSpacing( bool isSmall = FALSE );
+    void SetColumn( int col, wxListItem &item );
+    void SetColumnWidth( int col, int width );
+    void GetColumn( int col, wxListItem &item );
+    int GetColumnWidth( int vol );

     int GetColumnCount( void );
     int GetColumnCount( void );

-    int GetCountPerPage( void );     
+    int GetCountPerPage( void );

     void SetItem( wxListItem &item );
     void GetItem( wxListItem &item );
     void SetItem( wxListItem &item );
     void GetItem( wxListItem &item );

-    void SetItemState( const long item, const long state, const long stateMask ); 
-    int GetItemState( const long item, const long stateMask );
+    void SetItemState( long item, long state, long stateMask );
+    int GetItemState( long item, long stateMask );

     int GetItemCount( void );
     int GetItemCount( void );

-    void GetItemRect( const long index, wxRectangle &rect );
+    void GetItemRect( long index, wxRect &rect );
+    bool GetItemPosition(long item, wxPoint& pos);

     int GetSelectedItemCount( void );
     int GetSelectedItemCount( void );

-    void SetMode( const long mode );
+    void SetMode( long mode );

     long GetMode( void ) const;
     void CalculatePositions( void );
     void RealizeChanges(void);
     long GetMode( void ) const;
     void CalculatePositions( void );
     void RealizeChanges(void);

-    long GetNextItem( const long item, int geometry, int state );
-    void DeleteItem( const long index );
+    long GetNextItem( long item, int geometry, int state );
+    void DeleteItem( long index );

     void DeleteAllItems( void );
     void DeleteAllItems( void );

-    void DeleteColumn( const int col );
+    void DeleteColumn( int col );

     void DeleteEverything( void );
     void DeleteEverything( void );

-    void EnsureVisible( const long index );
-    long FindItem(const long start, const wxString& str, const bool partial = FALSE );
-    long FindItem(const long start, const long data);
-    long HitTest( const int x, const int y, int &flags );
+    void EnsureVisible( long index );
+    long FindItem(long start, const wxString& str, bool partial = FALSE );
+    long FindItem(long start, long data);
+    long HitTest( int x, int y, int &flags );

     void InsertItem( wxListItem &item );
     void InsertItem( wxListItem &item );

-    void InsertColumn( const long col, wxListItem &item );
+//    void AddItem( wxListItem &item );
+    void InsertColumn( long col, wxListItem &item );
+//    void AddColumn( wxListItem &item );

     void SortItems( wxListCtrlCompare fn, long data );
     void SortItems( wxListCtrlCompare fn, long data );

-    virtual bool OnListNotify( wxListEvent &event );
-    
+

   DECLARE_EVENT_TABLE()
 };
 
   DECLARE_EVENT_TABLE()
 };
 


@@ -558,89 +532,118 @@ class wxListMainWindow: public wxScrolledWindow
 // wxListCtrl
 //-----------------------------------------------------------------------------
 
 // wxListCtrl
 //-----------------------------------------------------------------------------
 

-class wxListCtrl: public wxControl
+class WXDLLEXPORT wxListCtrl: public wxControl

 {
   DECLARE_DYNAMIC_CLASS(wxListCtrl);
 {
   DECLARE_DYNAMIC_CLASS(wxListCtrl);

-  
+

   public:
   public:

-  
+

     wxListCtrl(void);
     wxListCtrl(void);

-    wxListCtrl( wxWindow *parent, const wxWindowID id, 
-      const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, 
-      const long style = 0, const wxString &name = "listctrl" );
+    wxListCtrl( wxWindow *parent, wxWindowID id = -1,
+      const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
+      long style = wxLC_ICON, const wxValidator& validator = wxDefaultValidator,
+       const wxString &name = "listctrl" )
+    {
+      Create(parent, id, pos, size, style, validator, name);
+    }

     ~wxListCtrl(void);
     ~wxListCtrl(void);

-    bool Create( wxWindow *parent, const wxWindowID id, 
-      const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, 
-      const long style = 0, const wxString &name = "listctrl" );
+    bool Create( wxWindow *parent, wxWindowID id = -1,
+      const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
+      long style = wxLC_ICON, const wxValidator& validator = wxDefaultValidator,
+       const wxString &name = "listctrl" );

     void OnSize( wxSizeEvent &event );
     void OnSize( wxSizeEvent &event );

-    void SetBackgroundColour( const wxColour& col );
-    bool GetColumn( const int col, wxListItem& item );
-    bool SetColumn( const int col, wxListItem& item );
-    int GetColumnWidth( const int col );
-    bool SetColumnWidth( const int col, const int width);
-    int GetCountPerPage(void); // not the same in wxGLC as in Windows, I think
+    bool GetColumn( int col, wxListItem& item ) const;
+    bool SetColumn( int col, wxListItem& item );
+    int GetColumnWidth( int col ) const;
+    bool SetColumnWidth( int col, int width);
+    int GetCountPerPage(void) const; // not the same in wxGLC as in Windows, I think

 //  wxText& GetEditControl(void) const; // not supported in wxGLC
 //  wxText& GetEditControl(void) const; // not supported in wxGLC

-    bool GetItem( wxListItem& info );
+    bool GetItem( wxListItem& info ) const;

     bool SetItem( wxListItem& info ) ;
     bool SetItem( wxListItem& info ) ;

-    long SetItem( const long index, const int col, const wxString& label, const int imageId = -1 );
-    int  GetItemState( const long item, const long stateMask );
-    bool SetItemState( const long item, const long state, const long stateMask); 
-    bool SetItemImage( const long item, const int image, const int selImage); 
-    wxString GetItemText( const long item );
-    void SetItemText( const long item, const wxString& str );
-    long GetItemData( const long item );
-    bool SetItemData( const long item, long data );
-    bool GetItemRect( const long item, wxRectangle& rect, const int code = wxLIST_RECT_BOUNDS ); // not supported in wxGLC
-    bool GetItemPosition( const long item, wxPoint& pos ) const; // not supported in wxGLC
-    bool SetItemPosition( const long item, const wxPoint& pos ); // not supported in wxGLC
-    int GetItemCount(void);
-    int GetItemSpacing( bool isSmall );
-    int GetSelectedItemCount(void);
+    long SetItem( long index, int col, const wxString& label, int imageId = -1 );
+    int  GetItemState( long item, long stateMask ) const;
+    bool SetItemState( long item, long state, long stateMask);
+    bool SetItemImage( long item, int image, int selImage);
+    wxString GetItemText( long item ) const;
+    void SetItemText( long item, const wxString& str );
+    long GetItemData( long item ) const;
+    bool SetItemData( long item, long data );
+    bool GetItemRect( long item, wxRect& rect, int code = wxLIST_RECT_BOUNDS ) const;
+    bool GetItemPosition( long item, wxPoint& pos ) const;
+    bool SetItemPosition( long item, const wxPoint& pos ); // not supported in wxGLC
+    int GetItemCount(void) const;
+    int GetColumnCount(void) const;
+    void SetItemSpacing( int spacing, bool isSmall = FALSE );
+    int GetItemSpacing( bool isSmall ) const;
+    int GetSelectedItemCount(void) const;

 //  wxColour GetTextColour(void) const; // wxGLC has colours for every Item (see wxListItem)
 //  void SetTextColour(const wxColour& col);
 //  wxColour GetTextColour(void) const; // wxGLC has colours for every Item (see wxListItem)
 //  void SetTextColour(const wxColour& col);

-    long GetTopItem(void);
-    void SetSingleStyle( const long style, const bool add = TRUE ) ;
-    void SetWindowStyleFlag(const long style);
+    long GetTopItem(void) const;
+    void SetSingleStyle( long style, bool add = TRUE ) ;
+    void SetWindowStyleFlag(long style);

     void RecreateWindow(void) {};
     void RecreateWindow(void) {};

-    void RealizeChanges( void );  // whereas this is much needed in wxGLC
-    long GetNextItem(const long item, int geometry = wxLIST_NEXT_ALL, int state = wxLIST_STATE_DONTCARE);
-    wxImageList *GetImageList(const int which);
-    void SetImageList(wxImageList *imageList, const int which) ;
-    bool Arrange( const int flag = wxLIST_ALIGN_DEFAULT ); // always wxLIST_ALIGN_LEFT in wxGLC
-    bool DeleteItem( const long item );
-    bool DeleteAllItems(void) ;
-    bool DeleteColumn( const int col );
-//  wxText& Edit(const long item) ;  // not supported in wxGLC
-    bool EnsureVisible( const long item );
-    long FindItem(const long start, const wxString& str, const bool partial = FALSE );
-    long FindItem(const long start, const long data);
-    long FindItem(const long start, const wxPoint& pt, const int direction); // not supported in wxGLC
+    long GetNextItem(long item, int geometry = wxLIST_NEXT_ALL, int state = wxLIST_STATE_DONTCARE) const;
+    wxImageList *GetImageList(int which) const;
+    void SetImageList(wxImageList *imageList, int which) ;
+    bool Arrange( int flag = wxLIST_ALIGN_DEFAULT ); // always wxLIST_ALIGN_LEFT in wxGLC
+    void ClearAll();
+    bool DeleteItem( long item );
+    bool DeleteAllItems(void);
+    bool DeleteAllColumns(void);
+    bool DeleteColumn( int col );
+//  wxText& Edit(long item) ;  // not supported in wxGLC
+    bool EnsureVisible( long item );
+    long FindItem(long start, const wxString& str, bool partial = FALSE );
+    long FindItem(long start, long data);
+    long FindItem(long start, const wxPoint& pt, int direction); // not supported in wxGLC

     long HitTest(const wxPoint& point, int& flags);
     long InsertItem(wxListItem& info);
     long HitTest(const wxPoint& point, int& flags);
     long InsertItem(wxListItem& info);

-    long InsertItem(const long index, const wxString& label);
-    long InsertItem(const long index, const int imageIndex);
-    long InsertItem(const long index, const wxString& label, const int imageIndex);
-    long InsertColumn(const long col, wxListItem& info);
-    long InsertColumn(const long col, const wxString& heading, const int format = wxLIST_FORMAT_LEFT,
-      const int width = -1);
-    bool ScrollList(const int dx, const int dy);
+    long InsertItem(long index, const wxString& label);
+    long InsertItem(long index, int imageIndex);
+    long InsertItem(long index, const wxString& label, int imageIndex);
+    long InsertColumn(long col, wxListItem& info);
+    long InsertColumn(long col, const wxString& heading, int format = wxLIST_FORMAT_LEFT,
+      int width = -1);
+    bool ScrollList(int dx, int dy);

     bool SortItems(wxListCtrlCompare fn, long data);
     bool SortItems(wxListCtrlCompare fn, long data);

-    bool Update(const long item);
-    virtual bool OnListNotify(wxListEvent& WXUNUSED(event)) { return FALSE; }
+    bool Update(long item);
+    void OnIdle( wxIdleEvent &event );
+    
+    // We have to hand down a few functions
+    
+    void SetBackgroundColour( const wxColour &colour );
+    void SetForegroundColour( const wxColour &colour );
+    void SetFont( const wxFont &font );
+    
+#if wxUSE_DRAG_AND_DROP

     void SetDropTarget( wxDropTarget *dropTarget )
     void SetDropTarget( wxDropTarget *dropTarget )

-      { m_mainWin->SetDropTarget( dropTarget ); };
+      { m_mainWin->SetDropTarget( dropTarget ); }

     wxDropTarget *GetDropTarget() const
     wxDropTarget *GetDropTarget() const

-      { return m_mainWin->GetDropTarget(); };
+      { return m_mainWin->GetDropTarget(); }
+#endif
+
+    void SetCursor( const wxCursor &cursor )
+      { if (m_mainWin) m_mainWin->wxWindow::SetCursor( cursor); }
+    wxColour GetBackgroundColour() const
+      { if (m_mainWin) return m_mainWin->GetBackgroundColour();
+        else return wxColour(); }
+    wxColour GetForegroundColour() const
+      { if (m_mainWin) return m_mainWin->GetForegroundColour();
+        else return wxColour(); }
+    bool PopupMenu( wxMenu *menu, int x, int y )
+      { return m_mainWin->PopupMenu( menu, x, y ); }
+    void SetFocus()
+      { m_mainWin->SetFocus(); }
+
+  // implementation

 
 

-  protected:
-  

 //  wxListTextCtrl       m_textCtrl;
 //  wxListTextCtrl       m_textCtrl;

-    wxImageList         *m_imageListNormal; 
-    wxImageList         *m_imageListSmall;  
+    wxImageList         *m_imageListNormal;
+    wxImageList         *m_imageListSmall;

     wxImageList         *m_imageListState;  // what's that ?
     wxListHeaderWindow  *m_headerWin;
     wxListMainWindow    *m_mainWin;
     wxImageList         *m_imageListState;  // what's that ?
     wxListHeaderWindow  *m_headerWin;
     wxListMainWindow    *m_mainWin;

-    
+

   DECLARE_EVENT_TABLE()
 
 };
   DECLARE_EVENT_TABLE()
 
 };