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

fix more wxOSX/Carbon warnings in release build

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61165 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-06-22 18:36:19 +00:00
parent 6edd8829ef
commit ca910e1a13
4 changed files with 32 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/osx/carbon/button.cpp
View File

@@ -138,6 +138,10 @@ wxWidgetImplType* wxWidgetImpl::CreateButton( wxWindowMac* wxpeer,
int maxHeight; int maxHeight;
switch (wxpeer->GetWindowVariant() ) switch (wxpeer->GetWindowVariant() )
{ {
default:
wxFAIL_MSG( "unknown window variant" );
// fall through
case wxWINDOW_VARIANT_NORMAL: case wxWINDOW_VARIANT_NORMAL:
case wxWINDOW_VARIANT_LARGE: case wxWINDOW_VARIANT_LARGE:
maxHeight = 20 ; maxHeight = 20 ;
@@ -146,8 +150,6 @@ wxWidgetImplType* wxWidgetImpl::CreateButton( wxWindowMac* wxpeer,
maxHeight = 17; maxHeight = 17;
case wxWINDOW_VARIANT_MINI: case wxWINDOW_VARIANT_MINI:
maxHeight = 15; maxHeight = 15;
default:
break;
} }
bounds.bottom = bounds.top + maxHeight ; bounds.bottom = bounds.top + maxHeight ;
wxpeer->SetMaxSize( wxSize( wxpeer->GetMaxWidth() , maxHeight )); wxpeer->SetMaxSize( wxSize( wxpeer->GetMaxWidth() , maxHeight ));

4
src/osx/carbon/dialog.cpp
View File

@@ -34,8 +34,8 @@ void wxDialog::DoShowModal()
SetFocus() ; SetFocus() ;
WindowRef windowRef = (WindowRef) GetWXWindow(); WindowRef windowRef = (WindowRef) GetWXWindow();
WindowGroupRef windowGroup; WindowGroupRef windowGroup = NULL;
WindowGroupRef formerParentGroup; WindowGroupRef formerParentGroup = NULL;
bool resetGroupParent = false; bool resetGroupParent = false;
if ( GetParent() == NULL ) if ( GetParent() == NULL )

5
src/osx/carbon/font.cpp
View File

@@ -1058,7 +1058,10 @@ void wxNativeFontInfo::EnsureValid()
// ATSUFontID and FMFont are equivalent // ATSUFontID and FMFont are equivalent
FMFontStyle intrinsicStyle = 0 ; FMFontStyle intrinsicStyle = 0 ;
OSStatus status = FMGetFontFromFontFamilyInstance( m_qdFontFamily , m_qdFontStyle , (FMFont*)&m_atsuFontID , &intrinsicStyle); OSStatus status = FMGetFontFromFontFamilyInstance( m_qdFontFamily , m_qdFontStyle , (FMFont*)&m_atsuFontID , &intrinsicStyle);
wxASSERT_MSG( status == noErr , wxT("couldn't get an ATSUFont from font family") ); if ( status != noErr )
{
wxFAIL_MSG( wxT("couldn't get an ATSUFont from font family") );
}
m_atsuAdditionalQDStyles = m_qdFontStyle & (~intrinsicStyle ); m_atsuAdditionalQDStyles = m_qdFontStyle & (~intrinsicStyle );
m_atsuFontValid = true; m_atsuFontValid = true;
} }

2
src/osx/carbon/taskbar.cpp
View File

@@ -470,7 +470,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxTaskBarIcon, wxEvtHandler)
// actually seperate programs that also require a special undocumented id // actually seperate programs that also require a special undocumented id
// hack and other such fun stuff). // hack and other such fun stuff).
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
wxTaskBarIcon::wxTaskBarIcon(wxTaskBarIconType nType) wxTaskBarIcon::wxTaskBarIcon(wxTaskBarIconType WXUNUSED_UNLESS_DEBUG(nType))
{ {
wxASSERT_MSG( wxASSERT_MSG(
nType == DOCK, nType == DOCK,