#include "wx/dcscreen.h"
#include "wx/app.h"
-#include "wx/generic/listctrl.h"
+#include "wx/listctrl.h"
#include "wx/generic/imaglist.h"
//-----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxListItemData,wxObject);
-wxListItemData::wxListItemData(void)
+wxListItemData::wxListItemData()
{
m_image = -1;
m_data = 0;
m_colour = col;
}
-bool wxListItemData::HasImage(void) const
+bool wxListItemData::HasImage() const
{
return (m_image >= 0);
}
-bool wxListItemData::HasText(void) const
+bool wxListItemData::HasText() const
{
return (!m_text.IsNull());
}
s = m_text;
}
-int wxListItemData::GetX( void ) const
+int wxListItemData::GetX() const
{
return m_xpos;
}
-int wxListItemData::GetY( void ) const
+int wxListItemData::GetY() const
{
return m_ypos;
}
-int wxListItemData::GetWidth(void) const
+int wxListItemData::GetWidth() const
{
return m_width;
}
-int wxListItemData::GetHeight(void) const
+int wxListItemData::GetHeight() const
{
return m_height;
}
-int wxListItemData::GetImage(void) const
+int wxListItemData::GetImage() const
{
return m_image;
}
info.m_text = m_text;
info.m_image = m_image;
info.m_data = m_data;
+ info.m_colour = m_colour;
}
-wxColour *wxListItemData::GetColour(void)
+wxColour *wxListItemData::GetColour()
{
return m_colour;
}
IMPLEMENT_DYNAMIC_CLASS(wxListHeaderData,wxObject);
-wxListHeaderData::wxListHeaderData(void)
+wxListHeaderData::wxListHeaderData()
{
m_mask = 0;
m_image = 0;
m_format = format;
}
-bool wxListHeaderData::HasImage(void) const
+bool wxListHeaderData::HasImage() const
{
return (m_image != 0);
}
-bool wxListHeaderData::HasText(void) const
+bool wxListHeaderData::HasText() const
{
return (m_text.Length() > 0);
}
s = m_text;
}
-int wxListHeaderData::GetImage(void) const
+int wxListHeaderData::GetImage() const
{
return m_image;
}
-int wxListHeaderData::GetWidth(void) const
+int wxListHeaderData::GetWidth() const
{
return m_width;
}
-int wxListHeaderData::GetFormat(void) const
+int wxListHeaderData::GetFormat() const
{
return m_format;
}
dc->GetTextExtent( s, &lw, &lh );
m_bound_all.width = lw;
m_bound_all.height = lh;
+ if (item->HasImage())
+ {
+ int w = 0;
+ int h = 0;
+ m_owner->GetImageSize( item->GetImage(), w, h );
+ m_bound_all.width += 4 + w;
+ if (h > m_bound_all.height) m_bound_all.height = h;
+ }
}
break;
}
wxString s;
item->GetText( s );
if (s.IsNull()) s = "H";
- long lw,lh;
- dc->GetTextExtent( s, &lw, &lh );
+ long lh;
+ dc->GetTextExtent( s, (long*) NULL, &lh );
item->SetSize( item->GetWidth(), lh );
- m_bound_all.width += lw;
m_bound_all.height = lh;
node = node->Next();
}
void wxListLineData::SetPosition( wxDC *dc, int x, int y, int window_width )
{
- m_bound_all.x = x;
- m_bound_all.y = y;
- switch (m_mode)
- {
- case wxLC_ICON:
- {
- AssignRect( m_bound_icon, 0, 0, 0, 0 );
- AssignRect( m_bound_label, 0, 0, 0, 0 );
- AssignRect( m_bound_hilight, m_bound_all );
- wxNode *node = m_items.First();
- if (node)
- {
- wxListItemData *item = (wxListItemData*)node->Data();
- if (item->HasImage())
+ m_bound_all.x = x;
+ m_bound_all.y = y;
+ switch (m_mode)
+ {
+ case wxLC_ICON:
+ {
+ AssignRect( m_bound_icon, 0, 0, 0, 0 );
+ AssignRect( m_bound_label, 0, 0, 0, 0 );
+ AssignRect( m_bound_hilight, m_bound_all );
+ wxNode *node = m_items.First();
+ if (node)
+ {
+ wxListItemData *item = (wxListItemData*)node->Data();
+ if (item->HasImage())
+ {
+ wxListItemData *item = (wxListItemData*)node->Data();
+ int w = 0;
+ int h = 0;
+ m_owner->GetImageSize( item->GetImage(), w, h );
+ m_bound_icon.x = m_bound_all.x + (m_spacing/2) - (w/2);
+ m_bound_icon.y = m_bound_all.y + m_spacing - h - 5;
+ m_bound_icon.width = w;
+ m_bound_icon.height = h;
+ if (!item->HasText())
+ {
+ AssignRect( m_bound_hilight, m_bound_icon );
+ m_bound_hilight.x -= 5;
+ m_bound_hilight.y -= 5;
+ m_bound_hilight.width += 9;
+ m_bound_hilight.height += 9;
+ }
+ }
+ if (item->HasText())
+ {
+ wxString s;
+ item->GetText( s );
+ long lw,lh;
+ dc->GetTextExtent( s, &lw, &lh );
+ if (m_bound_all.width > m_spacing)
+ m_bound_label.x = m_bound_all.x;
+ else
+ m_bound_label.x = m_bound_all.x + (m_spacing/2) - lw/2;
+ m_bound_label.y = m_bound_all.y + m_bound_all.height - lh;
+ m_bound_label.width = lw;
+ m_bound_label.height = lh;
+ AssignRect( m_bound_hilight, m_bound_label );
+ m_bound_hilight.x -= 2;
+ m_bound_hilight.y -= 2;
+ m_bound_hilight.width += 4;
+ m_bound_hilight.height += 4;
+ }
+ }
+ break;
+ }
+ case wxLC_LIST:
{
- wxListItemData *item = (wxListItemData*)node->Data();
- int w = 0;
- int h = 0;
- m_owner->GetImageSize( item->GetImage(), w, h );
- m_bound_icon.x = m_bound_all.x + (m_spacing/2) - (w/2);
- m_bound_icon.y = m_bound_all.y + m_spacing - h - 5;
- m_bound_icon.width = w;
- m_bound_icon.height = h;
- if (!item->HasText())
- {
- AssignRect( m_bound_hilight, m_bound_icon );
- m_bound_hilight.x -= 5;
- m_bound_hilight.y -= 5;
- m_bound_hilight.width += 9;
- m_bound_hilight.height += 9;
- }
+ AssignRect( m_bound_label, m_bound_all );
+ m_bound_all.x -= 2;
+ m_bound_all.y -= 2;
+ m_bound_all.width += 4;
+ m_bound_all.height += 3;
+ AssignRect( m_bound_hilight, m_bound_all );
+ AssignRect( m_bound_icon, 0, 0, 0, 0 );
+ wxNode *node = m_items.First();
+ if (node)
+ {
+ wxListItemData *item = (wxListItemData*)node->Data();
+ if (item->HasImage())
+ {
+ m_bound_icon.x = m_bound_all.x + 2;
+ m_bound_icon.y = m_bound_all.y + 2;
+ int w;
+ int h;
+ m_owner->GetImageSize( item->GetImage(), w, h );
+ m_bound_icon.width = w;
+ m_bound_icon.height = h;
+ m_bound_label.x += 4 + w;
+ m_bound_label.width -= 4 + w;
+ }
+ }
+ break;
}
- if (item->HasText())
+ case wxLC_REPORT:
{
- wxString s;
- item->GetText( s );
- long lw,lh;
- dc->GetTextExtent( s, &lw, &lh );
- if (m_bound_all.width > m_spacing)
- m_bound_label.x = m_bound_all.x;
- else
- m_bound_label.x = m_bound_all.x + (m_spacing/2) - lw/2;
- m_bound_label.y = m_bound_all.y + m_bound_all.height - lh;
- m_bound_label.width = lw;
- m_bound_label.height = lh;
- AssignRect( m_bound_hilight, m_bound_label );
- m_bound_hilight.x -= 2;
- m_bound_hilight.y -= 2;
- m_bound_hilight.width += 4;
- m_bound_hilight.height += 4;
+ long lw,lh;
+ dc->GetTextExtent( "H", &lw, &lh );
+ m_bound_all.x = 0;
+ m_bound_all.y -= 0;
+ m_bound_all.height = lh+3;
+ m_bound_all.width = window_width;
+ AssignRect( m_bound_hilight, m_bound_all );
+ AssignRect( m_bound_label, m_bound_all );
+ AssignRect( m_bound_icon, 0, 0, 0, 0 );
+ wxNode *node = m_items.First();
+ if (node)
+ {
+ wxListItemData *item = (wxListItemData*)node->Data();
+ wxString s;
+ item->GetText( s );
+ if (s.IsEmpty()) s = _T("H");
+ long lw,lh;
+ dc->GetTextExtent( s, &lw, &lh );
+ m_bound_label.width = lw;
+ m_bound_label.height = lh;
+ if (item->HasImage())
+ {
+ m_bound_icon.x = m_bound_all.x + 2;
+ m_bound_icon.y = m_bound_all.y + 2;
+ int w;
+ int h;
+ m_owner->GetImageSize( item->GetImage(), w, h );
+ m_bound_icon.width = w;
+ m_bound_icon.height = h;
+ m_bound_label.x += 4 + w;
+ }
+ }
+ break;
}
- }
- break;
}
- case wxLC_LIST:
- {
- AssignRect( m_bound_label, m_bound_all );
- m_bound_all.x -= 2;
- m_bound_all.y -= 2;
- m_bound_all.width += 4;
- m_bound_all.height += 3;
- AssignRect( m_bound_hilight, m_bound_all );
- AssignRect( m_bound_icon, 0, 0, 0, 0 );
- break;
- }
- case wxLC_REPORT:
- {
- long lw,lh;
- dc->GetTextExtent( "H", &lw, &lh );
- m_bound_all.x = 0;
- m_bound_all.y -= 0;
- m_bound_all.height = lh+3;
- m_bound_all.width = window_width;
- AssignRect( m_bound_hilight, m_bound_all );
- AssignRect( m_bound_label, 0, 0, 0 ,0 );
- AssignRect( m_bound_icon, 0, 0, 0, 0 );
- break;
- }
- }
}
void wxListLineData::SetColumnPosition( int index, int x )
for (int j = 0; j < m_owner->GetColumnCount(); j++)
{
xpos += m_owner->GetColumnWidth( j );
+ m_column = j;
if ((abs(x-xpos) < 3) && (y < 22))
{
hit_border = TRUE;
- m_column = j;
break;
}
+ if (x-xpos < 0)
+ {
+ break;
+ }
m_minX = xpos;
}
- if (event.LeftDown() && hit_border)
+ if (event.LeftDown())
{
- m_isDragging = TRUE;
- m_currentX = x;
- DrawCurrent();
- CaptureMouse();
- return;
+ if (hit_border)
+ {
+ m_isDragging = TRUE;
+ m_currentX = x;
+ DrawCurrent();
+ CaptureMouse();
+ return;
+ }
+ else
+ {
+ wxListEvent le( wxEVT_COMMAND_LIST_COL_CLICK, GetParent()->GetId() );
+ le.SetEventObject( GetParent() );
+ le.m_col = m_column;
+ GetParent()->GetEventHandler()->ProcessEvent( le );
+ return;
+ }
}
if (event.Moving())
m_res = res;
m_accept = accept;
m_owner = owner;
+ (*m_accept) = FALSE;
+ (*m_res) = "";
+ m_startValue = value;
}
void wxListTextCtrl::OnChar( wxKeyEvent &event )
{
(*m_accept) = TRUE;
(*m_res) = GetValue();
- m_owner->OnRenameAccept();
- if (!wxPendingDelete.Member(this)) wxPendingDelete.Append(this);
+ m_owner->SetFocus();
return;
}
if (event.m_keyCode == WXK_ESCAPE)
{
(*m_accept) = FALSE;
(*m_res) = "";
- if (!wxPendingDelete.Member(this)) wxPendingDelete.Append(this);
+ m_owner->SetFocus();
return;
}
event.Skip();
void wxListTextCtrl::OnKillFocus( wxFocusEvent &WXUNUSED(event) )
{
- (*m_accept) = FALSE;
- (*m_res) = "";
- if (!wxPendingDelete.Member(this)) wxPendingDelete.Append(this);
- return;
+ if (wxPendingDelete.Member(this)) return;
+
+ wxPendingDelete.Append(this);
+
+ if ((*m_accept) && ((*m_res) != m_startValue))
+ m_owner->OnRenameAccept();
}
//-----------------------------------------------------------------------------
EVT_KILL_FOCUS (wxListMainWindow::OnKillFocus)
END_EVENT_TABLE()
-wxListMainWindow::wxListMainWindow( void )
+wxListMainWindow::wxListMainWindow()
{
m_mode = 0;
m_lines.DeleteContents( TRUE );
SetBackgroundColour( *wxWHITE );
}
-wxListMainWindow::~wxListMainWindow( void )
+wxListMainWindow::~wxListMainWindow()
{
if (m_hilightBrush) delete m_hilightBrush;
/* *** */
-void wxListMainWindow::Edit( long item )
+void wxListMainWindow::EditLabel( long item )
{
wxNode *node = m_lines.Nth( item );
- wxCHECK_RET( node, "wrong index in wxListCtrl::Edit() ");
+ wxCHECK_RET( node, _T("wrong index in wxListCtrl::Edit()") );
m_currentEdit = (wxListLineData*) node->Data();
- wxListEvent le( wxEVT_COMMAND_LIST_END_LABEL_EDIT, GetParent()->GetId() );
+ wxListEvent le( wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT, GetParent()->GetId() );
le.SetEventObject( GetParent() );
le.m_itemIndex = GetIndexOfLine( m_currentEdit );
m_currentEdit->GetItem( 0, le.m_item );
GetParent()->GetEventHandler()->ProcessEvent( le );
- if (!le.IsAllowed()) return;
+ if (!le.IsAllowed())
+ return;
+ // We have to call this here because the label in
+ // question might just have been added and no screen
+ // update taken place.
+ if (m_dirty) wxYield();
+
wxString s;
m_currentEdit->GetText( 0, s );
int x = 0;
int w = 0;
int h = 0;
m_currentEdit->GetLabelExtent( x, y, w, h );
-
+
wxClientDC dc(this);
PrepareDC( dc );
x = dc.LogicalToDeviceX( x );
void wxListMainWindow::OnRenameTimer()
{
- wxCHECK_RET( m_current, "invalid m_current" );
+ wxCHECK_RET( m_current, _T("invalid m_current") );
Edit( m_lines.IndexOf( m_current ) );
}
if (!le.IsAllowed()) return;
- /* DO CHANGE LABEL */
+ wxListItem info;
+ info.m_mask = wxLIST_MASK_TEXT;
+ info.m_itemId = le.m_itemIndex;
+ info.m_text = m_renameRes;
+ info.m_colour = le.m_item.m_colour;
+ SetItem( info );
}
void wxListMainWindow::OnMouse( wxMouseEvent &event )
if (!m_current) return;
if (m_dirty) return;
+ if ( !(event.Dragging() || event.ButtonDown() || event.LeftUp() || event.ButtonDClick()) ) return;
wxClientDC dc(this);
PrepareDC(dc);
node = node->Next();
}
- if (!event.Dragging())
- m_dragCount = 0;
- else
- m_dragCount++;
-
- if (event.Dragging() && (m_dragCount > 3))
+ if (event.Dragging())
{
- m_dragCount = 0;
+ if (m_dragCount == 0)
+ m_dragStart = wxPoint(x,y);
+
+ m_dragCount++;
- wxListEvent le( wxEVT_COMMAND_LIST_BEGIN_DRAG, GetParent()->GetId() );
+ if (m_dragCount != 3) return;
+
+ int command = wxEVT_COMMAND_LIST_BEGIN_DRAG;
+ if (event.RightIsDown()) command = wxEVT_COMMAND_LIST_BEGIN_RDRAG;
+
+ wxListEvent le( command, GetParent()->GetId() );
le.SetEventObject( GetParent() );
- le.m_pointDrag.x = x;
- le.m_pointDrag.y = y;
+ le.m_pointDrag = m_dragStart;
GetParent()->GetEventHandler()->ProcessEvent( le );
return;
}
+ else
+ {
+ m_dragCount = 0;
+ }
if (!line) return;
m_usedKeys = TRUE;
}
+#ifdef __WXGTK__
+extern wxWindow *g_focusWindow;
+#endif
+
void wxListMainWindow::OnSetFocus( wxFocusEvent &WXUNUSED(event) )
{
m_hasFocus = TRUE;
RefreshLine( m_current );
if (!GetParent()) return;
+
+#ifdef __WXGTK__
+ g_focusWindow = GetParent();
+#endif
wxFocusEvent event( wxEVT_SET_FOCUS, GetParent()->GetId() );
event.SetEventObject( GetParent() );
{
m_small_image_list->Draw( index, *dc, x, y, wxIMAGELIST_DRAW_TRANSPARENT );
}
+ if ((m_mode & wxLC_LIST) && (m_small_image_list))
+ {
+ m_small_image_list->Draw( index, *dc, x, y, wxIMAGELIST_DRAW_TRANSPARENT );
+ }
if ((m_mode & wxLC_REPORT) && (m_small_image_list))
{
m_small_image_list->Draw( index, *dc, x, y, wxIMAGELIST_DRAW_TRANSPARENT );
m_small_image_list->GetSize( index, width, height );
return;
}
+ if ((m_mode & wxLC_LIST) && (m_small_image_list))
+ {
+ m_small_image_list->GetSize( index, width, height );
+ return;
+ }
if ((m_mode & wxLC_REPORT) && (m_small_image_list))
{
m_small_image_list->GetSize( index, width, height );
int x = 5; // painting is done at x-2
int y = 5; // painting is done at y-2
int maxWidth = 0;
+ m_visibleLines = 0;
+ int m_currentVisibleLines = 0;
wxNode *node = m_lines.First();
while (node)
{
+ m_currentVisibleLines++;
wxListLineData *line = (wxListLineData*)node->Data();
line->CalculateSize( &dc, iconSpacing );
line->SetPosition( &dc, x, y, clientWidth );
y += lineSpacing;
if (y+lineSpacing-6 >= clientHeight) // -6 for earlier "line breaking"
{
+ if (m_currentVisibleLines > m_visibleLines)
+ m_visibleLines = m_currentVisibleLines;
+ m_currentVisibleLines = 0;
y = 5;
x += maxWidth+6;
entireWidth += maxWidth+6;
if ((tries == 0) && (entireWidth > clientWidth))
{
clientHeight -= 15; // scrollbar height
+ m_visibleLines = 0;
+ m_currentVisibleLines = 0;
break;
}
if (!node) tries = 1; // everything fits, no second try required
}
}
- m_visibleLines = (clientHeight+6) / (lineSpacing); // +6 for earlier "line breaking"
+// m_visibleLines = (5+clientHeight+6) / (lineSpacing); // +6 for earlier "line breaking"
int scroll_pos = GetScrollPos( wxHORIZONTAL );
SetScrollbars( m_xScroll, m_yScroll, (entireWidth+15) / m_xScroll, 0, scroll_pos, 0, TRUE );
void wxListMainWindow::EnsureVisible( long index )
{
+ // We have to call this here because the label in
+ // question might just have been added and no screen
+ // update taken place.
+ if (m_dirty) wxYield();
+
wxListLineData *oldCurrent = m_current;
m_current = (wxListLineData *) NULL;
int i = index;
IMPLEMENT_DYNAMIC_CLASS(wxListItem, wxObject)
-wxListItem::wxListItem(void)
+wxListItem::wxListItem()
{
m_mask = 0;
m_itemId = 0;
EVT_IDLE (wxListCtrl::OnIdle)
END_EVENT_TABLE()
-wxListCtrl::wxListCtrl(void)
+wxListCtrl::wxListCtrl()
{
m_imageListNormal = (wxImageList *) NULL;
m_imageListSmall = (wxImageList *) NULL;
m_headerWin = (wxListHeaderWindow*) NULL;
}
-wxListCtrl::~wxListCtrl(void)
+wxListCtrl::~wxListCtrl()
{
}
{
m_headerWin = new wxListHeaderWindow( this, -1, m_mainWin,
wxPoint(0,0), wxSize(width,23), wxTAB_TRAVERSAL );
+ if (HasFlag(wxLC_NO_HEADER))
+ m_headerWin->Show( FALSE );
}
else
{
- m_headerWin->Show( TRUE );
+ if (flag & wxLC_NO_HEADER)
+ m_headerWin->Show( FALSE );
+ else
+ m_headerWin->Show( TRUE );
}
}
}
else
{
- if (HasFlag(wxLC_REPORT))
+ if (HasFlag(wxLC_REPORT) && !(HasFlag(wxLC_NO_HEADER)))
{
m_headerWin->Show( FALSE );
}
return TRUE;
}
-int wxListCtrl::GetCountPerPage(void) const
+int wxListCtrl::GetCountPerPage() const
{
return m_mainWin->GetCountPerPage(); // different from Windows ?
}
return 0;
}
-int wxListCtrl::GetItemCount(void) const
+int wxListCtrl::GetItemCount() const
{
return m_mainWin->GetItemCount();
}
-int wxListCtrl::GetColumnCount(void) const
+int wxListCtrl::GetColumnCount() const
{
return m_mainWin->GetColumnCount();
}
return m_mainWin->GetItemSpacing( isSmall );
}
-int wxListCtrl::GetSelectedItemCount(void) const
+int wxListCtrl::GetSelectedItemCount() const
{
return m_mainWin->GetSelectedItemCount();
}
/*
-wxColour wxListCtrl::GetTextColour(void) const
+wxColour wxListCtrl::GetTextColour() const
{
}
}
*/
-long wxListCtrl::GetTopItem(void) const
+long wxListCtrl::GetTopItem() const
{
return 0;
}
return TRUE;
}
-bool wxListCtrl::DeleteAllItems(void)
+bool wxListCtrl::DeleteAllItems()
{
m_mainWin->DeleteAllItems();
return TRUE;
int w = 0;
int h = 0;
- if (HasFlag(wxLC_REPORT))
+ if (HasFlag(wxLC_REPORT) && !HasFlag(wxLC_NO_HEADER))
{
m_headerWin->GetPosition( &x, &y );
m_headerWin->GetSize( &w, &h );
projects / wxWidgets.git / blobdiff