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

remove obsolete checks, minor cleanup

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42016 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2006-10-14 17:39:38 +00:00
parent 4f74e0d132
commit 8c4e2405ca
1 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/gtk/tbargtk.cpp
View File

@@ -340,7 +340,7 @@ void wxToolBar::GtkSetStyle()
gtk_toolbar_set_orientation(m_toolbar, orient); gtk_toolbar_set_orientation(m_toolbar, orient);
gtk_toolbar_set_style(m_toolbar, style); gtk_toolbar_set_style(m_toolbar, style);
gtk_toolbar_set_tooltips( GTK_TOOLBAR(m_toolbar), !(style & wxTB_NO_TOOLTIPS) ); gtk_toolbar_set_tooltips(m_toolbar, !(style & wxTB_NO_TOOLTIPS));
} }
void wxToolBar::SetWindowStyleFlag( long style ) void wxToolBar::SetWindowStyleFlag( long style )
@@ -353,9 +353,7 @@ void wxToolBar::SetWindowStyleFlag( long style )
bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase) bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
{ {
wxToolBarTool *tool = (wxToolBarTool *)toolBase; wxToolBarTool* tool = wx_static_cast(wxToolBarTool*, toolBase);
size_t posGtk = pos;
if ( tool->IsButton() ) if ( tool->IsButton() )
{ {
@@ -366,12 +364,6 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
wxCHECK_MSG( bitmap.Ok(), false, wxCHECK_MSG( bitmap.Ok(), false,
wxT("invalid bitmap for wxToolBar icon") ); wxT("invalid bitmap for wxToolBar icon") );
wxCHECK_MSG( bitmap.GetDepth() != 1, false,
wxT("wxToolBar doesn't support GdkBitmap") );
wxCHECK_MSG( bitmap.GetPixmap() != NULL, false,
wxT("wxToolBar::Add needs a wxBitmap") );
tool->m_image = gtk_image_new(); tool->m_image = gtk_image_new();
tool->SetImage(bitmap); tool->SetImage(bitmap);
@@ -379,6 +371,8 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
} }
} }
const int posGtk = int(pos);
switch ( tool->GetStyle() ) switch ( tool->GetStyle() )
{ {
case wxTOOL_STYLE_BUTTON: case wxTOOL_STYLE_BUTTON:
@@ -473,7 +467,7 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *toolBase) bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *toolBase)
{ {
wxToolBarTool *tool = (wxToolBarTool *)toolBase; wxToolBarTool* tool = wx_static_cast(wxToolBarTool*, toolBase);
switch ( tool->GetStyle() ) switch ( tool->GetStyle() )
{ {
@@ -500,7 +494,7 @@ bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *toolBase)
void wxToolBar::DoEnableTool(wxToolBarToolBase *toolBase, bool enable) void wxToolBar::DoEnableTool(wxToolBarToolBase *toolBase, bool enable)
{ {
wxToolBarTool *tool = (wxToolBarTool *)toolBase; wxToolBarTool* tool = wx_static_cast(wxToolBarTool*, toolBase);
if (tool->m_item) if (tool->m_item)
{ {
@@ -510,7 +504,7 @@ void wxToolBar::DoEnableTool(wxToolBarToolBase *toolBase, bool enable)
void wxToolBar::DoToggleTool( wxToolBarToolBase *toolBase, bool toggle ) void wxToolBar::DoToggleTool( wxToolBarToolBase *toolBase, bool toggle )
{ {
wxToolBarTool *tool = (wxToolBarTool *)toolBase; wxToolBarTool* tool = wx_static_cast(wxToolBarTool*, toolBase);
GtkWidget *item = tool->m_item; GtkWidget *item = tool->m_item;
if ( item && GTK_IS_TOGGLE_BUTTON(item) ) if ( item && GTK_IS_TOGGLE_BUTTON(item) )
@@ -566,7 +560,7 @@ void wxToolBar::SetToolSeparation( int separation )
void wxToolBar::SetToolShortHelp( int id, const wxString& helpString ) void wxToolBar::SetToolShortHelp( int id, const wxString& helpString )
{ {
wxToolBarTool *tool = (wxToolBarTool *)FindById(id); wxToolBarTool* tool = wx_static_cast(wxToolBarTool*, FindById(id));
if ( tool ) if ( tool )
{ {