avoid setting initial position if it was not specified, broken in r70734

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

diff --git a/src/osx/carbon/choice.cpp b/src/osx/carbon/choice.cpp
index 00eb309d38a003469133c1884f4eb59c7236fbbc..dc7d1b91fdea3ad6afb21a44e52b3f8171f10201 100644 (file)
--- a/src/osx/carbon/choice.cpp
+++ b/src/osx/carbon/choice.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01

-// RCS-ID:      $Id$

 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -30,26 +29,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()
+
+    wxInt32 GetValue() const

     {
         return wxMacControl::GetValue() - 1;
     }
  };
 
     {
         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 );