Fix crash in wxDC::GetMultiLineTextExtent() after last commit.

[wxWidgets.git] / src / osx / carbon / choice.cpp

diff --git a/src/osx/carbon/choice.cpp b/src/osx/carbon/choice.cpp
index 182d21f3e16ee09511f2c7f73342234f5363d64f..4bacff29a7072eae53c4fb35aac61ed3851e1eac 100644 (file)
--- a/src/osx/carbon/choice.cpp
+++ b/src/osx/carbon/choice.cpp
@@ -30,26 +30,26 @@ public :
     wxMacChoiceCarbonControl( wxWindowMac* peer ) : wxMacControl( peer )
     {
     }
     wxMacChoiceCarbonControl( wxWindowMac* peer ) : wxMacControl( peer )
     {
     }

-    
+

     void SetValue(wxInt32 v)
     {
         wxMacControl::SetValue( v + 1 );
     }
     void SetValue(wxInt32 v)
     {
         wxMacControl::SetValue( v + 1 );
     }

-    
+

     wxInt32 GetValue() const
     {
         return wxMacControl::GetValue() - 1;
     }
  };
 
     wxInt32 GetValue() const
     {
         return wxMacControl::GetValue() - 1;
     }
  };
 

-wxWidgetImplType* wxWidgetImpl::CreateChoice( wxWindowMac* wxpeer, 
-                                    wxWindowMac* parent, 
-                                    wxWindowID id, 
+wxWidgetImplType* wxWidgetImpl::CreateChoice( wxWindowMac* wxpeer,
+                                    wxWindowMac* parent,
+                                    wxWindowID WXUNUSED(id),

                                     wxMenu* menu,
                                     wxMenu* menu,

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

                                     const wxSize& size,
                                     const wxSize& size,

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

 {
     Rect bounds = wxMacGetBoundsForControl( wxpeer , pos , size );
 
 {
     Rect bounds = wxMacGetBoundsForControl( wxpeer , pos , size );