X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77e7a1dc48e084d1abbc06d5ab9e463d09f9ff51..44c4a3348693414bace13852e50d926c1aa9f08b:/include/wx/generic/listctrl.h diff --git a/include/wx/generic/listctrl.h b/include/wx/generic/listctrl.h index 6656631d38..afe4e8a7ce 100644 --- a/include/wx/generic/listctrl.h +++ b/include/wx/generic/listctrl.h @@ -190,7 +190,7 @@ class wxListItem: public wxObject // wxListEvent //----------------------------------------------------------------------------- -class WXDLLEXPORT wxListEvent: public wxCommandEvent +class WXDLLEXPORT wxListEvent: public wxNotifyEvent { DECLARE_DYNAMIC_CLASS(wxListEvent) @@ -209,20 +209,21 @@ class WXDLLEXPORT wxListEvent: public wxCommandEvent 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 }, //----------------------------------------------------------------------------- // wxListItemData (internal) @@ -232,7 +233,7 @@ class wxListItemData : public wxObject { DECLARE_DYNAMIC_CLASS(wxListItemData); - protected: + public: wxString m_text; int m_image; long m_data; @@ -306,7 +307,7 @@ class wxListLineData : public wxObject { DECLARE_DYNAMIC_CLASS(wxListLineData); - protected: + public: wxList m_items; wxRectangle m_bound_all; wxRectangle m_bound_label; @@ -359,14 +360,20 @@ class wxListHeaderWindow : public wxWindow wxListMainWindow *m_owner; wxCursor *m_currentCursor; wxCursor *m_resizeCursor; + bool m_isDraging; + int m_column; + int m_minX; + int m_currentX; public: wxListHeaderWindow( void ); + ~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( wxPaintDC *dc, int x, int y, int w, int h ); void OnPaint( wxPaintEvent &event ); + void DrawCurrent(); void OnMouse( wxMouseEvent &event ); void OnSetFocus( wxFocusEvent &event ); @@ -430,7 +437,6 @@ class wxListMainWindow: public wxScrolledWindow 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; @@ -456,7 +462,6 @@ class wxListMainWindow: public wxScrolledWindow void RefreshLine( wxListLineData *line ); void OnPaint( wxPaintEvent &event ); void HilightAll( bool on ); - void ActivateLine( wxListLineData *line ); void SendNotify( wxListLineData *line, wxEventType command ); void FocusLine( wxListLineData *line ); void UnfocusLine( wxListLineData *line ); @@ -474,7 +479,6 @@ class wxListMainWindow: public wxScrolledWindow 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 GetImageSize( int index, int &width, int &height ); int GetIndexOfLine( const wxListLineData *line ); @@ -515,7 +519,6 @@ class wxListMainWindow: public wxScrolledWindow void InsertColumn( long col, wxListItem &item ); // void AddColumn( wxListItem &item ); void SortItems( wxListCtrlCompare fn, long data ); - virtual bool OnListNotify( wxListEvent &event ); DECLARE_EVENT_TABLE() }; @@ -531,50 +534,56 @@ class wxListCtrl: public wxControl public: wxListCtrl(void); - wxListCtrl( wxWindow *parent, wxWindowID id, + wxListCtrl( wxWindow *parent, wxWindowID id = -1, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, - long style = 0, const wxString &name = "listctrl" ); + long style = wxLC_ICON, const wxValidator& validator = wxDefaultValidator, + const wxString &name = "listctrl" ) + { + Create(parent, id, pos, size, style, validator, name); + } ~wxListCtrl(void); - bool Create( wxWindow *parent, wxWindowID id, + bool Create( wxWindow *parent, wxWindowID id = -1, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, - long style = 0, const wxString &name = "listctrl" ); + long style = wxLC_ICON, const wxValidator& validator = wxDefaultValidator, + const wxString &name = "listctrl" ); void OnSize( wxSizeEvent &event ); - void SetBackgroundColour( const wxColour& col ); - bool GetColumn( int col, wxListItem& item ); + bool GetColumn( int col, wxListItem& item ) const; bool SetColumn( int col, wxListItem& item ); - int GetColumnWidth( int col ); + int GetColumnWidth( int col ) const; bool SetColumnWidth( int col, int width); - int GetCountPerPage(void); // not the same in wxGLC as in Windows, I think + int GetCountPerPage(void) const; // not the same in wxGLC as in Windows, I think // wxText& GetEditControl(void) const; // not supported in wxGLC - bool GetItem( wxListItem& info ); + bool GetItem( wxListItem& info ) const; bool SetItem( wxListItem& info ) ; long SetItem( long index, int col, const wxString& label, int imageId = -1 ); - int GetItemState( long item, long stateMask ); + 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 ); + wxString GetItemText( long item ) const; void SetItemText( long item, const wxString& str ); - long GetItemData( long item ); + long GetItemData( long item ) const; bool SetItemData( long item, long data ); - bool GetItemRect( long item, wxRectangle& rect, int code = wxLIST_RECT_BOUNDS ); - bool GetItemPosition( long item, wxPoint& pos ); + bool GetItemRect( long item, wxRectangle& 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); + int GetItemCount(void) const; + int GetColumnCount(void) const; void SetItemSpacing( int spacing, bool isSmall = FALSE ); - int GetItemSpacing( bool isSmall ); - int GetSelectedItemCount(void); + 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); - long GetTopItem(void); + long GetTopItem(void) const; void SetSingleStyle( long style, bool add = TRUE ) ; void SetWindowStyleFlag(long style); void RecreateWindow(void) {}; long GetNextItem(long item, int geometry = wxLIST_NEXT_ALL, int state = wxLIST_STATE_DONTCARE) const; - wxImageList *GetImageList(int which); + wxImageList *GetImageList(int which) const; void SetImageList(wxImageList *imageList, int which) ; bool Arrange( int flag = wxLIST_ALIGN_DEFAULT ); // always wxLIST_ALIGN_LEFT in wxGLC bool DeleteItem( long item ); bool DeleteAllItems(void) ; + void DeleteAllColumns(void) ; bool DeleteColumn( int col ); // wxText& Edit(long item) ; // not supported in wxGLC bool EnsureVisible( long item ); @@ -592,29 +601,30 @@ class wxListCtrl: public wxControl bool ScrollList(int dx, int dy); bool SortItems(wxListCtrlCompare fn, long data); bool Update(long item); - virtual bool OnListNotify(wxListEvent& WXUNUSED(event)) { return FALSE; } 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 ); + void SetDropTarget( wxDropTarget *dropTarget ) { m_mainWin->SetDropTarget( dropTarget ); } wxDropTarget *GetDropTarget() const { return m_mainWin->GetDropTarget(); } void SetCursor( const wxCursor &cursor ) - { m_mainWin->SetCursor( cursor); } + { if (m_mainWin) m_mainWin->wxWindow::SetCursor( cursor); } wxColour GetBackgroundColour() const - { return m_mainWin->GetBackgroundColour(); } - void SetBackgroundColour( const wxColour &colour ) - { m_mainWin->SetBackgroundColour(); } + { if (m_mainWin) return m_mainWin->GetBackgroundColour(); + else return wxColour(); } wxColour GetForegroundColour() const - { return m_mainWin->GetForegroundColour(); } - void SetForegroundColour( const wxColour &colour ) - { return m_mainWin->GetForegroundColour(); } + { if (m_mainWin) return m_mainWin->GetForegroundColour(); + else return wxColour(); } bool PopupMenu( wxMenu *menu, int x, int y ) - { m_mainWin->PopupMenu( menu, x, y ); } + { return m_mainWin->PopupMenu( menu, x, y ); } - protected: + // implementation // wxListTextCtrl m_textCtrl; wxImageList *m_imageListNormal;