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

adjust the toolbar tools bitmap size to fit the biggest bitmap used under wxOSX too, not only under MSW (and moved the code doing it to the common base class to avoid duplicating it)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61174 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-06-23 10:21:18 +00:00
parent 12a124ddc9
commit bb2212e6c4
5 changed files with 56 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/osx/carbon/toolbar.cpp
View File

@@ -167,14 +167,14 @@ public:
{
if ( wxToolBarToolBase::Toggle( toggle ) == false )
return false;
UpdateToggleImage(toggle);
return true;
}
void UpdateHelpStrings()
{
#if wxOSX_USE_NATIVE_TOOLBAR
#if wxOSX_USE_NATIVE_TOOLBAR
if ( m_toolbarItemRef )
{
wxFontEncoding enc = GetToolBarFontEncoding();
@@ -186,16 +186,16 @@ public:
}
#endif
}
virtual bool SetShortHelp(const wxString& help)
{
if ( wxToolBarToolBase::SetShortHelp( help ) == false )
return false;
UpdateHelpStrings();
UpdateHelpStrings();
return true;
}
virtual bool SetLongHelp(const wxString& help)
{
if ( wxToolBarToolBase::SetLongHelp( help ) == false )
@@ -205,12 +205,12 @@ public:
return true;
}
virtual void SetNormalBitmap(const wxBitmap& bmp)
virtual void SetNormalBitmap(const wxBitmap& bmp)
{
wxToolBarToolBase::SetNormalBitmap(bmp);
UpdateToggleImage(CanBeToggled() && IsToggled());
}
virtual void SetLabel(const wxString& label)
{
wxToolBarToolBase::SetLabel(label);
@@ -429,7 +429,7 @@ bool wxToolBarTool::Enable( bool enable )
{
if ( wxToolBarToolBase::Enable( enable ) == false )
return false;
if ( IsControl() )
{
GetControl()->Enable( enable );
@@ -1108,18 +1108,18 @@ bool wxToolBar::MacInstallNativeToolbar(bool usesNative)
bResult = true;
SetWindowToolbar( tlw, (HIToolbarRef) m_macToolbar );
// ShowHideWindowToolbar will make the wxFrame grow
// which we don't want in this case
wxSize sz = GetParent()->GetSize();
ShowHideWindowToolbar( tlw, true, false );
// Restore the orginal size
GetParent()->SetSize( sz );
ChangeWindowAttributes( tlw, kWindowToolbarButtonAttribute, 0 );
SetAutomaticControlDragTrackingEnabledForWindow( tlw, true );
m_peer->Move(0,0,0,0 );
SetSize( wxSIZE_AUTO_WIDTH, 0 );
m_peer->SetVisibility( false );
@@ -1151,9 +1151,9 @@ bool wxToolBar::MacInstallNativeToolbar(bool usesNative)
bool wxToolBar::Realize()
{
if (m_tools.GetCount() == 0)
if ( !wxToolBarBase::Realize() )
return false;
wxSize tlw_sz = GetParent()->GetSize();
int maxWidth = 0;
@@ -1365,7 +1365,7 @@ bool wxToolBar::Realize()
if (m_macUsesNativeToolbar)
GetParent()->SetSize( tlw_sz );
if ( GetWindowStyleFlag() & (wxTB_TOP|wxTB_BOTTOM) )
{
// if not set yet, only one row