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

code formattings

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34948 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2005-07-28 13:32:20 +00:00
parent eb730a0ca9
commit 5d0bf05abe
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/mac/carbon/toolbar.cpp
View File

@@ -104,7 +104,7 @@ public:
{ {
m_control = NULL ; m_control = NULL ;
#if wxMAC_USE_NATIVE_TOOLBAR #if wxMAC_USE_NATIVE_TOOLBAR
m_toolbarItemRef = NULL ; m_toolbarItemRef = NULL ;
#endif #endif
} }
@@ -157,6 +157,7 @@ public:
return m_toolbarItemRef ; return m_toolbarItemRef ;
} }
#endif #endif
private : private :
void Init() void Init()
{ {
@@ -212,6 +213,7 @@ static pascal OSStatus wxMacToolBarToolControlEventHandler( EventHandlerCallRef
result = noErr; result = noErr;
} }
break ; break ;
#ifdef __WXMAC_OSX__ #ifdef __WXMAC_OSX__
case kEventControlHitTest : case kEventControlHitTest :
{ {
@@ -227,6 +229,7 @@ static pascal OSStatus wxMacToolBarToolControlEventHandler( EventHandlerCallRef
} }
break ; break ;
#endif #endif
default : default :
break ; break ;
} }
@@ -242,6 +245,7 @@ static pascal OSStatus wxMacToolBarToolEventHandler( EventHandlerCallRef handler
case kEventClassControl : case kEventClassControl :
result = wxMacToolBarToolControlEventHandler( handler, event, data ) ; result = wxMacToolBarToolControlEventHandler( handler, event, data ) ;
break ; break ;
default : default :
break ; break ;
} }
@@ -283,6 +287,7 @@ static pascal OSStatus wxMacToolBarCommandEventHandler( EventHandlerCallRef hand
} }
} }
break ; break ;
default : default :
break ; break ;
} }
@@ -297,6 +302,7 @@ static pascal OSStatus wxMacToolBarEventHandler( EventHandlerCallRef handler, Ev
case kEventClassToolbarItem : case kEventClassToolbarItem :
result = wxMacToolBarCommandEventHandler( handler, event, data ) ; result = wxMacToolBarCommandEventHandler( handler, event, data ) ;
break ; break ;
default : default :
break ; break ;
} }
@@ -425,6 +431,7 @@ void wxToolBarTool::UpdateToggleImage( bool toggle )
result = HIToolbarItemChangeAttributes( m_toolbarItemRef, addAttrs, removeAttrs ); result = HIToolbarItemChangeAttributes( m_toolbarItemRef, addAttrs, removeAttrs );
} }
#endif #endif
#ifdef __WXMAC_OSX__ #ifdef __WXMAC_OSX__
if ( toggle ) if ( toggle )
{ {
@@ -516,8 +523,7 @@ void wxToolBar::Init()
// //
bool wxToolBar::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, bool wxToolBar::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
long style, const wxString& name) long style, const wxString& name)
{ {
if ( !wxToolBarBase::Create( parent , id , pos , size , style ) ) if ( !wxToolBarBase::Create( parent , id , pos , size , style ) )
return FALSE ; return FALSE ;
@@ -568,7 +574,6 @@ wxToolBar::~wxToolBar()
#endif #endif
} }
bool wxToolBar::Show( bool show ) bool wxToolBar::Show( bool show )
{ {
bool bResult, ownToolbarInstalled = false; bool bResult, ownToolbarInstalled = false;
@@ -608,7 +613,6 @@ bool wxToolBar::IsShown() const
return bResult; return bResult;
} }
void wxToolBar::DoGetSize( int *width, int *height ) const void wxToolBar::DoGetSize( int *width, int *height ) const
{ {
#if wxMAC_USE_NATIVE_TOOLBAR #if wxMAC_USE_NATIVE_TOOLBAR