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

diff --git a/src/osx/carbon/button.cpp b/src/osx/carbon/button.cpp
index 14ff0c1f5570dfd1e6a3a7a9360f1fa96fc35a94..956ca32257990bdfce12fbe3c9efe4633d5e3fa1 100644 (file)
--- a/src/osx/carbon/button.cpp
+++ b/src/osx/carbon/button.cpp
@@ -110,14 +110,14 @@ wxSize wxButton::GetDefaultSize()
     return wxSize(wBtn, hBtn);
 }
 
     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 wxString& label,

-                                    const wxPoint& pos, 
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long WXUNUSED(style), 
-                                    long WXUNUSED(extraStyle)) 
+                                    long WXUNUSED(style),
+                                    long WXUNUSED(extraStyle))

 {
     OSStatus err;
     Rect bounds = wxMacGetBoundsForControl( wxpeer , pos , size ) ;
 {
     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;
     {
         // 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 ;
             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;
                 maxHeight = 17;
             case wxWINDOW_VARIANT_MINI:
                 maxHeight = 15;

-            default:
-                break;

         }
         bounds.bottom = bounds.top + maxHeight ;
         wxpeer->SetMaxSize( wxSize( wxpeer->GetMaxWidth() , maxHeight ));
         }
         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 )
 }
 
 void wxMacControl::SetDefaultButton( bool isDefault )

-{ 
+{

     SetData(kControlButtonPart , kControlPushButtonDefaultTag , (Boolean) 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 wxString& label,

-                                    const wxPoint& pos, 
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     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(
 {
     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() );
             kControlDisclosureTrianglePointDefault,
             wxCFStringRef( label ),
             0,    // closed
             TRUE, // draw title
             TRUE, // auto toggle back and forth
             peer->GetControlRefAddr() );

-           
+

     verify_noerr( err );
     return peer;
 }
     verify_noerr( err );
     return peer;
 }

-                                    
+

 
 

diff --git a/src/osx/carbon/dialog.cpp b/src/osx/carbon/dialog.cpp
index cbd77128dbd21b888be9bbff96aa33c395faac61..8855697d645486c0ff0b6dd279cbda663da05907 100644 (file)
--- a/src/osx/carbon/dialog.cpp
+++ b/src/osx/carbon/dialog.cpp
@@ -34,8 +34,8 @@ void wxDialog::DoShowModal()
     SetFocus() ;
 
     WindowRef windowRef = (WindowRef) GetWXWindow();
     SetFocus() ;
 
     WindowRef windowRef = (WindowRef) GetWXWindow();

-    WindowGroupRef windowGroup;
-    WindowGroupRef formerParentGroup;
+    WindowGroupRef windowGroup = NULL;
+    WindowGroupRef formerParentGroup = NULL;

     bool resetGroupParent = false;
 
     if ( GetParent() == NULL )
     bool resetGroupParent = false;
 
     if ( GetParent() == NULL )


@@ -49,10 +49,10 @@ void wxDialog::DoShowModal()
 
     wxEventLoop * const
         loop = static_cast<wxEventLoop *>(wxEventLoop::GetActive());
 
     wxEventLoop * const
         loop = static_cast<wxEventLoop *>(wxEventLoop::GetActive());

-        
-    
+
+

     wxASSERT_MSG( loop , wxT("No Event Loop in place") );
     wxASSERT_MSG( loop , wxT("No Event Loop in place") );

-        
+

     if ( loop )
     {
         while ( IsModal() )
     if ( loop )
     {
         while ( IsModal() )


@@ -64,4 +64,4 @@ void wxDialog::DoShowModal()
     {
         SetWindowGroupParent( windowGroup , formerParentGroup );
     }
     {
         SetWindowGroupParent( windowGroup , formerParentGroup );
     }

-}
\ No newline at end of file
+}

diff --git a/src/osx/carbon/font.cpp b/src/osx/carbon/font.cpp
index c7998cd5a70ab6227b255f29a53da2291149d06f..c68ff2bd84776642852ea5cb85fae8d84f43ce8d 100644 (file)
--- 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);
         // 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;
     }
         m_atsuAdditionalQDStyles = m_qdFontStyle & (~intrinsicStyle );
         m_atsuFontValid = true;
     }

diff --git a/src/osx/carbon/taskbar.cpp b/src/osx/carbon/taskbar.cpp
index 58dc33c1a6bb9d25cdd457292853c9b94c277b61..01a99d65668e32abd4fa583b037e0abeb5143e21 100644 (file)
--- 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).
 //-----------------------------------------------------------------------------
 // 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,
 {
     wxASSERT_MSG(
         nType == DOCK,