compilation fix after r61232

[wxWidgets.git] / src / osx / choice_osx.cpp

diff --git a/src/osx/choice_osx.cpp b/src/osx/choice_osx.cpp
index 4bc08e371bfb81f05d3bf851384f33b1093f12b7..9702a7da67d1634a75ee703a90f5eacbdfd3cee4 100644 (file)
--- a/src/osx/choice_osx.cpp
+++ b/src/osx/choice_osx.cpp
@@ -169,12 +169,12 @@ void wxChoice::DoClear()
 // ----------------------------------------------------------------------------
 int wxChoice::GetSelection() const
 {
-    return m_peer->GetValue() -1;
+    return m_peer->GetValue();
 }
 
 void wxChoice::SetSelection( int n )
 {
-    m_peer->SetValue( n ) ;
+    m_peer->SetValue( n );
 }
 
 // ----------------------------------------------------------------------------
@@ -230,7 +230,7 @@ void * wxChoice::DoGetItemClientData(unsigned int n) const
     return (void *)m_datas[n];
 }
 
-bool wxChoice::HandleClicked( double timestampsec )
+bool wxChoice::OSXHandleClicked( double WXUNUSED(timestampsec) )
 {
     wxCommandEvent event( wxEVT_COMMAND_CHOICE_SELECTED, m_windowId );
 
@@ -256,7 +256,8 @@ bool wxChoice::HandleClicked( double timestampsec )
 wxSize wxChoice::DoGetBestSize() const
 {
     int lbWidth = GetCount() > 0 ? 20 : 100;  // some defaults
-    int lbHeight = 20;
+    wxSize baseSize = wxWindow::DoGetBestSize();
+    int lbHeight = baseSize.y;
     int wLine;
 
     {
@@ -280,7 +281,6 @@ wxSize wxChoice::DoGetBestSize() const
         wxCoord width, height ;
         dc.GetTextExtent( wxT("X"), &width, &height);
         int cx = width ;
-        lbHeight += 4;
 
         lbWidth += cx ;
     }