Removed SetSizeHint from wxDialog (recompile)
Removed dialog modal flag
Code clean up here and there
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@674
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
17 files changed:
Speed up bitmap saving
wxBitmapHandler
Fix printing of bitmaps
Speed up bitmap saving
wxBitmapHandler
Fix printing of bitmaps
+wxRadioBox layout and setsize
TrueType support (just kidding)
wxTreeCtrl not yet finshed
TrueType support (just kidding)
wxTreeCtrl not yet finshed
virtual bool Show( bool show );
virtual int ShowModal(void);
virtual void EndModal(int retCode);
virtual bool Show( bool show );
virtual int ShowModal(void);
virtual void EndModal(int retCode);
- virtual bool IsModal(void) const { return ((GetWindowStyleFlag() & wxDIALOG_MODAL) == wxDIALOG_MODAL); }
+ virtual bool IsModal(void) const;
void SetModal( bool modal );
virtual void InitDialog(void);
virtual void Centre( int direction = wxHORIZONTAL );
void SetModal( bool modal );
virtual void InitDialog(void);
virtual void Centre( int direction = wxHORIZONTAL );
- virtual void SetSizeHints( int minW, int minH, int maxW, int maxH, int incW = -1 );
-
virtual void SetIcon( const wxIcon &icon );
virtual void Iconize( bool WXUNUSED(iconize)) { }
virtual bool IsIconized(void) const { return FALSE; }
virtual void SetIcon( const wxIcon &icon );
virtual void Iconize( bool WXUNUSED(iconize)) { }
virtual bool IsIconized(void) const { return FALSE; }
virtual bool Show( bool show );
virtual int ShowModal(void);
virtual void EndModal(int retCode);
virtual bool Show( bool show );
virtual int ShowModal(void);
virtual void EndModal(int retCode);
- virtual bool IsModal(void) const { return ((GetWindowStyleFlag() & wxDIALOG_MODAL) == wxDIALOG_MODAL); }
+ virtual bool IsModal(void) const;
void SetModal( bool modal );
virtual void InitDialog(void);
virtual void Centre( int direction = wxHORIZONTAL );
void SetModal( bool modal );
virtual void InitDialog(void);
virtual void Centre( int direction = wxHORIZONTAL );
- virtual void SetSizeHints( int minW, int minH, int maxW, int maxH, int incW = -1 );
-
virtual void SetIcon( const wxIcon &icon );
virtual void Iconize( bool WXUNUSED(iconize)) { }
virtual bool IsIconized(void) const { return FALSE; }
virtual void SetIcon( const wxIcon &icon );
virtual void Iconize( bool WXUNUSED(iconize)) { }
virtual bool IsIconized(void) const { return FALSE; }
m_width = width;
m_height = height;
Create();
m_width = width;
m_height = height;
Create();
wxImageList::~wxImageList()
{
wxImageList::~wxImageList()
{
int wxImageList::GetImageCount() const
{
return m_images.Number();
int wxImageList::GetImageCount() const
{
return m_images.Number();
bool wxImageList::Create()
{
m_images.DeleteContents( TRUE );
return TRUE;
bool wxImageList::Create()
{
m_images.DeleteContents( TRUE );
return TRUE;
int wxImageList::Add( const wxBitmap &bitmap )
{
m_images.Append( new wxBitmap(bitmap) );
return m_images.Number();
int wxImageList::Add( const wxBitmap &bitmap )
{
m_images.Append( new wxBitmap(bitmap) );
return m_images.Number();
wxBitmap *wxImageList::GetBitmap(int index) {
wxNode *node = m_images.Nth(index);
wxBitmap *wxImageList::GetBitmap(int index) {
wxNode *node = m_images.Nth(index);
wxNode *next = node->Next();
m_images.DeleteNode( node );
m_images.Insert( next, new wxBitmap(bitmap) );
wxNode *next = node->Next();
m_images.DeleteNode( node );
m_images.Insert( next, new wxBitmap(bitmap) );
bool wxImageList::Remove( int index )
{
wxNode *node = m_images.Nth( index );
if (node) m_images.DeleteNode( node );
return (node != NULL);
bool wxImageList::Remove( int index )
{
wxNode *node = m_images.Nth( index );
if (node) m_images.DeleteNode( node );
return (node != NULL);
bool wxImageList::RemoveAll()
{
m_images.Clear();
return TRUE;
bool wxImageList::RemoveAll()
{
m_images.Clear();
return TRUE;
bool wxImageList::GetSize( int index, int &width, int &height ) const
{
bool wxImageList::GetSize( int index, int &width, int &height ) const
{
width = 0;
height = 0;
return FALSE;
width = 0;
height = 0;
return FALSE;
bool wxImageList::Draw( int index, wxDC &dc, int x, int y,
int flags, bool WXUNUSED(solidBackground) )
bool wxImageList::Draw( int index, wxDC &dc, int x, int y,
int flags, bool WXUNUSED(solidBackground) )
(m_height != bm->GetHeight()))
{
bm->Resize( m_width, m_height );
(m_height != bm->GetHeight()))
{
bm->Resize( m_width, m_height );
dc.DrawIcon( *icon, x, y, (flags & wxIMAGELIST_DRAW_TRANSPARENT) > 0 );
return TRUE;
dc.DrawIcon( *icon, x, y, (flags & wxIMAGELIST_DRAW_TRANSPARENT) > 0 );
return TRUE;
m_width = 0;
m_height = 0;
m_colour = wxBLACK;
m_width = 0;
m_height = 0;
m_colour = wxBLACK;
wxListItemData::wxListItemData( const wxListItem &info )
{
wxListItemData::wxListItemData( const wxListItem &info )
{
m_data = 0;
m_colour = info.m_colour;
SetItem( info );
m_data = 0;
m_colour = info.m_colour;
SetItem( info );
void wxListItemData::SetItem( const wxListItem &info )
{
void wxListItemData::SetItem( const wxListItem &info )
{
m_ypos = 0;
m_width = info.m_width;
m_height = 0;
m_ypos = 0;
m_width = info.m_width;
m_height = 0;
void wxListItemData::SetText( const wxString &s )
{
m_text = s;
void wxListItemData::SetText( const wxString &s )
{
m_text = s;
void wxListItemData::SetImage( int image )
{
m_image = image;
void wxListItemData::SetImage( int image )
{
m_image = image;
void wxListItemData::SetData( long data )
{
m_data = data;
void wxListItemData::SetData( long data )
{
m_data = data;
void wxListItemData::SetPosition( int x, int y )
{
m_xpos = x;
m_ypos = y;
void wxListItemData::SetPosition( int x, int y )
{
m_xpos = x;
m_ypos = y;
void wxListItemData::SetSize( int const width, int height )
{
m_width = width;
m_height = height;
void wxListItemData::SetSize( int const width, int height )
{
m_width = width;
m_height = height;
void wxListItemData::SetColour( wxColour *col )
{
m_colour = col;
void wxListItemData::SetColour( wxColour *col )
{
m_colour = col;
bool wxListItemData::HasImage(void) const
{
return (m_image >= 0);
bool wxListItemData::HasImage(void) const
{
return (m_image >= 0);
bool wxListItemData::HasText(void) const
{
return (!m_text.IsNull());
bool wxListItemData::HasText(void) const
{
return (!m_text.IsNull());
bool wxListItemData::IsHit( int x, int y ) const
{
return ((x >= m_xpos) && (x <= m_xpos+m_width) && (y >= m_ypos) && (y <= m_ypos+m_height));
bool wxListItemData::IsHit( int x, int y ) const
{
return ((x >= m_xpos) && (x <= m_xpos+m_width) && (y >= m_ypos) && (y <= m_ypos+m_height));
void wxListItemData::GetText( wxString &s )
{
s = m_text;
void wxListItemData::GetText( wxString &s )
{
s = m_text;
int wxListItemData::GetX( void ) const
{
return m_xpos;
int wxListItemData::GetX( void ) const
{
return m_xpos;
int wxListItemData::GetY( void ) const
{
return m_ypos;
int wxListItemData::GetY( void ) const
{
return m_ypos;
int wxListItemData::GetWidth(void) const
{
return m_width;
int wxListItemData::GetWidth(void) const
{
return m_width;
int wxListItemData::GetHeight(void) const
{
return m_height;
int wxListItemData::GetHeight(void) const
{
return m_height;
int wxListItemData::GetImage(void) const
{
return m_image;
int wxListItemData::GetImage(void) const
{
return m_image;
void wxListItemData::GetItem( wxListItem &info )
{
info.m_text = m_text;
info.m_image = m_image;
info.m_data = m_data;
void wxListItemData::GetItem( wxListItem &info )
{
info.m_text = m_text;
info.m_image = m_image;
info.m_data = m_data;
wxColour *wxListItemData::GetColour(void)
{
return m_colour;
wxColour *wxListItemData::GetColour(void)
{
return m_colour;
//-----------------------------------------------------------------------------
// wxListHeaderData
//-----------------------------------------------------------------------------
// wxListHeaderData
m_xpos = 0;
m_ypos = 0;
m_height = 0;
m_xpos = 0;
m_ypos = 0;
m_height = 0;
wxListHeaderData::wxListHeaderData( const wxListItem &item )
{
wxListHeaderData::wxListHeaderData( const wxListItem &item )
{
m_xpos = 0;
m_ypos = 0;
m_height = 0;
m_xpos = 0;
m_ypos = 0;
m_height = 0;
void wxListHeaderData::SetItem( const wxListItem &item )
{
void wxListHeaderData::SetItem( const wxListItem &item )
{
m_width = item.m_width;
if (m_width < 0) m_width = 80;
if (m_width < 6) m_width = 6;
m_width = item.m_width;
if (m_width < 0) m_width = 80;
if (m_width < 6) m_width = 6;
void wxListHeaderData::SetPosition( int x, int y )
{
m_xpos = x;
m_ypos = y;
void wxListHeaderData::SetPosition( int x, int y )
{
m_xpos = x;
m_ypos = y;
void wxListHeaderData::SetHeight( int h )
{
m_height = h;
void wxListHeaderData::SetHeight( int h )
{
m_height = h;
void wxListHeaderData::SetWidth( int w )
{
m_width = w;
if (m_width < 0) m_width = 80;
if (m_width < 6) m_width = 6;
void wxListHeaderData::SetWidth( int w )
{
m_width = w;
if (m_width < 0) m_width = 80;
if (m_width < 6) m_width = 6;
void wxListHeaderData::SetFormat( int format )
{
m_format = format;
void wxListHeaderData::SetFormat( int format )
{
m_format = format;
bool wxListHeaderData::HasImage(void) const
{
return (m_image != 0);
bool wxListHeaderData::HasImage(void) const
{
return (m_image != 0);
bool wxListHeaderData::HasText(void) const
{
return (m_text.Length() > 0);
bool wxListHeaderData::HasText(void) const
{
return (m_text.Length() > 0);
bool wxListHeaderData::IsHit( int x, int y ) const
{
return ((x >= m_xpos) && (x <= m_xpos+m_width) && (y >= m_ypos) && (y <= m_ypos+m_height));
bool wxListHeaderData::IsHit( int x, int y ) const
{
return ((x >= m_xpos) && (x <= m_xpos+m_width) && (y >= m_ypos) && (y <= m_ypos+m_height));
void wxListHeaderData::GetItem( wxListItem &item )
{
void wxListHeaderData::GetItem( wxListItem &item )
{
item.m_image = m_image;
item.m_format = m_format;
item.m_width = m_width;
item.m_image = m_image;
item.m_format = m_format;
item.m_width = m_width;
void wxListHeaderData::GetText( wxString &s )
{
s = m_text;
void wxListHeaderData::GetText( wxString &s )
{
s = m_text;
int wxListHeaderData::GetImage(void) const
{
return m_image;
int wxListHeaderData::GetImage(void) const
{
return m_image;
int wxListHeaderData::GetWidth(void) const
{
return m_width;
int wxListHeaderData::GetWidth(void) const
{
return m_width;
int wxListHeaderData::GetFormat(void) const
{
return m_format;
int wxListHeaderData::GetFormat(void) const
{
return m_format;
//-----------------------------------------------------------------------------
// wxListLineData
//-----------------------------------------------------------------------------
// wxListLineData
m_hilightBrush = hilightBrush;
m_items.DeleteContents( TRUE );
m_spacing = 0;
m_hilightBrush = hilightBrush;
m_items.DeleteContents( TRUE );
m_spacing = 0;
void wxListLineData::CalculateSize( wxPaintDC *dc, int spacing )
{
void wxListLineData::CalculateSize( wxPaintDC *dc, int spacing )
{
long lw,lh;
dc->GetTextExtent( s, &lw, &lh );
if (lw > m_spacing) m_bound_all.width = lw;
long lw,lh;
dc->GetTextExtent( s, &lw, &lh );
if (lw > m_spacing) m_bound_all.width = lw;
case wxLC_LIST:
{
wxNode *node = m_items.First();
case wxLC_LIST:
{
wxNode *node = m_items.First();
dc->GetTextExtent( s, &lw, &lh );
m_bound_all.width = lw;
m_bound_all.height = lh;
dc->GetTextExtent( s, &lw, &lh );
m_bound_all.width = lw;
m_bound_all.height = lh;
case wxLC_REPORT:
{
m_bound_all.width = 0;
case wxLC_REPORT:
{
m_bound_all.width = 0;
m_bound_all.width += lw;
m_bound_all.height = lh;
node = node->Next();
m_bound_all.width += lw;
m_bound_all.height = lh;
node = node->Next();
void wxListLineData::SetPosition( wxPaintDC *dc, int x, int y, int window_width )
{
void wxListLineData::SetPosition( wxPaintDC *dc, int x, int y, int window_width )
{
m_bound_hilight.y -= 3;
m_bound_hilight.width += 7;
m_bound_hilight.height += 7;
m_bound_hilight.y -= 3;
m_bound_hilight.width += 7;
m_bound_hilight.height += 7;
if (item->HasText())
{
wxString s;
if (item->HasText())
{
wxString s;
m_bound_label.width = lw;
m_bound_label.height = lh;
AssignRect( m_bound_hilight, m_bound_label );
m_bound_label.width = lw;
m_bound_label.height = lh;
AssignRect( m_bound_hilight, m_bound_label );
case wxLC_LIST:
{
AssignRect( m_bound_label, m_bound_all );
AssignRect( m_bound_hilight, m_bound_all );
AssignRect( m_bound_icon, 0, 0, 0, 0 );
break;
case wxLC_LIST:
{
AssignRect( m_bound_label, m_bound_all );
AssignRect( m_bound_hilight, m_bound_all );
AssignRect( m_bound_icon, 0, 0, 0, 0 );
break;
case wxLC_REPORT:
{
long lw,lh;
case wxLC_REPORT:
{
long lw,lh;
m_bound_hilight.width = window_width-10;
m_bound_label.width = window_width-10;
break;
m_bound_hilight.width = window_width-10;
m_bound_label.width = window_width-10;
break;
void wxListLineData::SetColumnPosition( int index, int x )
{
void wxListLineData::SetColumnPosition( int index, int x )
{
{
wxListItemData *item = (wxListItemData*)node->Data();
item->SetPosition( x, m_bound_all.y );
{
wxListItemData *item = (wxListItemData*)node->Data();
item->SetPosition( x, m_bound_all.y );
void wxListLineData::GetSize( int &width, int &height )
{
width = m_bound_all.width;
height = m_bound_all.height;
void wxListLineData::GetSize( int &width, int &height )
{
width = m_bound_all.width;
height = m_bound_all.height;
void wxListLineData::GetExtent( int &x, int &y, int &width, int &height )
{
void wxListLineData::GetExtent( int &x, int &y, int &width, int &height )
{
y = m_bound_all.y;
width = m_bound_all.width;
height = m_bound_all.height;
y = m_bound_all.y;
width = m_bound_all.width;
height = m_bound_all.height;
void wxListLineData::GetLabelExtent( int &x, int &y, int &width, int &height )
{
void wxListLineData::GetLabelExtent( int &x, int &y, int &width, int &height )
{
y = m_bound_label.y;
width = m_bound_label.width;
height = m_bound_label.height;
y = m_bound_label.y;
width = m_bound_label.width;
height = m_bound_label.height;
void wxListLineData::GetRect( wxRectangle &rect )
{
AssignRect( rect, m_bound_all );
void wxListLineData::GetRect( wxRectangle &rect )
{
AssignRect( rect, m_bound_all );
long wxListLineData::IsHit( int x, int y )
{
long wxListLineData::IsHit( int x, int y )
{
if (item->HasImage() && IsInRect( x, y, m_bound_icon )) return wxLIST_HITTEST_ONITEMICON;
if (item->HasText() && IsInRect( x, y, m_bound_label )) return wxLIST_HITTEST_ONITEMLABEL;
// if (!(item->HasImage() || item->HasText())) return 0;
if (item->HasImage() && IsInRect( x, y, m_bound_icon )) return wxLIST_HITTEST_ONITEMICON;
if (item->HasText() && IsInRect( x, y, m_bound_label )) return wxLIST_HITTEST_ONITEMLABEL;
// if (!(item->HasImage() || item->HasText())) return 0;
// if there is no icon or text = empty
if (IsInRect( x, y, m_bound_all )) return wxLIST_HITTEST_ONITEMICON;
return 0;
// if there is no icon or text = empty
if (IsInRect( x, y, m_bound_all )) return wxLIST_HITTEST_ONITEMICON;
return 0;
void wxListLineData::InitItems( int num )
{
for (int i = 0; i < num; i++) m_items.Append( new wxListItemData() );
void wxListLineData::InitItems( int num )
{
for (int i = 0; i < num; i++) m_items.Append( new wxListItemData() );
void wxListLineData::SetItem( int index, const wxListItem &info )
{
void wxListLineData::SetItem( int index, const wxListItem &info )
{
{
wxListItemData *item = (wxListItemData*)node->Data();
item->SetItem( info );
{
wxListItemData *item = (wxListItemData*)node->Data();
item->SetItem( info );
void wxListLineData::GetItem( int const index, wxListItem &info )
{
void wxListLineData::GetItem( int const index, wxListItem &info )
{
{
wxListItemData *item = (wxListItemData*)node->Data();
item->GetItem( info );
{
wxListItemData *item = (wxListItemData*)node->Data();
item->GetItem( info );
void wxListLineData::GetText( int index, wxString &s )
{
void wxListLineData::GetText( int index, wxString &s )
{
{
wxListItemData *item = (wxListItemData*)node->Data();
item->GetText( s );
{
wxListItemData *item = (wxListItemData*)node->Data();
item->GetText( s );
void wxListLineData::SetText( int index, const wxString s )
{
void wxListLineData::SetText( int index, const wxString s )
{
{
wxListItemData *item = (wxListItemData*)node->Data();
item->SetText( s );
{
wxListItemData *item = (wxListItemData*)node->Data();
item->SetText( s );
int wxListLineData::GetImage( int index )
{
int wxListLineData::GetImage( int index )
{
{
wxListItemData *item = (wxListItemData*)node->Data();
return item->GetImage();
{
wxListItemData *item = (wxListItemData*)node->Data();
return item->GetImage();
void wxListLineData::DoDraw( wxPaintDC *dc, bool hilight, bool paintBG )
{
void wxListLineData::DoDraw( wxPaintDC *dc, bool hilight, bool paintBG )
{
{
dc->SetBrush( wxWHITE_BRUSH );
dc->SetPen( wxTRANSPARENT_PEN );
{
dc->SetBrush( wxWHITE_BRUSH );
dc->SetPen( wxTRANSPARENT_PEN );
dc->DrawRectangle( m_bound_hilight.x-2, m_bound_hilight.y-2,
m_bound_hilight.width+4, m_bound_hilight.height+4 );
dc->DrawRectangle( m_bound_hilight.x-2, m_bound_hilight.y-2,
m_bound_hilight.width+4, m_bound_hilight.height+4 );
if (m_mode == wxLC_REPORT)
{
wxString s;
if (m_mode == wxLC_REPORT)
{
wxString s;
dc->DrawText( s, info->GetX()+2, info->GetY() );
dc->DestroyClippingRegion();
node = node->Next();
dc->DrawText( s, info->GetX()+2, info->GetY() );
dc->DestroyClippingRegion();
node = node->Next();
if (item->HasImage())
{
m_owner->DrawImage( item->GetImage(), dc, m_bound_icon.x, m_bound_icon.y );
if (item->HasImage())
{
m_owner->DrawImage( item->GetImage(), dc, m_bound_icon.x, m_bound_icon.y );
if (item->HasText())
{
wxString s;
if (item->HasText())
{
wxString s;
else
dc->SetTextForeground( item->GetColour() );
dc->DrawText( s, m_bound_label.x, m_bound_label.y );
else
dc->SetTextForeground( item->GetColour() );
dc->DrawText( s, m_bound_label.x, m_bound_label.y );
void wxListLineData::Hilight( bool on )
{
void wxListLineData::Hilight( bool on )
{
else
m_owner->DeselectLine( this );
m_hilighted = on;
else
m_owner->DeselectLine( this );
m_hilighted = on;
void wxListLineData::ReverseHilight( void )
{
void wxListLineData::ReverseHilight( void )
{
m_owner->SelectLine( this );
else
m_owner->DeselectLine( this );
m_owner->SelectLine( this );
else
m_owner->DeselectLine( this );
void wxListLineData::DrawRubberBand( wxPaintDC *dc, bool on )
{
void wxListLineData::DrawRubberBand( wxPaintDC *dc, bool on )
{
dc->SetBrush( wxTRANSPARENT_BRUSH );
dc->DrawRectangle( m_bound_hilight.x-2, m_bound_hilight.y-2,
m_bound_hilight.width+4, m_bound_hilight.height+4 );
dc->SetBrush( wxTRANSPARENT_BRUSH );
dc->DrawRectangle( m_bound_hilight.x-2, m_bound_hilight.y-2,
m_bound_hilight.width+4, m_bound_hilight.height+4 );
void wxListLineData::Draw( wxPaintDC *dc )
{
DoDraw( dc, m_hilighted, m_hilighted );
void wxListLineData::Draw( wxPaintDC *dc )
{
DoDraw( dc, m_hilighted, m_hilighted );
bool wxListLineData::IsInRect( int x, int y, const wxRectangle &rect )
{
return ((x >= rect.x) && (x <= rect.x+rect.width) && (y >= rect.y) && (y <= rect.y+rect.height));
bool wxListLineData::IsInRect( int x, int y, const wxRectangle &rect )
{
return ((x >= rect.x) && (x <= rect.x+rect.width) && (y >= rect.y) && (y <= rect.y+rect.height));
bool wxListLineData::IsHilighted( void )
{
return m_hilighted;
bool wxListLineData::IsHilighted( void )
{
return m_hilighted;
void wxListLineData::AssignRect( wxRectangle &dest, int x, int y, int width, int height )
{
void wxListLineData::AssignRect( wxRectangle &dest, int x, int y, int width, int height )
{
dest.y = y;
dest.width = width;
dest.height = height;
dest.y = y;
dest.width = width;
dest.height = height;
void wxListLineData::AssignRect( wxRectangle &dest, const wxRectangle &source )
{
void wxListLineData::AssignRect( wxRectangle &dest, const wxRectangle &source )
{
dest.y = source.y;
dest.width = source.width;
dest.height = source.height;
dest.y = source.y;
dest.width = source.width;
dest.height = source.height;
//-----------------------------------------------------------------------------
// wxListHeaderWindow
//-----------------------------------------------------------------------------
// wxListHeaderWindow
m_owner = (wxListMainWindow *) NULL;
m_currentCursor = (wxCursor *) NULL;
m_resizeCursor = (wxCursor *) NULL;
m_owner = (wxListMainWindow *) NULL;
m_currentCursor = (wxCursor *) NULL;
m_resizeCursor = (wxCursor *) NULL;
wxListHeaderWindow::wxListHeaderWindow( wxWindow *win, wxWindowID id, wxListMainWindow *owner,
const wxPoint &pos, const wxSize &size,
wxListHeaderWindow::wxListHeaderWindow( wxWindow *win, wxWindowID id, wxListMainWindow *owner,
const wxPoint &pos, const wxSize &size,
// m_currentCursor = wxSTANDARD_CURSOR;
m_currentCursor = (wxCursor *) NULL;
m_resizeCursor = new wxCursor( wxCURSOR_SIZEWE );
// m_currentCursor = wxSTANDARD_CURSOR;
m_currentCursor = (wxCursor *) NULL;
m_resizeCursor = new wxCursor( wxCURSOR_SIZEWE );
void wxListHeaderWindow::DoDrawRect( wxPaintDC *dc, int x, int y, int w, int h )
{
void wxListHeaderWindow::DoDrawRect( wxPaintDC *dc, int x, int y, int w, int h )
{
// dc->DrawRectangle( x, y+1, w-m_corner, 1 ); // top (inner)
dc->DrawRectangle( x, y, 1, h ); // left (outer)
// dc->DrawRectangle( x+1, y, 1, h-1 ); // left (inner)
// dc->DrawRectangle( x, y+1, w-m_corner, 1 ); // top (inner)
dc->DrawRectangle( x, y, 1, h ); // left (outer)
// dc->DrawRectangle( x+1, y, 1, h-1 ); // left (inner)
void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
{
void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
{
dc.DestroyClippingRegion();
x += item.m_width;
if (x > w+5) break;
dc.DestroyClippingRegion();
x += item.m_width;
if (x > w+5) break;
void wxListHeaderWindow::OnMouse( wxMouseEvent &event )
{
void wxListHeaderWindow::OnMouse( wxMouseEvent &event )
{
{
xpos += m_owner->GetColumnWidth( j );
if ((abs(x-xpos) < 2) && (y < 14)) { hit = TRUE; break; }
{
xpos += m_owner->GetColumnWidth( j );
if ((abs(x-xpos) < 2) && (y < 14)) { hit = TRUE; break; }
if (hit)
{
if (m_currentCursor == wxSTANDARD_CURSOR) SetCursor( m_resizeCursor );
if (hit)
{
if (m_currentCursor == wxSTANDARD_CURSOR) SetCursor( m_resizeCursor );
{
if (m_currentCursor != wxSTANDARD_CURSOR) SetCursor( wxSTANDARD_CURSOR );
m_currentCursor = wxSTANDARD_CURSOR;
{
if (m_currentCursor != wxSTANDARD_CURSOR) SetCursor( wxSTANDARD_CURSOR );
m_currentCursor = wxSTANDARD_CURSOR;
void wxListHeaderWindow::OnSetFocus( wxFocusEvent &WXUNUSED(event) )
{
m_owner->SetFocus();
void wxListHeaderWindow::OnSetFocus( wxFocusEvent &WXUNUSED(event) )
{
m_owner->SetFocus();
//-----------------------------------------------------------------------------
// wxListRenameTimer (internal)
//-----------------------------------------------------------------------------
// wxListRenameTimer (internal)
wxListRenameTimer::wxListRenameTimer( wxListMainWindow *owner )
{
m_owner = owner;
wxListRenameTimer::wxListRenameTimer( wxListMainWindow *owner )
{
m_owner = owner;
void wxListRenameTimer::Notify()
{
m_owner->OnRenameTimer();
void wxListRenameTimer::Notify()
{
m_owner->OnRenameTimer();
//-----------------------------------------------------------------------------
// wxListTextCtrl (internal)
//-----------------------------------------------------------------------------
// wxListTextCtrl (internal)
m_hasFocus = FALSE;
m_usedKeys = TRUE;
m_lastOnSame = FALSE;
m_hasFocus = FALSE;
m_usedKeys = TRUE;
m_lastOnSame = FALSE;
-// m_renameTimer = new wxListRenameTimer( this );
- m_renameTimer = (wxTimer *) NULL;
+ m_renameTimer = new wxListRenameTimer( this );
m_isCreated = FALSE;
m_dragCount = 0;
m_isCreated = FALSE;
m_dragCount = 0;
wxListMainWindow::wxListMainWindow( wxWindow *parent, wxWindowID id,
const wxPoint &pos, const wxSize &size,
wxListMainWindow::wxListMainWindow( wxWindow *parent, wxWindowID id,
const wxPoint &pos, const wxSize &size,
{
m_xScroll = 15;
m_yScroll = 0;
{
m_xScroll = 15;
m_yScroll = 0;
SetScrollbars( m_xScroll, m_yScroll, 0, 0, 0, 0 );
m_usedKeys = TRUE;
SetScrollbars( m_xScroll, m_yScroll, 0, 0, 0, 0 );
m_usedKeys = TRUE;
// m_text->Show( FALSE );
SetBackgroundColour( *wxWHITE );
// m_text->Show( FALSE );
SetBackgroundColour( *wxWHITE );
wxListMainWindow::~wxListMainWindow( void )
{
wxListMainWindow::~wxListMainWindow( void )
{
// if (m_myFont) delete m_myFont;
delete m_renameTimer;
// delete m_text;
// if (m_myFont) delete m_myFont;
delete m_renameTimer;
// delete m_text;
void wxListMainWindow::RefreshLine( wxListLineData *line )
{
void wxListMainWindow::RefreshLine( wxListLineData *line )
{
dc.LogicalToDeviceXRel(w+6),
dc.LogicalToDeviceXRel(h+6) );
Refresh( TRUE, &rect );
dc.LogicalToDeviceXRel(w+6),
dc.LogicalToDeviceXRel(h+6) );
Refresh( TRUE, &rect );
void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
{
void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
{
wxListLineData *line = (wxListLineData*)node->Data();
line->Draw( &dc );
node = node->Next();
wxListLineData *line = (wxListLineData*)node->Data();
line->Draw( &dc );
node = node->Next();
if (m_current) m_current->DrawRubberBand( &dc, m_hasFocus );
dc.EndDrawing();
if (m_current) m_current->DrawRubberBand( &dc, m_hasFocus );
dc.EndDrawing();
void wxListMainWindow::HilightAll( bool on )
{
void wxListMainWindow::HilightAll( bool on )
{
{
line->Hilight( on );
RefreshLine( line );
{
line->Hilight( on );
RefreshLine( line );
void wxListMainWindow::ActivateLine( wxListLineData *line )
{
void wxListMainWindow::ActivateLine( wxListLineData *line )
{
le.m_col = 0;
line->GetItem( 0, le.m_item );
OnListNotify( le );
le.m_col = 0;
line->GetItem( 0, le.m_item );
OnListNotify( le );
void wxListMainWindow::SendNotify( wxListLineData *line, wxEventType command )
{
void wxListMainWindow::SendNotify( wxListLineData *line, wxEventType command )
{
le.m_col = 0;
line->GetItem( 0, le.m_item );
OnListNotify( le );
le.m_col = 0;
line->GetItem( 0, le.m_item );
OnListNotify( le );
void wxListMainWindow::FocusLine( wxListLineData *WXUNUSED(line) )
{
// SendNotify( line, wxEVT_COMMAND_LIST_ITEM_FOCUSSED );
void wxListMainWindow::FocusLine( wxListLineData *WXUNUSED(line) )
{
// SendNotify( line, wxEVT_COMMAND_LIST_ITEM_FOCUSSED );
void wxListMainWindow::UnfocusLine( wxListLineData *WXUNUSED(line) )
{
// SendNotify( line, wxEVT_COMMAND_LIST_ITEM_UNFOCUSSED );
void wxListMainWindow::UnfocusLine( wxListLineData *WXUNUSED(line) )
{
// SendNotify( line, wxEVT_COMMAND_LIST_ITEM_UNFOCUSSED );
void wxListMainWindow::SelectLine( wxListLineData *line )
{
SendNotify( line, wxEVT_COMMAND_LIST_ITEM_SELECTED );
void wxListMainWindow::SelectLine( wxListLineData *line )
{
SendNotify( line, wxEVT_COMMAND_LIST_ITEM_SELECTED );
void wxListMainWindow::DeselectLine( wxListLineData *line )
{
SendNotify( line, wxEVT_COMMAND_LIST_ITEM_DESELECTED );
void wxListMainWindow::DeselectLine( wxListLineData *line )
{
SendNotify( line, wxEVT_COMMAND_LIST_ITEM_DESELECTED );
void wxListMainWindow::DeleteLine( wxListLineData *line )
{
SendNotify( line, wxEVT_COMMAND_LIST_DELETE_ITEM );
void wxListMainWindow::DeleteLine( wxListLineData *line )
{
SendNotify( line, wxEVT_COMMAND_LIST_DELETE_ITEM );
void wxListMainWindow::StartLabelEdit( wxListLineData *line )
{
SendNotify( line, wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT );
void wxListMainWindow::StartLabelEdit( wxListLineData *line )
{
SendNotify( line, wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT );
void wxListMainWindow::RenameLine( wxListLineData *line, const wxString &newName )
{
void wxListMainWindow::RenameLine( wxListLineData *line, const wxString &newName )
{
line->GetItem( 0, le.m_item );
le.m_item.m_text = newName;
OnListNotify( le );
line->GetItem( 0, le.m_item );
le.m_item.m_text = newName;
OnListNotify( le );
void wxListMainWindow::OnRenameTimer()
{
void wxListMainWindow::OnRenameTimer()
{
m_dirty = TRUE;
s = res;
RenameLine( m_current, s );
m_dirty = TRUE;
s = res;
RenameLine( m_current, s );
void wxListMainWindow::OnRenameAccept()
{
RenameLine( m_current, m_renameRes );
void wxListMainWindow::OnRenameAccept()
{
RenameLine( m_current, m_renameRes );
void wxListMainWindow::OnMouse( wxMouseEvent &event )
{
void wxListMainWindow::OnMouse( wxMouseEvent &event )
{
if (hitResult) break;
line = (wxListLineData *) NULL;
node = node->Next();
if (hitResult) break;
line = (wxListLineData *) NULL;
node = node->Next();
if (!event.Dragging())
m_dragCount = 0;
if (!event.Dragging())
m_dragCount = 0;
le.m_itemIndex = 0;
le.m_col = 0;
OnListNotify( le );
le.m_itemIndex = 0;
le.m_col = 0;
OnListNotify( le );
m_renameTimer->Stop();
ActivateLine( line );
return;
m_renameTimer->Stop();
ActivateLine( line );
return;
if (event.LeftUp() && m_lastOnSame)
{
m_usedKeys = FALSE;
if ((line == m_current) &&
if (event.LeftUp() && m_lastOnSame)
{
m_usedKeys = FALSE;
if ((line == m_current) &&
- (hitResult == wxLIST_HITTEST_ONITEMLABEL) /* &&
- (m_mode & wxLC_ICON) */ )
+ (hitResult == wxLIST_HITTEST_ONITEMLABEL) &&
+// (m_mode & wxLC_ICON) &&
+ (m_mode & wxLC_EDIT_LABELS) )
{
m_renameTimer->Start( 100, TRUE );
{
m_renameTimer->Start( 100, TRUE );
m_lastOnSame = FALSE;
return;
m_lastOnSame = FALSE;
return;
numOfCurrent++;
if (test_line == oldCurrent) break;
node = node->Next();
numOfCurrent++;
if (test_line == oldCurrent) break;
node = node->Next();
int numOfLine = -1;
node = m_lines.First();
while (node)
int numOfLine = -1;
node = m_lines.First();
while (node)
numOfLine++;
if (test_line == line) break;
node = node->Next();
numOfLine++;
if (test_line == line) break;
node = node->Next();
if (numOfLine < numOfCurrent)
{ int i = numOfLine; numOfLine = numOfCurrent; numOfCurrent = i; }
if (numOfLine < numOfCurrent)
{ int i = numOfLine; numOfLine = numOfCurrent; numOfCurrent = i; }
RefreshLine( oldCurrent );
UnfocusLine( oldCurrent );
FocusLine( m_current );
RefreshLine( oldCurrent );
UnfocusLine( oldCurrent );
FocusLine( m_current );
m_lastOnSame = (m_current == oldCurrent);
return;
m_lastOnSame = (m_current == oldCurrent);
return;
void wxListMainWindow::MoveToFocus( void )
{
void wxListMainWindow::MoveToFocus( void )
{
if ((x > x_s) && (x+w < x_s+w_p)) return;
if (x-x_s < 5) SetScrollPos( wxHORIZONTAL, (x-5)/m_xScroll );
if (x+w > x_s+w_p) SetScrollPos( wxHORIZONTAL, (x+w-w_p+5)/m_xScroll );
if ((x > x_s) && (x+w < x_s+w_p)) return;
if (x-x_s < 5) SetScrollPos( wxHORIZONTAL, (x-5)/m_xScroll );
if (x+w > x_s+w_p) SetScrollPos( wxHORIZONTAL, (x+w-w_p+5)/m_xScroll );
void wxListMainWindow::OnArrowChar( wxListLineData *newCurrent, bool shiftDown )
{
void wxListMainWindow::OnArrowChar( wxListLineData *newCurrent, bool shiftDown )
{
RefreshLine( oldCurrent );
FocusLine( m_current );
UnfocusLine( oldCurrent );
RefreshLine( oldCurrent );
FocusLine( m_current );
UnfocusLine( oldCurrent );
void wxListMainWindow::OnChar( wxKeyEvent &event )
{
void wxListMainWindow::OnChar( wxKeyEvent &event )
{
else
TravNext( &event );
return;
else
TravNext( &event );
return;
*/
if (!m_current) return;
switch (event.KeyCode())
*/
if (!m_current) return;
switch (event.KeyCode())
wxNode *node = m_lines.Member( m_current )->Previous();
if (node) OnArrowChar( (wxListLineData*)node->Data(), event.ShiftDown() );
break;
wxNode *node = m_lines.Member( m_current )->Previous();
if (node) OnArrowChar( (wxListLineData*)node->Data(), event.ShiftDown() );
break;
case WXK_DOWN:
{
wxNode *node = m_lines.Member( m_current )->Next();
if (node) OnArrowChar( (wxListLineData*)node->Data(), event.ShiftDown() );
break;
case WXK_DOWN:
{
wxNode *node = m_lines.Member( m_current )->Next();
if (node) OnArrowChar( (wxListLineData*)node->Data(), event.ShiftDown() );
break;
case WXK_END:
{
wxNode *node = m_lines.Last();
OnArrowChar( (wxListLineData*)node->Data(), event.ShiftDown() );
break;
case WXK_END:
{
wxNode *node = m_lines.Last();
OnArrowChar( (wxListLineData*)node->Data(), event.ShiftDown() );
break;
case WXK_HOME:
{
wxNode *node = m_lines.First();
OnArrowChar( (wxListLineData*)node->Data(), event.ShiftDown() );
break;
case WXK_HOME:
{
wxNode *node = m_lines.First();
OnArrowChar( (wxListLineData*)node->Data(), event.ShiftDown() );
break;
case WXK_PRIOR:
{
int steps = 0;
case WXK_PRIOR:
{
int steps = 0;
{
int pos = 0;
wxNode *node = m_lines.First();
{
int pos = 0;
wxNode *node = m_lines.First();
- for (;;) { if (m_current == (wxListLineData*)node->Data()) break; pos++; node = node->Next(); };
+ for (;;) { if (m_current == (wxListLineData*)node->Data()) break; pos++; node = node->Next(); }
steps = pos % m_visibleLines;
steps = pos % m_visibleLines;
wxNode *node = m_lines.Member( m_current );
for (int i = 0; i < steps; i++) if (node->Previous()) node = node->Previous();
if (node) OnArrowChar( (wxListLineData*)node->Data(), event.ShiftDown() );
break;
wxNode *node = m_lines.Member( m_current );
for (int i = 0; i < steps; i++) if (node->Previous()) node = node->Previous();
if (node) OnArrowChar( (wxListLineData*)node->Data(), event.ShiftDown() );
break;
case WXK_NEXT:
{
int steps = 0;
case WXK_NEXT:
{
int steps = 0;
else
{
int pos = 0; wxNode *node = m_lines.First();
else
{
int pos = 0; wxNode *node = m_lines.First();
- for (;;) { if (m_current == (wxListLineData*)node->Data()) break; pos++; node = node->Next(); };
+ for (;;) { if (m_current == (wxListLineData*)node->Data()) break; pos++; node = node->Next(); }
steps = m_visibleLines-(pos % m_visibleLines)-1;
steps = m_visibleLines-(pos % m_visibleLines)-1;
wxNode *node = m_lines.Member( m_current );
for (int i = 0; i < steps; i++) if (node->Next()) node = node->Next();
if (node) OnArrowChar( (wxListLineData*)node->Data(), event.ShiftDown() );
break;
wxNode *node = m_lines.Member( m_current );
for (int i = 0; i < steps; i++) if (node->Next()) node = node->Next();
if (node) OnArrowChar( (wxListLineData*)node->Data(), event.ShiftDown() );
break;
case WXK_LEFT:
{
if (!(m_mode & wxLC_REPORT))
case WXK_LEFT:
{
if (!(m_mode & wxLC_REPORT))
wxNode *node = m_lines.Member( m_current );
for (int i = 0; i <m_visibleLines; i++) if (node->Previous()) node = node->Previous();
if (node) OnArrowChar( (wxListLineData*)node->Data(), event.ShiftDown() );
wxNode *node = m_lines.Member( m_current );
for (int i = 0; i <m_visibleLines; i++) if (node->Previous()) node = node->Previous();
if (node) OnArrowChar( (wxListLineData*)node->Data(), event.ShiftDown() );
case WXK_RIGHT:
{
if (!(m_mode & wxLC_REPORT))
case WXK_RIGHT:
{
if (!(m_mode & wxLC_REPORT))
wxNode *node = m_lines.Member( m_current );
for (int i = 0; i <m_visibleLines; i++) if (node->Next()) node = node->Next();
if (node) OnArrowChar( (wxListLineData*)node->Data(), event.ShiftDown() );
wxNode *node = m_lines.Member( m_current );
for (int i = 0; i <m_visibleLines; i++) if (node->Next()) node = node->Next();
if (node) OnArrowChar( (wxListLineData*)node->Data(), event.ShiftDown() );
case WXK_SPACE:
{
m_current->ReverseHilight();
RefreshLine( m_current );
case WXK_SPACE:
{
m_current->ReverseHilight();
RefreshLine( m_current );
break;
case WXK_INSERT:
{
break;
case WXK_INSERT:
{
RefreshLine( m_current );
UnfocusLine( oldCurrent );
FocusLine( m_current );
RefreshLine( m_current );
UnfocusLine( oldCurrent );
FocusLine( m_current );
break;
case WXK_RETURN:
case WXK_EXECUTE:
{
ActivateLine( m_current );
break;
case WXK_RETURN:
case WXK_EXECUTE:
{
ActivateLine( m_current );
break;
default:
{
event.Skip();
return;
break;
default:
{
event.Skip();
return;
void wxListMainWindow::OnSetFocus( wxFocusEvent &WXUNUSED(event) )
{
void wxListMainWindow::OnSetFocus( wxFocusEvent &WXUNUSED(event) )
{
wxFocusEvent event( wxEVT_SET_FOCUS, m_parent->GetId() );
event.SetEventObject( m_parent );
m_parent->ProcessEvent( event );
wxFocusEvent event( wxEVT_SET_FOCUS, m_parent->GetId() );
event.SetEventObject( m_parent );
m_parent->ProcessEvent( event );
void wxListMainWindow::OnKillFocus( wxFocusEvent &WXUNUSED(event) )
{
m_hasFocus = FALSE;
RefreshLine( m_current );
void wxListMainWindow::OnKillFocus( wxFocusEvent &WXUNUSED(event) )
{
m_hasFocus = FALSE;
RefreshLine( m_current );
void wxListMainWindow::OnSize( wxSizeEvent &WXUNUSED(event) )
{
void wxListMainWindow::OnSize( wxSizeEvent &WXUNUSED(event) )
{
Refresh();
event.Skip();
*/
Refresh();
event.Skip();
*/
wxFont *wxListMainWindow::GetMyFont( void )
{
return m_myFont;
wxFont *wxListMainWindow::GetMyFont( void )
{
return m_myFont;
void wxListMainWindow::DrawImage( int index, wxPaintDC *dc, int x, int y )
{
void wxListMainWindow::DrawImage( int index, wxPaintDC *dc, int x, int y )
{
{
m_normal_image_list->Draw( index, *dc, x, y, wxIMAGELIST_DRAW_TRANSPARENT );
return;
{
m_normal_image_list->Draw( index, *dc, x, y, wxIMAGELIST_DRAW_TRANSPARENT );
return;
if ((m_mode & wxLC_SMALL_ICON) && (m_small_image_list))
{
m_small_image_list->Draw( index, *dc, x, y, wxIMAGELIST_DRAW_TRANSPARENT );
if ((m_mode & wxLC_SMALL_ICON) && (m_small_image_list))
{
m_small_image_list->Draw( index, *dc, x, y, wxIMAGELIST_DRAW_TRANSPARENT );
void wxListMainWindow::GetImageSize( int index, int &width, int &height )
{
void wxListMainWindow::GetImageSize( int index, int &width, int &height )
{
{
m_normal_image_list->GetSize( index, width, height );
return;
{
m_normal_image_list->GetSize( index, width, height );
return;
if ((m_mode & wxLC_SMALL_ICON) && (m_small_image_list))
{
m_small_image_list->GetSize( index, width, height );
return;
if ((m_mode & wxLC_SMALL_ICON) && (m_small_image_list))
{
m_small_image_list->GetSize( index, width, height );
return;
int wxListMainWindow::GetTextLength( wxString &s )
{
int wxListMainWindow::GetTextLength( wxString &s )
{
long lh = 0;
dc.GetTextExtent( s, &lw, &lh );
return lw + 6;
long lh = 0;
dc.GetTextExtent( s, &lw, &lh );
return lw + 6;
int wxListMainWindow::GetIndexOfLine( const wxListLineData *line )
{
int wxListMainWindow::GetIndexOfLine( const wxListLineData *line )
{
if (line == (wxListLineData*)node->Data()) return i;
i++;
node = node->Next();
if (line == (wxListLineData*)node->Data()) return i;
i++;
node = node->Next();
void wxListMainWindow::SetImageList( wxImageList *imageList, int which )
{
m_dirty = TRUE;
if (which == wxIMAGE_LIST_NORMAL) m_normal_image_list = imageList;
if (which == wxIMAGE_LIST_SMALL) m_small_image_list = imageList;
void wxListMainWindow::SetImageList( wxImageList *imageList, int which )
{
m_dirty = TRUE;
if (which == wxIMAGE_LIST_NORMAL) m_normal_image_list = imageList;
if (which == wxIMAGE_LIST_SMALL) m_small_image_list = imageList;
void wxListMainWindow::SetItemSpacing( int spacing, bool isSmall )
{
void wxListMainWindow::SetItemSpacing( int spacing, bool isSmall )
{
else
{
m_normal_spacing = spacing;
else
{
m_normal_spacing = spacing;
int wxListMainWindow::GetItemSpacing( bool isSmall )
{
if (isSmall) return m_small_spacing; else return m_normal_spacing;
int wxListMainWindow::GetItemSpacing( bool isSmall )
{
if (isSmall) return m_small_spacing; else return m_normal_spacing;
void wxListMainWindow::SetColumn( int col, wxListItem &item )
{
void wxListMainWindow::SetColumn( int col, wxListItem &item )
{
if (item.m_width == wxLIST_AUTOSIZE_USEHEADER) item.m_width = GetTextLength( item.m_text )+7;
wxListHeaderData *column = (wxListHeaderData*)node->Data();
column->SetItem( item );
if (item.m_width == wxLIST_AUTOSIZE_USEHEADER) item.m_width = GetTextLength( item.m_text )+7;
wxListHeaderData *column = (wxListHeaderData*)node->Data();
column->SetItem( item );
void wxListMainWindow::SetColumnWidth( int col, int width )
{
void wxListMainWindow::SetColumnWidth( int col, int width )
{
{
wxListHeaderData *column = (wxListHeaderData*)node->Data();
column->SetWidth( width );
{
wxListHeaderData *column = (wxListHeaderData*)node->Data();
column->SetWidth( width );
void wxListMainWindow::GetColumn( int col, wxListItem &item )
{
void wxListMainWindow::GetColumn( int col, wxListItem &item )
{
item.m_text = "";
item.m_image = 0;
item.m_data = 0;
item.m_text = "";
item.m_image = 0;
item.m_data = 0;
int wxListMainWindow::GetColumnWidth( int col )
{
int wxListMainWindow::GetColumnWidth( int col )
{
int wxListMainWindow::GetColumnCount( void )
{
return m_columns.Number();
int wxListMainWindow::GetColumnCount( void )
{
return m_columns.Number();
int wxListMainWindow::GetCountPerPage( void )
{
return m_visibleLines;
int wxListMainWindow::GetCountPerPage( void )
{
return m_visibleLines;
void wxListMainWindow::SetItem( wxListItem &item )
{
void wxListMainWindow::SetItem( wxListItem &item )
{
wxListLineData *line = (wxListLineData*)node->Data();
if (m_mode & wxLC_REPORT) item.m_width = GetColumnWidth( item.m_col )-3;
line->SetItem( item.m_col, item );
wxListLineData *line = (wxListLineData*)node->Data();
if (m_mode & wxLC_REPORT) item.m_width = GetColumnWidth( item.m_col )-3;
line->SetItem( item.m_col, item );
void wxListMainWindow::SetItemState( long item, long state, long stateMask )
{
// m_dirty = TRUE; no recalcs needed
void wxListMainWindow::SetItemState( long item, long state, long stateMask )
{
// m_dirty = TRUE; no recalcs needed
wxListLineData *oldCurrent = m_current;
wxListLineData *oldCurrent = m_current;
if (stateMask & wxLIST_STATE_FOCUSED)
{
wxNode *node = m_lines.Nth( item );
if (stateMask & wxLIST_STATE_FOCUSED)
{
wxNode *node = m_lines.Nth( item );
FocusLine( m_current );
RefreshLine( m_current );
RefreshLine( oldCurrent );
FocusLine( m_current );
RefreshLine( m_current );
RefreshLine( oldCurrent );
if (stateMask & wxLIST_STATE_SELECTED)
{
if (stateMask & wxLIST_STATE_SELECTED)
{
+ bool on = state & wxLIST_STATE_SELECTED;
+ if (!on && (m_mode & wxLC_SINGLE_SEL)) return;
+
wxNode *node = m_lines.Nth( item );
if (node)
{
wxListLineData *line = (wxListLineData*)node->Data();
wxNode *node = m_lines.Nth( item );
if (node)
{
wxListLineData *line = (wxListLineData*)node->Data();
+ if (m_mode & wxLC_SINGLE_SEL)
+ {
+ UnfocusLine( m_current );
+ m_current = line;
+ FocusLine( m_current );
+ oldCurrent->Hilight( FALSE );
+ RefreshLine( m_current );
+ RefreshLine( oldCurrent );
+ }
bool on = state & wxLIST_STATE_SELECTED;
line->Hilight( on );
RefreshLine( line );
bool on = state & wxLIST_STATE_SELECTED;
line->Hilight( on );
RefreshLine( line );
int wxListMainWindow::GetItemState( long item, long stateMask )
{
int wxListMainWindow::GetItemState( long item, long stateMask )
{
{
wxListLineData *line = (wxListLineData*)node->Data();
if (line == m_current) ret |= wxLIST_STATE_FOCUSED;
{
wxListLineData *line = (wxListLineData*)node->Data();
if (line == m_current) ret |= wxLIST_STATE_FOCUSED;
if (stateMask & wxLIST_STATE_SELECTED)
{
wxNode *node = m_lines.Nth( item );
if (stateMask & wxLIST_STATE_SELECTED)
{
wxNode *node = m_lines.Nth( item );
{
wxListLineData *line = (wxListLineData*)node->Data();
if (line->IsHilighted()) ret |= wxLIST_STATE_FOCUSED;
{
wxListLineData *line = (wxListLineData*)node->Data();
if (line->IsHilighted()) ret |= wxLIST_STATE_FOCUSED;
void wxListMainWindow::GetItem( wxListItem &item )
{
void wxListMainWindow::GetItem( wxListItem &item )
{
item.m_text = "";
item.m_image = 0;
item.m_data = 0;
item.m_text = "";
item.m_image = 0;
item.m_data = 0;
int wxListMainWindow::GetItemCount( void )
{
return m_lines.Number();
int wxListMainWindow::GetItemCount( void )
{
return m_lines.Number();
void wxListMainWindow::GetItemRect( long index, wxRectangle &rect )
{
void wxListMainWindow::GetItemRect( long index, wxRectangle &rect )
{
rect.y = 0;
rect.width = 0;
rect.height = 0;
rect.y = 0;
rect.width = 0;
rect.height = 0;
bool wxListMainWindow::GetItemPosition(long item, wxPoint& pos)
{
bool wxListMainWindow::GetItemPosition(long item, wxPoint& pos)
{
int wxListMainWindow::GetSelectedItemCount( void )
{
int wxListMainWindow::GetSelectedItemCount( void )
{
wxListLineData *line = (wxListLineData*)node->Data();
if (line->IsHilighted()) ret++;
node = node->Next();
wxListLineData *line = (wxListLineData*)node->Data();
if (line->IsHilighted()) ret++;
node = node->Next();
void wxListMainWindow::SetMode( long mode )
{
void wxListMainWindow::SetMode( long mode )
{
{
m_xScroll = 15;
m_yScroll = 0;
{
m_xScroll = 15;
m_yScroll = 0;
long wxListMainWindow::GetMode( void ) const
{
return m_mode;
long wxListMainWindow::GetMode( void ) const
{
return m_mode;
void wxListMainWindow::CalculatePositions( void )
{
void wxListMainWindow::CalculatePositions( void )
{
wxListLineData *line = (wxListLineData*)node->Data();
line->CalculateSize( &dc, iconSpacing );
node = node->Next();
wxListLineData *line = (wxListLineData*)node->Data();
line->CalculateSize( &dc, iconSpacing );
node = node->Next();
int lineWidth = 0;
int lineHeight = 0;
int lineWidth = 0;
int lineHeight = 0;
{
// just in case
lineSpacing = 6 + (int)dc.GetCharHeight();
{
// just in case
lineSpacing = 6 + (int)dc.GetCharHeight();
int clientWidth = 0;
int clientHeight = 0;
int clientWidth = 0;
int clientHeight = 0;
{
line->SetColumnPosition( i, col_x );
col_x += GetColumnWidth( i );
{
line->SetColumnPosition( i, col_x );
col_x += GetColumnWidth( i );
y += lineSpacing;
node = node->Next();
y += lineSpacing;
node = node->Next();
x += maxWidth+13;
entireWidth += maxWidth+13;
maxWidth = 0;
x += maxWidth+13;
entireWidth += maxWidth+13;
maxWidth = 0;
node = node->Next();
if (!node) entireWidth += maxWidth;
if ((tries == 0) && (entireWidth > clientWidth))
{
clientHeight -= 14; // scrollbar height
break;
node = node->Next();
if (!node) entireWidth += maxWidth;
if ((tries == 0) && (entireWidth > clientWidth))
{
clientHeight -= 14; // scrollbar height
break;
SetScrollbars( m_xScroll, m_yScroll, (entireWidth+15) / m_xScroll, 0, 0, 0, TRUE );
SetScrollbars( m_xScroll, m_yScroll, (entireWidth+15) / m_xScroll, 0, 0, 0, TRUE );
m_visibleLines = (clientHeight-4) / (lineSpacing);
m_visibleLines = (clientHeight-4) / (lineSpacing);
void wxListMainWindow::RealizeChanges( void )
{
void wxListMainWindow::RealizeChanges( void )
{
{
wxNode *node = m_lines.First();
if (node) m_current = (wxListLineData*)node->Data();
{
wxNode *node = m_lines.First();
if (node) m_current = (wxListLineData*)node->Data();
if (m_current)
{
FocusLine( m_current );
if (m_mode & wxLC_SINGLE_SEL) m_current->Hilight( TRUE );
if (m_current)
{
FocusLine( m_current );
if (m_mode & wxLC_SINGLE_SEL) m_current->Hilight( TRUE );
long wxListMainWindow::GetNextItem( long item, int WXUNUSED(geometry), int state )
{
long wxListMainWindow::GetNextItem( long item, int WXUNUSED(geometry), int state )
{
if (!state) return ret;
ret++;
node = node->Next();
if (!state) return ret;
ret++;
node = node->Next();
void wxListMainWindow::DeleteItem( long index )
{
void wxListMainWindow::DeleteItem( long index )
{
if (m_current == line) m_current = (wxListLineData *) NULL;
DeleteLine( line );
m_lines.DeleteNode( node );
if (m_current == line) m_current = (wxListLineData *) NULL;
DeleteLine( line );
m_lines.DeleteNode( node );
void wxListMainWindow::DeleteColumn( int col )
{
m_dirty = TRUE;
wxNode *node = m_columns.Nth( col );
if (node) m_columns.DeleteNode( node );
void wxListMainWindow::DeleteColumn( int col )
{
m_dirty = TRUE;
wxNode *node = m_columns.Nth( col );
if (node) m_columns.DeleteNode( node );
void wxListMainWindow::DeleteAllItems( void )
{
void wxListMainWindow::DeleteAllItems( void )
{
wxListLineData *line = (wxListLineData*)node->Data();
DeleteLine( line );
node = node->Next();
wxListLineData *line = (wxListLineData*)node->Data();
DeleteLine( line );
node = node->Next();
void wxListMainWindow::DeleteEverything( void )
{
void wxListMainWindow::DeleteEverything( void )
{
wxListLineData *line = (wxListLineData*)node->Data();
DeleteLine( line );
node = node->Next();
wxListLineData *line = (wxListLineData*)node->Data();
DeleteLine( line );
node = node->Next();
m_lines.Clear();
m_current = (wxListLineData *) NULL;
m_columns.Clear();
m_lines.Clear();
m_current = (wxListLineData *) NULL;
m_columns.Clear();
void wxListMainWindow::EnsureVisible( long index )
{
void wxListMainWindow::EnsureVisible( long index )
{
if (node) m_current = (wxListLineData*)node->Data();
if (m_current) MoveToFocus();
m_current = oldCurrent;
if (node) m_current = (wxListLineData*)node->Data();
if (m_current) MoveToFocus();
m_current = oldCurrent;
long wxListMainWindow::FindItem(long start, const wxString& str, bool WXUNUSED(partial) )
{
long wxListMainWindow::FindItem(long start, const wxString& str, bool WXUNUSED(partial) )
{
if (s == tmp) return pos;
node = node->Next();
pos++;
if (s == tmp) return pos;
node = node->Next();
pos++;
long wxListMainWindow::FindItem(long start, long data)
{
long wxListMainWindow::FindItem(long start, long data)
{
if (item.m_data == data) return pos;
node = node->Next();
pos++;
if (item.m_data == data) return pos;
node = node->Next();
pos++;
long wxListMainWindow::HitTest( int x, int y, int &flags )
{
long wxListMainWindow::HitTest( int x, int y, int &flags )
{
{
flags = ret;
return count;
{
flags = ret;
return count;
node = node->Next();
count++;
node = node->Next();
count++;
void wxListMainWindow::InsertItem( wxListItem &item )
{
void wxListMainWindow::InsertItem( wxListItem &item )
{
m_lines.Insert( node, line );
else
m_lines.Append( line );
m_lines.Insert( node, line );
else
m_lines.Append( line );
void wxListMainWindow::InsertColumn( long col, wxListItem &item )
{
void wxListMainWindow::InsertColumn( long col, wxListItem &item )
{
m_columns.Insert( node, column );
else
m_columns.Append( column );
m_columns.Insert( node, column );
else
m_columns.Append( column );
wxListCtrlCompare list_ctrl_compare_func_2;
long list_ctrl_compare_data;
wxListCtrlCompare list_ctrl_compare_func_2;
long list_ctrl_compare_data;
line2->GetItem( 0, item );
long data2 = item.m_data;
return list_ctrl_compare_func_2( data1, data2, list_ctrl_compare_data );
line2->GetItem( 0, item );
long data2 = item.m_data;
return list_ctrl_compare_func_2( data1, data2, list_ctrl_compare_data );
void wxListMainWindow::SortItems( wxListCtrlCompare fn, long data )
{
list_ctrl_compare_func_2 = fn;
list_ctrl_compare_data = data;
m_lines.Sort( list_ctrl_compare_func_1 );
void wxListMainWindow::SortItems( wxListCtrlCompare fn, long data )
{
list_ctrl_compare_func_2 = fn;
list_ctrl_compare_data = data;
m_lines.Sort( list_ctrl_compare_func_1 );
bool wxListMainWindow::OnListNotify( wxListEvent &event )
{
if (m_parent) m_parent->ProcessEvent( event );
return FALSE;
bool wxListMainWindow::OnListNotify( wxListEvent &event )
{
if (m_parent) m_parent->ProcessEvent( event );
return FALSE;
// -------------------------------------------------------------------------------------
// wxListItem
// -------------------------------------------------------------------------------------
// wxListItem
m_itemIndex = 0;
m_col = 0;
m_cancelled = FALSE;
m_itemIndex = 0;
m_col = 0;
m_cancelled = FALSE;
// -------------------------------------------------------------------------------------
// wxListCtrl
// -------------------------------------------------------------------------------------
// wxListCtrl
{
Create( parent, id, pos, size, style, name );
{
Create( parent, id, pos, size, style, name );
wxListCtrl::~wxListCtrl(void)
{
wxListCtrl::~wxListCtrl(void)
{
m_headerWin = (wxListHeaderWindow *) NULL;
return ret;
m_headerWin = (wxListHeaderWindow *) NULL;
return ret;
void wxListCtrl::OnSize( wxSizeEvent &WXUNUSED(event) )
{
// handled in OnIdle
if (m_mainWin) m_mainWin->m_dirty = TRUE;
void wxListCtrl::OnSize( wxSizeEvent &WXUNUSED(event) )
{
// handled in OnIdle
if (m_mainWin) m_mainWin->m_dirty = TRUE;
void wxListCtrl::SetSingleStyle( long style, bool add )
{
void wxListCtrl::SetSingleStyle( long style, bool add )
{
if (style & wxLC_MASK_TYPE) flag = flag & ~wxLC_MASK_TYPE;
if (style & wxLC_MASK_ALIGN) flag = flag & ~wxLC_MASK_ALIGN;
if (style & wxLC_MASK_SORT) flag = flag & ~wxLC_MASK_SORT;
if (style & wxLC_MASK_TYPE) flag = flag & ~wxLC_MASK_TYPE;
if (style & wxLC_MASK_ALIGN) flag = flag & ~wxLC_MASK_ALIGN;
if (style & wxLC_MASK_SORT) flag = flag & ~wxLC_MASK_SORT;
else
{
if (flag & style) flag -= style;
else
{
if (flag & style) flag -= style;
SetWindowStyleFlag( flag );
SetWindowStyleFlag( flag );
void wxListCtrl::SetWindowStyleFlag( long flag )
{
void wxListCtrl::SetWindowStyleFlag( long flag )
{
{
// m_headerWin->SetSize( 0, 0, width, 23 );
m_headerWin->Show( TRUE );
{
// m_headerWin->SetSize( 0, 0, width, 23 );
m_headerWin->Show( TRUE );
{
// m_mainWin->SetSize( 0, 0, width, height );
m_headerWin->Show( FALSE );
{
// m_mainWin->SetSize( 0, 0, width, height );
m_headerWin->Show( FALSE );
wxWindow::SetWindowStyleFlag( flag );
wxWindow::SetWindowStyleFlag( flag );
bool wxListCtrl::GetColumn(int col, wxListItem &item)
{
m_mainWin->GetColumn( col, item );
return TRUE;
bool wxListCtrl::GetColumn(int col, wxListItem &item)
{
m_mainWin->GetColumn( col, item );
return TRUE;
bool wxListCtrl::SetColumn( int col, wxListItem& item )
{
m_mainWin->SetColumn( col, item );
return TRUE;
bool wxListCtrl::SetColumn( int col, wxListItem& item )
{
m_mainWin->SetColumn( col, item );
return TRUE;
int wxListCtrl::GetColumnWidth( int col )
{
return m_mainWin->GetColumnWidth( col );
int wxListCtrl::GetColumnWidth( int col )
{
return m_mainWin->GetColumnWidth( col );
bool wxListCtrl::SetColumnWidth( int col, int width )
{
m_mainWin->SetColumnWidth( col, width );
return TRUE;
bool wxListCtrl::SetColumnWidth( int col, int width )
{
m_mainWin->SetColumnWidth( col, width );
return TRUE;
int wxListCtrl::GetCountPerPage(void)
{
return m_mainWin->GetCountPerPage(); // different from Windows ?
int wxListCtrl::GetCountPerPage(void)
{
return m_mainWin->GetCountPerPage(); // different from Windows ?
/*
wxText& wxListCtrl::GetEditControl(void) const
{
/*
wxText& wxListCtrl::GetEditControl(void) const
{
*/
bool wxListCtrl::GetItem( wxListItem &info )
{
m_mainWin->GetItem( info );
return TRUE;
*/
bool wxListCtrl::GetItem( wxListItem &info )
{
m_mainWin->GetItem( info );
return TRUE;
bool wxListCtrl::SetItem( wxListItem &info )
{
m_mainWin->SetItem( info );
return TRUE;
bool wxListCtrl::SetItem( wxListItem &info )
{
m_mainWin->SetItem( info );
return TRUE;
long wxListCtrl::SetItem( long index, int col, const wxString& label, int imageId )
{
long wxListCtrl::SetItem( long index, int col, const wxString& label, int imageId )
{
;
m_mainWin->SetItem(info);
return TRUE;
;
m_mainWin->SetItem(info);
return TRUE;
int wxListCtrl::GetItemState( long item, long stateMask )
{
return m_mainWin->GetItemState( item, stateMask );
int wxListCtrl::GetItemState( long item, long stateMask )
{
return m_mainWin->GetItemState( item, stateMask );
bool wxListCtrl::SetItemState( long item, long state, long stateMask )
{
m_mainWin->SetItemState( item, state, stateMask );
return TRUE;
bool wxListCtrl::SetItemState( long item, long state, long stateMask )
{
m_mainWin->SetItemState( item, state, stateMask );
return TRUE;
bool wxListCtrl::SetItemImage( long item, int image, int WXUNUSED(selImage) )
{
bool wxListCtrl::SetItemImage( long item, int image, int WXUNUSED(selImage) )
{
info.m_itemId = item;
m_mainWin->SetItem( info );
return TRUE;
info.m_itemId = item;
m_mainWin->SetItem( info );
return TRUE;
wxString wxListCtrl::GetItemText( long item )
{
wxString wxListCtrl::GetItemText( long item )
{
info.m_itemId = item;
m_mainWin->GetItem( info );
return info.m_text;
info.m_itemId = item;
m_mainWin->GetItem( info );
return info.m_text;
void wxListCtrl::SetItemText( long item, const wxString &str )
{
void wxListCtrl::SetItemText( long item, const wxString &str )
{
info.m_itemId = item;
info.m_text = str;
m_mainWin->SetItem( info );
info.m_itemId = item;
info.m_text = str;
m_mainWin->SetItem( info );
long wxListCtrl::GetItemData( long item )
{
long wxListCtrl::GetItemData( long item )
{
info.m_itemId = item;
m_mainWin->GetItem( info );
return info.m_data;
info.m_itemId = item;
m_mainWin->GetItem( info );
return info.m_data;
bool wxListCtrl::SetItemData( long item, long data )
{
bool wxListCtrl::SetItemData( long item, long data )
{
info.m_data = data;
m_mainWin->SetItem( info );
return TRUE;
info.m_data = data;
m_mainWin->SetItem( info );
return TRUE;
bool wxListCtrl::GetItemRect( long item, wxRectangle &rect, int WXUNUSED(code) )
{
m_mainWin->GetItemRect( item, rect );
return TRUE;
bool wxListCtrl::GetItemRect( long item, wxRectangle &rect, int WXUNUSED(code) )
{
m_mainWin->GetItemRect( item, rect );
return TRUE;
bool wxListCtrl::GetItemPosition( long item, wxPoint& pos )
{
m_mainWin->GetItemPosition( item, pos );
return TRUE;
bool wxListCtrl::GetItemPosition( long item, wxPoint& pos )
{
m_mainWin->GetItemPosition( item, pos );
return TRUE;
bool wxListCtrl::SetItemPosition( long WXUNUSED(item), const wxPoint& WXUNUSED(pos) )
{
return 0;
bool wxListCtrl::SetItemPosition( long WXUNUSED(item), const wxPoint& WXUNUSED(pos) )
{
return 0;
int wxListCtrl::GetItemCount(void)
{
return m_mainWin->GetItemCount();
int wxListCtrl::GetItemCount(void)
{
return m_mainWin->GetItemCount();
void wxListCtrl::SetItemSpacing( int spacing, bool isSmall )
{
m_mainWin->SetItemSpacing( spacing, isSmall );
void wxListCtrl::SetItemSpacing( int spacing, bool isSmall )
{
m_mainWin->SetItemSpacing( spacing, isSmall );
int wxListCtrl::GetItemSpacing( bool isSmall )
{
return m_mainWin->GetItemSpacing( isSmall );
int wxListCtrl::GetItemSpacing( bool isSmall )
{
return m_mainWin->GetItemSpacing( isSmall );
int wxListCtrl::GetSelectedItemCount(void)
{
return m_mainWin->GetSelectedItemCount();
int wxListCtrl::GetSelectedItemCount(void)
{
return m_mainWin->GetSelectedItemCount();
/*
wxColour wxListCtrl::GetTextColour(void) const
{
/*
wxColour wxListCtrl::GetTextColour(void) const
{
void wxListCtrl::SetTextColour(const wxColour& WXUNUSED(col))
{
void wxListCtrl::SetTextColour(const wxColour& WXUNUSED(col))
{
*/
long wxListCtrl::GetTopItem(void)
{
return 0;
*/
long wxListCtrl::GetTopItem(void)
{
return 0;
long wxListCtrl::GetNextItem( long item, int geom, int state ) const
{
return m_mainWin->GetNextItem( item, geom, state );
long wxListCtrl::GetNextItem( long item, int geom, int state ) const
{
return m_mainWin->GetNextItem( item, geom, state );
wxImageList *wxListCtrl::GetImageList(int which)
{
wxImageList *wxListCtrl::GetImageList(int which)
{
else if (which == wxIMAGE_LIST_STATE)
{
return m_imageListState;
else if (which == wxIMAGE_LIST_STATE)
{
return m_imageListState;
return (wxImageList *) NULL;
return (wxImageList *) NULL;
void wxListCtrl::SetImageList( wxImageList *imageList, int which )
{
m_mainWin->SetImageList( imageList, which );
void wxListCtrl::SetImageList( wxImageList *imageList, int which )
{
m_mainWin->SetImageList( imageList, which );
bool wxListCtrl::Arrange( int WXUNUSED(flag) )
{
return 0;
bool wxListCtrl::Arrange( int WXUNUSED(flag) )
{
return 0;
bool wxListCtrl::DeleteItem( long item )
{
m_mainWin->DeleteItem( item );
return TRUE;
bool wxListCtrl::DeleteItem( long item )
{
m_mainWin->DeleteItem( item );
return TRUE;
bool wxListCtrl::DeleteAllItems(void)
{
m_mainWin->DeleteAllItems();
return TRUE;
bool wxListCtrl::DeleteAllItems(void)
{
m_mainWin->DeleteAllItems();
return TRUE;
bool wxListCtrl::DeleteColumn( int col )
{
m_mainWin->DeleteColumn( col );
return TRUE;
bool wxListCtrl::DeleteColumn( int col )
{
m_mainWin->DeleteColumn( col );
return TRUE;
/*
wxText& wxListCtrl::Edit( long WXUNUSED(item ) )
{
/*
wxText& wxListCtrl::Edit( long WXUNUSED(item ) )
{
*/
bool wxListCtrl::EnsureVisible( long item )
{
m_mainWin->EnsureVisible( item );
return TRUE;
*/
bool wxListCtrl::EnsureVisible( long item )
{
m_mainWin->EnsureVisible( item );
return TRUE;
long wxListCtrl::FindItem( long start, const wxString& str, bool partial )
{
return m_mainWin->FindItem( start, str, partial );
long wxListCtrl::FindItem( long start, const wxString& str, bool partial )
{
return m_mainWin->FindItem( start, str, partial );
long wxListCtrl::FindItem( long start, long data )
{
return m_mainWin->FindItem( start, data );
long wxListCtrl::FindItem( long start, long data )
{
return m_mainWin->FindItem( start, data );
long wxListCtrl::FindItem( long WXUNUSED(start), const wxPoint& WXUNUSED(pt),
int WXUNUSED(direction))
{
return 0;
long wxListCtrl::FindItem( long WXUNUSED(start), const wxPoint& WXUNUSED(pt),
int WXUNUSED(direction))
{
return 0;
long wxListCtrl::HitTest( const wxPoint &point, int &flags )
{
return m_mainWin->HitTest( (int)point.x, (int)point.y, flags );
long wxListCtrl::HitTest( const wxPoint &point, int &flags )
{
return m_mainWin->HitTest( (int)point.x, (int)point.y, flags );
long wxListCtrl::InsertItem( wxListItem& info )
{
m_mainWin->InsertItem( info );
return 0;
long wxListCtrl::InsertItem( wxListItem& info )
{
m_mainWin->InsertItem( info );
return 0;
long wxListCtrl::InsertItem( long index, const wxString &label )
{
long wxListCtrl::InsertItem( long index, const wxString &label )
{
info.m_mask = wxLIST_MASK_TEXT;
info.m_itemId = index;
return InsertItem( info );
info.m_mask = wxLIST_MASK_TEXT;
info.m_itemId = index;
return InsertItem( info );
long wxListCtrl::InsertItem( long index, int imageIndex )
{
long wxListCtrl::InsertItem( long index, int imageIndex )
{
info.m_image = imageIndex;
info.m_itemId = index;
return InsertItem( info );
info.m_image = imageIndex;
info.m_itemId = index;
return InsertItem( info );
long wxListCtrl::InsertItem( long index, const wxString &label, int imageIndex )
{
long wxListCtrl::InsertItem( long index, const wxString &label, int imageIndex )
{
info.m_mask = wxLIST_MASK_TEXT | wxLIST_MASK_IMAGE;
info.m_itemId = index;
return InsertItem( info );
info.m_mask = wxLIST_MASK_TEXT | wxLIST_MASK_IMAGE;
info.m_itemId = index;
return InsertItem( info );
long wxListCtrl::InsertColumn( long col, wxListItem &item )
{
m_mainWin->InsertColumn( col, item );
return 0;
long wxListCtrl::InsertColumn( long col, wxListItem &item )
{
m_mainWin->InsertColumn( col, item );
return 0;
long wxListCtrl::InsertColumn( long col, const wxString &heading,
int format, int width )
long wxListCtrl::InsertColumn( long col, const wxString &heading,
int format, int width )
item.m_format = format;
return InsertColumn( col, item );
item.m_format = format;
return InsertColumn( col, item );
bool wxListCtrl::ScrollList( int WXUNUSED(dx), int WXUNUSED(dy) )
{
return 0;
bool wxListCtrl::ScrollList( int WXUNUSED(dx), int WXUNUSED(dy) )
{
return 0;
// Sort items.
// fn is a function which takes 3 long arguments: item1, item2, data.
// Sort items.
// fn is a function which takes 3 long arguments: item1, item2, data.
{
m_mainWin->SortItems( fn, data );
return TRUE;
{
m_mainWin->SortItems( fn, data );
return TRUE;
void wxListCtrl::OnIdle( wxIdleEvent &WXUNUSED(event) )
{
void wxListCtrl::OnIdle( wxIdleEvent &WXUNUSED(event) )
{
m_mainWin->GetSize( &w, &h );
if ((x != 0) || (y != 24) || (w != cw) || (h != ch))
m_mainWin->SetSize( 0, 0, cw, ch );
m_mainWin->GetSize( &w, &h );
if ((x != 0) || (y != 24) || (w != cw) || (h != ch))
m_mainWin->SetSize( 0, 0, cw, ch );
m_mainWin->CalculatePositions();
m_mainWin->RealizeChanges();
m_mainWin->m_dirty = FALSE;
m_mainWin->Refresh();
m_mainWin->CalculatePositions();
m_mainWin->RealizeChanges();
m_mainWin->m_dirty = FALSE;
m_mainWin->Refresh();
extern bool g_blockEventsOnDrag;
//-----------------------------------------------------------------------------
extern bool g_blockEventsOnDrag;
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton,wxControl)
-
static void gtk_bmpbutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )
{
if (!button->HasVMT()) return;
static void gtk_bmpbutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )
{
if (!button->HasVMT()) return;
}
//-----------------------------------------------------------------------------
}
//-----------------------------------------------------------------------------
+// wxBitmapButton
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton,wxControl)
wxBitmapButton::wxBitmapButton(void)
{
wxBitmapButton::wxBitmapButton(void)
{
extern bool g_blockEventsOnDrag;
//-----------------------------------------------------------------------------
extern bool g_blockEventsOnDrag;
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxButton,wxControl)
-
static void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), wxButton *button )
{
if (!button->HasVMT()) return;
static void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), wxButton *button )
{
if (!button->HasVMT()) return;
}
//-----------------------------------------------------------------------------
}
//-----------------------------------------------------------------------------
+// wxButton
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxButton,wxControl)
wxButton::wxButton(void)
{
wxButton::wxButton(void)
{
extern bool g_blockEventsOnDrag;
//-----------------------------------------------------------------------------
extern bool g_blockEventsOnDrag;
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
static void gtk_checkbox_clicked_callback( GtkWidget *WXUNUSED(widget), wxCheckBox *cb )
//-----------------------------------------------------------------------------
static void gtk_checkbox_clicked_callback( GtkWidget *WXUNUSED(widget), wxCheckBox *cb )
cb->GetEventHandler()->ProcessEvent(event);
}
cb->GetEventHandler()->ProcessEvent(event);
}
+//-----------------------------------------------------------------------------
+// wxCheckBox
//-----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxCheckBox,wxControl)
//-----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxCheckBox,wxControl)
extern bool g_blockEventsOnDrag;
//-----------------------------------------------------------------------------
extern bool g_blockEventsOnDrag;
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
static void gtk_choice_clicked_callback( GtkWidget *WXUNUSED(widget), wxChoice *choice )
//-----------------------------------------------------------------------------
static void gtk_choice_clicked_callback( GtkWidget *WXUNUSED(widget), wxChoice *choice )
choice->GetEventHandler()->ProcessEvent(event);
}
choice->GetEventHandler()->ProcessEvent(event);
}
+//-----------------------------------------------------------------------------
+// wxChoice
//-----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxChoice,wxControl)
//-----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxChoice,wxControl)
extern bool g_blockEventsOnDrag;
//-----------------------------------------------------------------------------
extern bool g_blockEventsOnDrag;
//-----------------------------------------------------------------------------
-// wxComboBox
-//-----------------------------------------------------------------------------
-
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
static void gtk_combo_clicked_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
{
static void gtk_combo_clicked_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
{
+//-----------------------------------------------------------------------------
+// wxComboBox
//-----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxComboBox,wxControl)
//-----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxComboBox,wxControl)
extern wxList wxPendingDelete;
//-----------------------------------------------------------------------------
extern wxList wxPendingDelete;
//-----------------------------------------------------------------------------
+// "delete_event"
+//-----------------------------------------------------------------------------
bool gtk_dialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxDialog *win )
{
bool gtk_dialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxDialog *win )
{
bool wxDialog::Show( bool show )
{
bool wxDialog::Show( bool show )
{
- if (!show && IsModal() && m_modalShowing)
+ if (!show && IsModal())
{
EndModal( wxID_CANCEL );
}
{
EndModal( wxID_CANCEL );
}
-void wxDialog::SetModal(bool flag)
+bool wxDialog::IsModal(void) const
+{
+ return m_modalShowing;
+}
+
+void wxDialog::SetModal( bool WXUNUSED(flag) )
if (flag)
m_windowStyle |= wxDIALOG_MODAL;
else
if (m_windowStyle & wxDIALOG_MODAL) m_windowStyle -= wxDIALOG_MODAL;
if (flag)
m_windowStyle |= wxDIALOG_MODAL;
else
if (m_windowStyle & wxDIALOG_MODAL) m_windowStyle -= wxDIALOG_MODAL;
+*/
+ wxFAIL_MSG( "wxDialog:SetModal obsolete now" );
}
int wxDialog::ShowModal(void)
{
}
int wxDialog::ShowModal(void)
{
- SetModal(TRUE);
-
- if (m_modalShowing)
{
wxFAIL_MSG( "wxDialog:ShowModal called twice" );
return GetReturnCode();
{
wxFAIL_MSG( "wxDialog:ShowModal called twice" );
return GetReturnCode();
{
SetReturnCode( retCode );
{
SetReturnCode( retCode );
{
wxFAIL_MSG( "wxDialog:EndModal called twice" );
return;
{
wxFAIL_MSG( "wxDialog:EndModal called twice" );
return;
wxWindow::InitDialog();
}
wxWindow::InitDialog();
}
-void wxDialog::SetSizeHints(int minW, int minH, int maxW, int maxH, int WXUNUSED(incW) )
-{
- gdk_window_set_hints( m_widget->window, -1, -1,
- minW, minH, maxW, maxH, GDK_HINT_MIN_SIZE | GDK_HINT_MIN_SIZE );
-}
-
void wxDialog::SetIcon( const wxIcon &icon )
{
m_icon = icon;
void wxDialog::SetIcon( const wxIcon &icon )
{
m_icon = icon;
extern bool g_blockEventsOnDrag;
//-----------------------------------------------------------------------------
extern bool g_blockEventsOnDrag;
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton,wxControl)
-
static void gtk_bmpbutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )
{
if (!button->HasVMT()) return;
static void gtk_bmpbutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )
{
if (!button->HasVMT()) return;
}
//-----------------------------------------------------------------------------
}
//-----------------------------------------------------------------------------
+// wxBitmapButton
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton,wxControl)
wxBitmapButton::wxBitmapButton(void)
{
wxBitmapButton::wxBitmapButton(void)
{
extern bool g_blockEventsOnDrag;
//-----------------------------------------------------------------------------
extern bool g_blockEventsOnDrag;
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxButton,wxControl)
-
static void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), wxButton *button )
{
if (!button->HasVMT()) return;
static void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), wxButton *button )
{
if (!button->HasVMT()) return;
}
//-----------------------------------------------------------------------------
}
//-----------------------------------------------------------------------------
+// wxButton
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxButton,wxControl)
wxButton::wxButton(void)
{
wxButton::wxButton(void)
{
extern bool g_blockEventsOnDrag;
//-----------------------------------------------------------------------------
extern bool g_blockEventsOnDrag;
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
static void gtk_checkbox_clicked_callback( GtkWidget *WXUNUSED(widget), wxCheckBox *cb )
//-----------------------------------------------------------------------------
static void gtk_checkbox_clicked_callback( GtkWidget *WXUNUSED(widget), wxCheckBox *cb )
cb->GetEventHandler()->ProcessEvent(event);
}
cb->GetEventHandler()->ProcessEvent(event);
}
+//-----------------------------------------------------------------------------
+// wxCheckBox
//-----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxCheckBox,wxControl)
//-----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxCheckBox,wxControl)
extern bool g_blockEventsOnDrag;
//-----------------------------------------------------------------------------
extern bool g_blockEventsOnDrag;
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
static void gtk_choice_clicked_callback( GtkWidget *WXUNUSED(widget), wxChoice *choice )
//-----------------------------------------------------------------------------
static void gtk_choice_clicked_callback( GtkWidget *WXUNUSED(widget), wxChoice *choice )
choice->GetEventHandler()->ProcessEvent(event);
}
choice->GetEventHandler()->ProcessEvent(event);
}
+//-----------------------------------------------------------------------------
+// wxChoice
//-----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxChoice,wxControl)
//-----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxChoice,wxControl)
extern bool g_blockEventsOnDrag;
//-----------------------------------------------------------------------------
extern bool g_blockEventsOnDrag;
//-----------------------------------------------------------------------------
-// wxComboBox
-//-----------------------------------------------------------------------------
-
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
static void gtk_combo_clicked_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
{
static void gtk_combo_clicked_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
{
+//-----------------------------------------------------------------------------
+// wxComboBox
//-----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxComboBox,wxControl)
//-----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxComboBox,wxControl)
extern wxList wxPendingDelete;
//-----------------------------------------------------------------------------
extern wxList wxPendingDelete;
//-----------------------------------------------------------------------------
+// "delete_event"
+//-----------------------------------------------------------------------------
bool gtk_dialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxDialog *win )
{
bool gtk_dialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxDialog *win )
{
bool wxDialog::Show( bool show )
{
bool wxDialog::Show( bool show )
{
- if (!show && IsModal() && m_modalShowing)
+ if (!show && IsModal())
{
EndModal( wxID_CANCEL );
}
{
EndModal( wxID_CANCEL );
}
-void wxDialog::SetModal(bool flag)
+bool wxDialog::IsModal(void) const
+{
+ return m_modalShowing;
+}
+
+void wxDialog::SetModal( bool WXUNUSED(flag) )
if (flag)
m_windowStyle |= wxDIALOG_MODAL;
else
if (m_windowStyle & wxDIALOG_MODAL) m_windowStyle -= wxDIALOG_MODAL;
if (flag)
m_windowStyle |= wxDIALOG_MODAL;
else
if (m_windowStyle & wxDIALOG_MODAL) m_windowStyle -= wxDIALOG_MODAL;
+*/
+ wxFAIL_MSG( "wxDialog:SetModal obsolete now" );
}
int wxDialog::ShowModal(void)
{
}
int wxDialog::ShowModal(void)
{
- SetModal(TRUE);
-
- if (m_modalShowing)
{
wxFAIL_MSG( "wxDialog:ShowModal called twice" );
return GetReturnCode();
{
wxFAIL_MSG( "wxDialog:ShowModal called twice" );
return GetReturnCode();
{
SetReturnCode( retCode );
{
SetReturnCode( retCode );
{
wxFAIL_MSG( "wxDialog:EndModal called twice" );
return;
{
wxFAIL_MSG( "wxDialog:EndModal called twice" );
return;
wxWindow::InitDialog();
}
wxWindow::InitDialog();
}
-void wxDialog::SetSizeHints(int minW, int minH, int maxW, int maxH, int WXUNUSED(incW) )
-{
- gdk_window_set_hints( m_widget->window, -1, -1,
- minW, minH, maxW, maxH, GDK_HINT_MIN_SIZE | GDK_HINT_MIN_SIZE );
-}
-
void wxDialog::SetIcon( const wxIcon &icon )
{
m_icon = icon;
void wxDialog::SetIcon( const wxIcon &icon )
{
m_icon = icon;
projects / wxWidgets.git / commitdiff
