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

Initialize the default tool width and height

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@23844 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2003-09-22 23:14:07 +00:00
parent 467760b6d4
commit 198c577357
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gtk/tbargtk.cpp
View File

@@ -249,6 +249,8 @@ void wxToolBar::Init()
m_bg = (GdkColor *)NULL; m_bg = (GdkColor *)NULL;
m_toolbar = (GtkToolbar *)NULL; m_toolbar = (GtkToolbar *)NULL;
m_blockEvent = FALSE; m_blockEvent = FALSE;
m_defaultWidth = 32;
m_defaultHeight = 32;
} }
wxToolBar::~wxToolBar() wxToolBar::~wxToolBar()
@@ -278,7 +280,7 @@ bool wxToolBar::Create( wxWindow *parent,
#ifdef __WXGTK20__ #ifdef __WXGTK20__
m_toolbar = GTK_TOOLBAR( gtk_toolbar_new() ); m_toolbar = GTK_TOOLBAR( gtk_toolbar_new() );
GtkSetStyle(); GtkSetStyle();
// Doesn't work this way. // Doesn't work this way.
// GtkToolbarSpaceStyle space_style = GTK_TOOLBAR_SPACE_EMPTY; // GtkToolbarSpaceStyle space_style = GTK_TOOLBAR_SPACE_EMPTY;
// gtk_widget_style_set (GTK_WIDGET (m_toolbar), "space_style", &space_style, NULL); // gtk_widget_style_set (GTK_WIDGET (m_toolbar), "space_style", &space_style, NULL);
@@ -473,7 +475,7 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
return FALSE; return FALSE;
} }
gtk_signal_connect( GTK_OBJECT(tool->m_item), gtk_signal_connect( GTK_OBJECT(tool->m_item),
"enter_notify_event", "enter_notify_event",
GTK_SIGNAL_FUNC(gtk_toolbar_tool_callback), GTK_SIGNAL_FUNC(gtk_toolbar_tool_callback),

6
src/gtk1/tbargtk.cpp
View File

@@ -249,6 +249,8 @@ void wxToolBar::Init()
m_bg = (GdkColor *)NULL; m_bg = (GdkColor *)NULL;
m_toolbar = (GtkToolbar *)NULL; m_toolbar = (GtkToolbar *)NULL;
m_blockEvent = FALSE; m_blockEvent = FALSE;
m_defaultWidth = 32;
m_defaultHeight = 32;
} }
wxToolBar::~wxToolBar() wxToolBar::~wxToolBar()
@@ -278,7 +280,7 @@ bool wxToolBar::Create( wxWindow *parent,
#ifdef __WXGTK20__ #ifdef __WXGTK20__
m_toolbar = GTK_TOOLBAR( gtk_toolbar_new() ); m_toolbar = GTK_TOOLBAR( gtk_toolbar_new() );
GtkSetStyle(); GtkSetStyle();
// Doesn't work this way. // Doesn't work this way.
// GtkToolbarSpaceStyle space_style = GTK_TOOLBAR_SPACE_EMPTY; // GtkToolbarSpaceStyle space_style = GTK_TOOLBAR_SPACE_EMPTY;
// gtk_widget_style_set (GTK_WIDGET (m_toolbar), "space_style", &space_style, NULL); // gtk_widget_style_set (GTK_WIDGET (m_toolbar), "space_style", &space_style, NULL);
@@ -473,7 +475,7 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
return FALSE; return FALSE;
} }
gtk_signal_connect( GTK_OBJECT(tool->m_item), gtk_signal_connect( GTK_OBJECT(tool->m_item),
"enter_notify_event", "enter_notify_event",
GTK_SIGNAL_FUNC(gtk_toolbar_tool_callback), GTK_SIGNAL_FUNC(gtk_toolbar_tool_callback),