From ad491b436f55eb21c58f6115e0031cf5282738ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Mon, 13 Apr 2009 13:12:09 +0000 Subject: [PATCH] * Moved _CreateBlocks() back into the constructor. That used to make bug #3572 more reproducible, but it doesn't work for me anymore. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30148 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/apps/charactermap/UnicodeBlockView.cpp | 17 +---------------- src/apps/charactermap/UnicodeBlockView.h | 4 ---- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/src/apps/charactermap/UnicodeBlockView.cpp b/src/apps/charactermap/UnicodeBlockView.cpp index 9f6e75c1d3..fd192afb00 100644 --- a/src/apps/charactermap/UnicodeBlockView.cpp +++ b/src/apps/charactermap/UnicodeBlockView.cpp @@ -28,6 +28,7 @@ UnicodeBlockView::UnicodeBlockView(const char* name) fShowPrivateBlocks(false), fShowContainedBlocksOnly(false) { + _CreateBlocks(); } @@ -79,22 +80,6 @@ UnicodeBlockView::IsShowingBlock(int32 blockIndex) const } -void -UnicodeBlockView::AttachedToWindow() -{ - // TODO: if we're calling this in the constructor, strange things happen - _CreateBlocks(); -} - - -void -UnicodeBlockView::DetachedFromWindow() -{ - MakeEmpty(); - fBlocks.MakeEmpty(); -} - - void UnicodeBlockView::_UpdateBlocks() { diff --git a/src/apps/charactermap/UnicodeBlockView.h b/src/apps/charactermap/UnicodeBlockView.h index cb6f59273c..6bfedbc2a9 100644 --- a/src/apps/charactermap/UnicodeBlockView.h +++ b/src/apps/charactermap/UnicodeBlockView.h @@ -41,10 +41,6 @@ public: bool IsShowingBlock(int32 blockIndex) const; -protected: - virtual void AttachedToWindow(); - virtual void DetachedFromWindow(); - private: void _UpdateBlocks(); void _CreateBlocks();