Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ToolBar: Fix calling virtual function from the constructor #281

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/article/toolbar.cpp
Expand Up @@ -44,7 +44,7 @@ ArticleToolBar::ArticleToolBar() :
m_button_drawout_or.signal_clicked().connect( sigc::mem_fun(*this, &ArticleToolBar::slot_drawout_or ) );
m_button_drawout_and.signal_clicked().connect( sigc::mem_fun(*this, &ArticleToolBar::slot_drawout_and ) );

pack_buttons();
ArticleToolBar::pack_buttons();
}


Expand Down
2 changes: 1 addition & 1 deletion src/article/toolbarsearch.cpp
Expand Up @@ -33,7 +33,7 @@ SearchToolBar::SearchToolBar() :
get_searchbar()->append( m_tool_bm );
get_searchbar()->append( *get_button_close_searchbar() );

pack_buttons();
SearchToolBar::pack_buttons();
}


Expand Down
2 changes: 1 addition & 1 deletion src/article/toolbarsimple.cpp
Expand Up @@ -20,7 +20,7 @@ ArticleToolBarSimple::ArticleToolBarSimple() :
get_searchbar()->append( *get_button_up_search() );
get_searchbar()->append( *get_button_close_searchbar() );

pack_buttons();
ArticleToolBarSimple::pack_buttons();
}


Expand Down
4 changes: 2 additions & 2 deletions src/bbslist/toolbar.cpp
Expand Up @@ -56,7 +56,7 @@ BBSListToolBar::BBSListToolBar() :
m_tool_label.append( *get_button_close() );
pack_start( m_tool_label, Gtk::PACK_SHRINK );

pack_buttons();
BBSListToolBar::pack_buttons();
add_search_control_mode( CONTROL::MODE_BBSLIST );
}

Expand Down Expand Up @@ -232,7 +232,7 @@ void BBSListToolBar::slot_check_update_open_root()
EditListToolBar::EditListToolBar() :
SKELETON::ToolBar( nullptr )
{
pack_buttons();
EditListToolBar::pack_buttons();
}


Expand Down
2 changes: 1 addition & 1 deletion src/board/toolbar.cpp
Expand Up @@ -19,7 +19,7 @@ using namespace BOARD;
BoardToolBar::BoardToolBar() :
SKELETON::ToolBar( BOARD::get_admin() )
{
pack_buttons();
BoardToolBar::pack_buttons();

// JDEntry::on_key_release_event()で
// CONTROL::SearchCache を有効にする
Expand Down
4 changes: 2 additions & 2 deletions src/maintoolbar.cpp
Expand Up @@ -61,8 +61,8 @@ MainToolBar::MainToolBar()
set_tooltip( m_button_image, std::string( ITEM_NAME_IMAGEVIEW )
+ "\n\nスレビューに切替 "
+ CONTROL::get_str_motions( CONTROL::ToggleArticle ) + " , " + CONTROL::get_str_motions( CONTROL::Left ) );
pack_buttons();

MainToolBar::pack_buttons();
}


Expand Down
4 changes: 2 additions & 2 deletions src/message/toolbar.cpp
Expand Up @@ -79,7 +79,7 @@ MessageToolBar::MessageToolBar() :
m_tool_new_subject( nullptr ),
m_entry_new_subject( nullptr )
{
pack_buttons();
MessageToolBar::pack_buttons();
}


Expand Down Expand Up @@ -239,7 +239,7 @@ void MessageToolBar::slot_insert_draft_clicked()
MessageToolBarPreview::MessageToolBarPreview() :
MessageToolBarBase()
{
pack_buttons();
MessageToolBarPreview::pack_buttons();
}


Expand Down