Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1. wxNotebook::GetPageCount() returns only the number of pages actually added

Browse Source 
to the notebook
2. wxTreeCtrl: more kbd interface ad SetItemBold (doesn't work :-( )


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1124 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1998-12-07 18:23:57 +00:00
parent e487524e49
commit ef44a62179
5 changed files with 283 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/generic/treectrl.h
View File

@@ -256,6 +256,9 @@ public:
// usage and loading time.
void SetItemHasChildren(const wxTreeItemId& item, bool has = TRUE);
// the item will be shown in bold
void SetItemBold(const wxTreeItemId& item, bool bold = TRUE);
// item status inquiries
// ---------------------
@@ -269,6 +272,8 @@ public:
bool IsExpanded(const wxTreeItemId& item) const;
// is this item currently selected (the same as has focus)?
bool IsSelected(const wxTreeItemId& item) const;
// is item text in bold font?
bool IsBold(const wxTreeItemId& item) const;
// number of children
// ------------------
@@ -420,6 +425,7 @@ protected:
void AdjustMyScrollbars();
void PaintLevel( wxGenericTreeItem *item, wxDC& dc, int level, int &y );
void PaintItem( wxGenericTreeItem *item, wxDC& dc);
void CalculateLevel( wxGenericTreeItem *item, wxDC &dc, int level, int &y );
void CalculatePositions();

2
samples/treectrl/treetest.cpp
View File

@@ -180,7 +180,7 @@ void MyFrame::OnDump(wxCommandEvent& WXUNUSED(event))
void MyFrame::DoSetBold(bool bold)
{
// m_treeCtrl->SetItemBold(m_treeCtrl->GetSelection(), bold);
m_treeCtrl->SetItemBold(m_treeCtrl->GetSelection(), bold);
}
void MyFrame::OnDelete(wxCommandEvent& WXUNUSED(event))

168
src/generic/treectrl.cpp
View File

@@ -68,6 +68,8 @@ public:
void SetHasPlus(bool has = TRUE) { m_hasPlus = has; }
void SetBold(bool bold) { m_isBold = bold; }
int GetX() const { return m_x; }
int GetY() const { return m_y; }
@@ -105,6 +107,7 @@ public:
bool HasHilight() const { return m_hasHilight; }
bool IsExpanded() const { return !m_isCollapsed; }
bool HasPlus() const { return m_hasPlus || HasChildren(); }
bool IsBold() const { return m_isBold; }
private:
wxString m_text;
@@ -114,11 +117,12 @@ private:
wxTreeItemData *m_data;
// @@ probably should use bitfields to save size
bool m_isCollapsed,
m_hasHilight, // same as focused
m_hasPlus; // used for item which doesn't have
// use bitfields to save size
int m_isCollapsed :1;
int m_hasHilight :1; // same as focused
int m_hasPlus :1; // used for item which doesn't have
// children but still has a [+] button
int m_isBold :1; // render the label in bold font
int m_x, m_y;
long m_height, m_width;
@@ -167,6 +171,7 @@ wxGenericTreeItem::wxGenericTreeItem(wxGenericTreeItem *parent,
m_isCollapsed = TRUE;
m_hasHilight = FALSE;
m_hasPlus = FALSE;
m_isBold = FALSE;
m_parent = parent;
@@ -432,6 +437,19 @@ void wxTreeCtrl::SetItemHasChildren(const wxTreeItemId& item, bool has)
item.m_pItem->SetHasPlus(has);
}
void wxTreeCtrl::SetItemBold(const wxTreeItemId& item, bool bold)
{
wxCHECK_RET( item.IsOk(), "invalid tree item" );
// avoid redrawing the tree if no real change
wxGenericTreeItem *pItem = item.m_pItem;
if ( pItem->IsBold() != bold )
{
pItem->SetBold(bold);
RefreshLine(pItem);
}
}
// -----------------------------------------------------------------------------
// item status inquiries
// -----------------------------------------------------------------------------
@@ -464,6 +482,13 @@ bool wxTreeCtrl::IsSelected(const wxTreeItemId& item) const
return item.m_pItem->HasHilight();
}
bool wxTreeCtrl::IsBold(const wxTreeItemId& item) const
{
wxCHECK_MSG( item.IsOk(), FALSE, "invalid tree item" );
return item.m_pItem->IsBold();
}
// -----------------------------------------------------------------------------
// navigation
// -----------------------------------------------------------------------------
@@ -907,6 +932,63 @@ void wxTreeCtrl::AdjustMyScrollbars()
}
}
void wxTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc)
{
// render bold items in bold
wxFont *fontOld = (wxFont *)NULL,
*fontNew = (wxFont *)NULL;
if ( item->IsBold() )
{
fontOld = dc.GetFont();
if ( fontOld )
{
// @@ is there any better way to make a bold variant of old font?
fontNew = new wxFont(fontOld->GetPointSize(),
fontOld->GetFamily(),
fontOld->GetStyle(),
wxBOLD,
fontOld->GetUnderlined());
dc.SetFont(fontNew);
}
else
{
wxFAIL_MSG("wxDC::GetFont() failed!");
}
}
long text_w = 0;
long text_h = 0;
dc.GetTextExtent( item->GetText(), &text_w, &text_h );
int image_h = 0;
int image_w = 0;
if (item->GetImage() != -1)
{
m_imageListNormal->GetSize( item->GetImage(), image_w, image_h );
image_w += 4;
}
dc.DrawRectangle( item->GetX()-2, item->GetY()-2, image_w+text_w+4, text_h+4 );
if (item->GetImage() != -1)
{
dc.SetClippingRegion( item->GetX(), item->GetY(), image_w-2, text_h );
m_imageListNormal->Draw( item->GetImage(), dc,
item->GetX(), item->GetY()-1,
wxIMAGELIST_DRAW_TRANSPARENT );
dc.DestroyClippingRegion();
}
dc.DrawText( item->GetText(), image_w + item->GetX(), item->GetY() );
// restore normal font for bold items
if ( fontOld )
{
dc.SetFont(fontOld);
delete fontNew;
}
}
void wxTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level, int &y )
{
int horizX = level*m_indent;
@@ -949,32 +1031,12 @@ void wxTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level, int &
dc.SetBrush( *m_hilightBrush );
long text_w = 0;
long text_h = 0;
dc.GetTextExtent( item->GetText(), &text_w, &text_h );
int image_h = 0;
int image_w = 0;
if (item->GetImage() != -1)
{
m_imageListNormal->GetSize( item->GetImage(), image_w, image_h );
image_w += 4;
}
if (m_hasFocus)
dc.SetPen( *wxBLACK_PEN );
else
dc.SetPen( *wxTRANSPARENT_PEN );
dc.DrawRectangle( item->GetX()-2, item->GetY()-2, image_w+text_w+4, text_h+4 );
if (item->GetImage() != -1)
{
dc.SetClippingRegion( item->GetX(), item->GetY(), image_w-2, text_h );
m_imageListNormal->Draw( item->GetImage(), dc, item->GetX(), item->GetY()-1, wxIMAGELIST_DRAW_TRANSPARENT );
dc.DestroyClippingRegion();
}
dc.DrawText( item->GetText(), image_w+item->GetX(), item->GetY() );
PaintItem(item, dc);
dc.SetPen( *wxBLACK_PEN );
dc.SetTextForeground( *wxBLACK );
@@ -985,28 +1047,8 @@ void wxTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level, int &
dc.SetBrush( *wxWHITE_BRUSH );
dc.SetPen( *wxTRANSPARENT_PEN );
long text_w = 0;
long text_h = 0;
dc.GetTextExtent( item->GetText(), &text_w, &text_h );
PaintItem(item, dc);
int image_h = 0;
int image_w = 0;
if (item->GetImage() != -1)
{
m_imageListNormal->GetSize( item->GetImage(), image_w, image_h );
image_w += 4;
}
dc.DrawRectangle( item->GetX()-2, item->GetY()-2, image_w+text_w+4, text_h+4 );
if (item->GetImage() != -1)
{
dc.SetClippingRegion( item->GetX(), item->GetY(), image_w-2, text_h );
m_imageListNormal->Draw( item->GetImage(), dc, item->GetX(), item->GetY()-1, wxIMAGELIST_DRAW_TRANSPARENT );
dc.DestroyClippingRegion();
}
dc.DrawText( item->GetText(), image_w+item->GetX(), item->GetY() );
dc.SetPen( *wxBLACK_PEN );
}
}
@@ -1076,22 +1118,25 @@ void wxTreeCtrl::OnChar( wxKeyEvent &event )
{
case '+':
case WXK_ADD:
{
if (HasChildren(m_current) && !IsExpanded(m_current))
{
Expand(m_current);
}
return;
}
break;
case '-':
case WXK_SUBTRACT:
{
if (IsExpanded(m_current))
{
Collapse(m_current);
}
return;
}
break;
case '*':
case WXK_MULTIPLY:
Toggle(m_current);
break;
case ' ':
case WXK_RETURN:
{
@@ -1100,8 +1145,10 @@ void wxTreeCtrl::OnChar( wxKeyEvent &event )
event.m_code = 0;
event.SetEventObject( this );
GetEventHandler()->ProcessEvent( event );
return;
}
break;
case WXK_LEFT:
case WXK_UP:
{
wxTreeItemId prev = GetPrevSibling( m_current );
@@ -1119,8 +1166,15 @@ void wxTreeCtrl::OnChar( wxKeyEvent &event )
SelectItem( prev );
}
}
return;
}
break;
case WXK_RIGHT:
// this works the same as the down arrow except that we also expand the
// item if it wasn't expanded yet
Expand(m_current);
// fall through
case WXK_DOWN:
{
if (IsExpanded(m_current))
@@ -1148,11 +1202,13 @@ void wxTreeCtrl::OnChar( wxKeyEvent &event )
EnsureVisible( next );
}
}
return;
}
}
break;
default:
event.Skip();
}
}
void wxTreeCtrl::OnMouse( wxMouseEvent &event )
{

36
src/gtk/notebook.cpp
View File

@@ -34,8 +34,22 @@ public:
m_client = (wxWindow *) NULL;
m_parent = (GtkNotebook *) NULL;
m_box = (GtkWidget *) NULL;
m_added = FALSE;
}
// mark page as "added' to the notebook, return FALSE if the page was
// already added
bool Add()
{
if ( WasAdded() )
return FALSE;
m_added = TRUE;
return TRUE;
}
bool WasAdded() const { return m_added; }
int m_id;
wxString m_text;
int m_image;
@@ -44,6 +58,9 @@ public:
wxWindow *m_client;
GtkNotebook *m_parent;
GtkWidget *m_box; // in which the label and image are packed
private:
bool m_added;
};
//-----------------------------------------------------------------------------
@@ -216,7 +233,18 @@ int wxNotebook::GetSelection() const
int wxNotebook::GetPageCount() const
{
return m_pages.Number();
// count only the pages which were already added to the notebook for MSW
// compatibility (and, in fact, this behaviour makes more sense anyhow
// because only the added pages are shown)
int n = 0;
for ( wxNode *node = m_pages.First(); node; node = node->Next() )
{
wxNotebookPage *page = (wxNotebookPage*)node->Data();
if ( page->WasAdded() )
n++;
}
return n;
}
int wxNotebook::GetRowCount() const
@@ -424,7 +452,11 @@ bool wxNotebook::AddPage(wxWindow* win, const wxString& text,
node = node->Next();
}
wxCHECK_MSG( page != NULL, FALSE, "Can't add a page whose parent is not the notebook!" );
wxCHECK_MSG( page != NULL, FALSE,
"Can't add a page whose parent is not the notebook!" );
wxCHECK_MSG( page->Add(), FALSE,
"Can't add the same page twice to a notebook." );
if (imageId != -1)
{

36
src/gtk1/notebook.cpp
View File

@@ -34,8 +34,22 @@ public:
m_client = (wxWindow *) NULL;
m_parent = (GtkNotebook *) NULL;
m_box = (GtkWidget *) NULL;
m_added = FALSE;
}
// mark page as "added' to the notebook, return FALSE if the page was
// already added
bool Add()
{
if ( WasAdded() )
return FALSE;
m_added = TRUE;
return TRUE;
}
bool WasAdded() const { return m_added; }
int m_id;
wxString m_text;
int m_image;
@@ -44,6 +58,9 @@ public:
wxWindow *m_client;
GtkNotebook *m_parent;
GtkWidget *m_box; // in which the label and image are packed
private:
bool m_added;
};
//-----------------------------------------------------------------------------
@@ -216,7 +233,18 @@ int wxNotebook::GetSelection() const
int wxNotebook::GetPageCount() const
{
return m_pages.Number();
// count only the pages which were already added to the notebook for MSW
// compatibility (and, in fact, this behaviour makes more sense anyhow
// because only the added pages are shown)
int n = 0;
for ( wxNode *node = m_pages.First(); node; node = node->Next() )
{
wxNotebookPage *page = (wxNotebookPage*)node->Data();
if ( page->WasAdded() )
n++;
}
return n;
}
int wxNotebook::GetRowCount() const
@@ -424,7 +452,11 @@ bool wxNotebook::AddPage(wxWindow* win, const wxString& text,
node = node->Next();
}
wxCHECK_MSG( page != NULL, FALSE, "Can't add a page whose parent is not the notebook!" );
wxCHECK_MSG( page != NULL, FALSE,
"Can't add a page whose parent is not the notebook!" );
wxCHECK_MSG( page->Add(), FALSE,
"Can't add the same page twice to a notebook." );
if (imageId != -1)
{