From ca910e1a13bae98fc2c5ddbff35431c6fd66d6b7 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 22 Jun 2009 18:36:19 +0000 Subject: [PATCH] fix more wxOSX/Carbon warnings in release build git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61165 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/osx/carbon/button.cpp | 40 ++++++++++++++++++++------------------ src/osx/carbon/dialog.cpp | 12 ++++++------ src/osx/carbon/font.cpp | 5 ++++- src/osx/carbon/taskbar.cpp | 2 +- 4 files changed, 32 insertions(+), 27 deletions(-) diff --git a/src/osx/carbon/button.cpp b/src/osx/carbon/button.cpp index 14ff0c1f55..956ca32257 100644 --- a/src/osx/carbon/button.cpp +++ b/src/osx/carbon/button.cpp @@ -110,14 +110,14 @@ wxSize wxButton::GetDefaultSize() return wxSize(wBtn, hBtn); } -wxWidgetImplType* wxWidgetImpl::CreateButton( wxWindowMac* wxpeer, - wxWindowMac* parent, - wxWindowID id, +wxWidgetImplType* wxWidgetImpl::CreateButton( wxWindowMac* wxpeer, + wxWindowMac* parent, + wxWindowID id, const wxString& label, - const wxPoint& pos, + const wxPoint& pos, const wxSize& size, - long WXUNUSED(style), - long WXUNUSED(extraStyle)) + long WXUNUSED(style), + long WXUNUSED(extraStyle)) { OSStatus err; Rect bounds = wxMacGetBoundsForControl( wxpeer , pos , size ) ; @@ -136,8 +136,12 @@ wxWidgetImplType* wxWidgetImpl::CreateButton( wxWindowMac* wxpeer, { // Button height is static in Mac, can't be changed, so we need to force it here int maxHeight; - switch (wxpeer->GetWindowVariant() ) + switch (wxpeer->GetWindowVariant() ) { + default: + wxFAIL_MSG( "unknown window variant" ); + // fall through + case wxWINDOW_VARIANT_NORMAL: case wxWINDOW_VARIANT_LARGE: maxHeight = 20 ; @@ -146,8 +150,6 @@ wxWidgetImplType* wxWidgetImpl::CreateButton( wxWindowMac* wxpeer, maxHeight = 17; case wxWINDOW_VARIANT_MINI: maxHeight = 15; - default: - break; } bounds.bottom = bounds.top + maxHeight ; wxpeer->SetMaxSize( wxSize( wxpeer->GetMaxWidth() , maxHeight )); @@ -169,33 +171,33 @@ wxWidgetImplType* wxWidgetImpl::CreateButton( wxWindowMac* wxpeer, } void wxMacControl::SetDefaultButton( bool isDefault ) -{ +{ SetData(kControlButtonPart , kControlPushButtonDefaultTag , (Boolean) isDefault ) ; } -wxWidgetImplType* wxWidgetImpl::CreateDisclosureTriangle( wxWindowMac* wxpeer, - wxWindowMac* parent, - wxWindowID WXUNUSED(id), +wxWidgetImplType* wxWidgetImpl::CreateDisclosureTriangle( wxWindowMac* wxpeer, + wxWindowMac* parent, + wxWindowID WXUNUSED(id), const wxString& label, - const wxPoint& pos, + const wxPoint& pos, const wxSize& size, - long WXUNUSED(style), - long WXUNUSED(extraStyle)) + long WXUNUSED(style), + long WXUNUSED(extraStyle)) { Rect bounds = wxMacGetBoundsForControl( wxpeer , pos , size ) ; wxMacControl* peer = new wxMacControl(wxpeer) ; OSStatus err = CreateDisclosureTriangleControl( - MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds, + MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds, kControlDisclosureTrianglePointDefault, wxCFStringRef( label ), 0, // closed TRUE, // draw title TRUE, // auto toggle back and forth peer->GetControlRefAddr() ); - + verify_noerr( err ); return peer; } - + diff --git a/src/osx/carbon/dialog.cpp b/src/osx/carbon/dialog.cpp index cbd77128db..8855697d64 100644 --- a/src/osx/carbon/dialog.cpp +++ b/src/osx/carbon/dialog.cpp @@ -34,8 +34,8 @@ void wxDialog::DoShowModal() SetFocus() ; WindowRef windowRef = (WindowRef) GetWXWindow(); - WindowGroupRef windowGroup; - WindowGroupRef formerParentGroup; + WindowGroupRef windowGroup = NULL; + WindowGroupRef formerParentGroup = NULL; bool resetGroupParent = false; if ( GetParent() == NULL ) @@ -49,10 +49,10 @@ void wxDialog::DoShowModal() wxEventLoop * const loop = static_cast(wxEventLoop::GetActive()); - - + + wxASSERT_MSG( loop , wxT("No Event Loop in place") ); - + if ( loop ) { while ( IsModal() ) @@ -64,4 +64,4 @@ void wxDialog::DoShowModal() { SetWindowGroupParent( windowGroup , formerParentGroup ); } -} \ No newline at end of file +} diff --git a/src/osx/carbon/font.cpp b/src/osx/carbon/font.cpp index c7998cd5a7..c68ff2bd84 100644 --- a/src/osx/carbon/font.cpp +++ b/src/osx/carbon/font.cpp @@ -1058,7 +1058,10 @@ void wxNativeFontInfo::EnsureValid() // ATSUFontID and FMFont are equivalent FMFontStyle intrinsicStyle = 0 ; 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_atsuFontValid = true; } diff --git a/src/osx/carbon/taskbar.cpp b/src/osx/carbon/taskbar.cpp index 58dc33c1a6..01a99d6566 100644 --- a/src/osx/carbon/taskbar.cpp +++ b/src/osx/carbon/taskbar.cpp @@ -470,7 +470,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxTaskBarIcon, wxEvtHandler) // actually seperate programs that also require a special undocumented id // hack and other such fun stuff). //----------------------------------------------------------------------------- -wxTaskBarIcon::wxTaskBarIcon(wxTaskBarIconType nType) +wxTaskBarIcon::wxTaskBarIcon(wxTaskBarIconType WXUNUSED_UNLESS_DEBUG(nType)) { wxASSERT_MSG( nType == DOCK, -- 2.45.2