Remove my binary compatibility stuff from HEAD. Patch #1367014 used for reference.

[wxWidgets.git] / src / mac / carbon / combobxc.cpp

diff --git a/src/mac/carbon/combobxc.cpp b/src/mac/carbon/combobxc.cpp
index 8cee1e946e1b2b8a773ea50aeb25724e71241249..abb642fcdeab6b72b306f7d37bc5571a068600c5 100644 (file)
--- a/src/mac/carbon/combobxc.cpp
+++ b/src/mac/carbon/combobxc.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        combobox.cpp
+// Name:        src/mac/carbon/combobox.cpp

 // Purpose:     wxComboBox class
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxComboBox class
 // Author:      Stefan Csomor
 // Modified by:


@@ -9,9 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "combobox.h"
-#endif
+#include "wx/wxprec.h"

 
 #include "wx/combobox.h"
 #include "wx/button.h"
 
 #include "wx/combobox.h"
 #include "wx/button.h"


@@ -19,13 +17,11 @@
 #include "wx/mac/uma.h"
 #if TARGET_API_MAC_OSX
 #ifndef __HIVIEW__
 #include "wx/mac/uma.h"
 #if TARGET_API_MAC_OSX
 #ifndef __HIVIEW__

-       #include <HIToolbox/HIView.h>
+    #include <HIToolbox/HIView.h>

 #endif
 #endif
 
 #endif
 #endif
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)

-#endif

 
 // composite combobox implementation by Dan "Bud" Keith bud@otsys.com
 
 
 // composite combobox implementation by Dan "Bud" Keith bud@otsys.com
 


@@ -36,7 +32,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)
 #endif
 
 static int nextPopUpMenuId = 1000 ;
 #endif
 
 static int nextPopUpMenuId = 1000 ;

-MenuHandle NewUniqueMenu() 
+MenuHandle NewUniqueMenu()

 {
   MenuHandle handle = NewMenu( nextPopUpMenuId , "\pMenu" ) ;
   nextPopUpMenuId++ ;
 {
   MenuHandle handle = NewMenu( nextPopUpMenuId , "\pMenu" ) ;
   nextPopUpMenuId++ ;


@@ -53,7 +49,7 @@ static pascal OSStatus wxMacComboBoxEventHandler( EventHandlerCallRef handler ,
 {
     OSStatus result = eventNotHandledErr ;
     wxComboBox* cb = (wxComboBox*) data ;
 {
     OSStatus result = eventNotHandledErr ;
     wxComboBox* cb = (wxComboBox*) data ;

-    
+

     wxMacCarbonEvent cEvent( event ) ;
 
     switch( cEvent.GetClass() )
     wxMacCarbonEvent cEvent( event ) ;
 
     switch( cEvent.GetClass() )


@@ -77,7 +73,7 @@ static pascal OSStatus wxMacComboBoxEventHandler( EventHandlerCallRef handler ,
         default :
             break ;
     }
         default :
             break ;
     }

-    
+

 
     return result ;
 }
 
     return result ;
 }


@@ -163,13 +159,13 @@ protected:
                         event.SetEventObject(def);
                         def->Command(event);
                         return ;
                         event.SetEventObject(def);
                         def->Command(event);
                         return ;

-                   }
+                    }

                 }
 
                 return;
             }
         }
                 }
 
                 return;
             }
         }

-        
+

         event.Skip();
     }
 private:
         event.Skip();
     }
 private:


@@ -208,7 +204,7 @@ protected:
         wxSize sz = wxChoice::DoGetBestSize() ;
         sz.x = POPUPWIDTH ;
         return sz ;
         wxSize sz = wxChoice::DoGetBestSize() ;
         sz.x = POPUPWIDTH ;
         return sz ;

-    }  
+    }

 
 private:
     wxComboBox *m_cb;
 
 private:
     wxComboBox *m_cb;


@@ -217,7 +213,7 @@ private:
 };
 
 BEGIN_EVENT_TABLE(wxComboBoxChoice, wxChoice)
 };
 
 BEGIN_EVENT_TABLE(wxComboBoxChoice, wxChoice)

-    EVT_CHOICE(-1, wxComboBoxChoice::OnChoice)
+    EVT_CHOICE(wxID_ANY, wxComboBoxChoice::OnChoice)

 END_EVENT_TABLE()
 
 wxComboBox::~wxComboBox()
 END_EVENT_TABLE()
 
 wxComboBox::~wxComboBox()


@@ -246,14 +242,14 @@ wxComboBox::~wxComboBox()
 wxSize wxComboBox::DoGetBestSize() const
 {
 #if USE_HICOMBOBOX
 wxSize wxComboBox::DoGetBestSize() const
 {
 #if USE_HICOMBOBOX

-       return wxControl::DoGetBestSize();
+    return wxControl::DoGetBestSize();

 #else
     wxSize size = m_choice->GetBestSize();
 #else
     wxSize size = m_choice->GetBestSize();

-    
+

     if ( m_text != NULL )
     {
         wxSize  sizeText = m_text->GetBestSize();
     if ( m_text != NULL )
     {
         wxSize  sizeText = m_text->GetBestSize();

-        
+

         size.x = POPUPWIDTH + sizeText.x + MARGIN;
     }
 
         size.x = POPUPWIDTH + sizeText.x + MARGIN;
     }
 


@@ -263,25 +259,25 @@ wxSize wxComboBox::DoGetBestSize() const
 
 void wxComboBox::DoMoveWindow(int x, int y, int width, int height) {
 #if USE_HICOMBOBOX
 
 void wxComboBox::DoMoveWindow(int x, int y, int width, int height) {
 #if USE_HICOMBOBOX

-       wxControl::DoMoveWindow(x, y, width, height);
+    wxControl::DoMoveWindow(x, y, width, height);

 #else
     height = POPUPHEIGHT;
 #else
     height = POPUPHEIGHT;

-    
+

     wxControl::DoMoveWindow(x, y, width, height);
 
     if ( m_text == NULL )
     {
         // we might not be fully constructed yet, therefore watch out...
         if ( m_choice )
     wxControl::DoMoveWindow(x, y, width, height);
 
     if ( m_text == NULL )
     {
         // we might not be fully constructed yet, therefore watch out...
         if ( m_choice )

-            m_choice->SetSize(0, 0 , width, -1);
+            m_choice->SetSize(0, 0 , width, wxDefaultCoord);

     }
     else
     {
         wxCoord wText = width - POPUPWIDTH - MARGIN;
         m_text->SetSize(0, 0, wText, height);
     }
     else
     {
         wxCoord wText = width - POPUPWIDTH - MARGIN;
         m_text->SetSize(0, 0, wText, height);

-        m_choice->SetSize(0 + wText + MARGIN, 0, POPUPWIDTH, -1);
+        m_choice->SetSize(0 + wText + MARGIN, 0, POPUPWIDTH, wxDefaultCoord);

     }
     }

-#endif    
+#endif

 }
 
 
 }
 
 


@@ -293,23 +289,23 @@ void wxComboBox::DoMoveWindow(int x, int y, int width, int height) {
 bool wxComboBox::Enable(bool enable)
 {
     if ( !wxControl::Enable(enable) )
 bool wxComboBox::Enable(bool enable)
 {
     if ( !wxControl::Enable(enable) )

-        return FALSE;
+        return false;

 
 

-    return TRUE;
+    return true;

 }
 
 bool wxComboBox::Show(bool show)
 {
     if ( !wxControl::Show(show) )
 }
 
 bool wxComboBox::Show(bool show)
 {
     if ( !wxControl::Show(show) )

-        return FALSE;
+        return false;

 
 

-    return TRUE;
+    return true;

 }
 
 void wxComboBox::SetFocus()
 {
 #if USE_HICOMBOBOX
 }
 
 void wxComboBox::SetFocus()
 {
 #if USE_HICOMBOBOX

-       wxControl::SetFocus();
+    wxControl::SetFocus();

 #else
     if ( m_text != NULL) {
         m_text->SetFocus();
 #else
     if ( m_text != NULL) {
         m_text->SetFocus();


@@ -358,57 +354,57 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
     m_text = NULL;
     m_choice = NULL;
 #if USE_HICOMBOBOX
     m_text = NULL;
     m_choice = NULL;
 #if USE_HICOMBOBOX

-    m_macIsUserPane = FALSE ;
+    m_macIsUserPane = false ;

 #endif
     if ( !wxControl::Create(parent, id, wxDefaultPosition, wxDefaultSize, style ,
                             wxDefaultValidator, name) )
     {
 #endif
     if ( !wxControl::Create(parent, id, wxDefaultPosition, wxDefaultSize, style ,
                             wxDefaultValidator, name) )
     {

-        return FALSE;
+        return false;

     }
 #if USE_HICOMBOBOX
     Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
     HIRect hiRect;
     }
 #if USE_HICOMBOBOX
     Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
     HIRect hiRect;

-    
+

     hiRect.origin.x = 20; //bounds.left;
     hiRect.origin.y = 25; //bounds.top;
     hiRect.size.width = 120;// bounds.right - bounds.left;
     hiRect.origin.x = 20; //bounds.left;
     hiRect.origin.y = 25; //bounds.top;
     hiRect.size.width = 120;// bounds.right - bounds.left;

-    hiRect.size.height = 24; 
-       
+    hiRect.size.height = 24;
+

     //For some reason, this code causes the combo box not to be displayed at all.
     //hiRect.origin.x = bounds.left;
     //hiRect.origin.y = bounds.top;
     //hiRect.size.width = bounds.right - bounds.left;
     //hiRect.size.height = bounds.bottom - bounds.top;
     //printf("left = %d, right = %d, top = %d, bottom = %d\n", bounds.left, bounds.right, bounds.top, bounds.bottom);
     //For some reason, this code causes the combo box not to be displayed at all.
     //hiRect.origin.x = bounds.left;
     //hiRect.origin.y = bounds.top;
     //hiRect.size.width = bounds.right - bounds.left;
     //hiRect.size.height = bounds.bottom - bounds.top;
     //printf("left = %d, right = %d, top = %d, bottom = %d\n", bounds.left, bounds.right, bounds.top, bounds.bottom);

-       //printf("x = %d, y = %d, width = %d, height = %d\n", hibounds.origin.x, hibounds.origin.y, hibounds.size.width, hibounds.size.height);
-       m_peer = new wxMacControl() ;
+    //printf("x = %d, y = %d, width = %d, height = %d\n", hibounds.origin.x, hibounds.origin.y, hibounds.size.width, hibounds.size.height);
+    m_peer = new wxMacControl(this) ;

     verify_noerr( HIComboBoxCreate( &hiRect, CFSTR(""), NULL, NULL, kHIComboBoxStandardAttributes, *m_peer ) );
     verify_noerr( HIComboBoxCreate( &hiRect, CFSTR(""), NULL, NULL, kHIComboBoxStandardAttributes, *m_peer ) );

-    
+

 
     SetControl32BitMinimum( *m_peer , 0 ) ;
     SetControl32BitMaximum( *m_peer , 100) ;
     if ( n > 0 )
         SetControl32BitValue( *m_peer , 1 ) ;
 
     SetControl32BitMinimum( *m_peer , 0 ) ;
     SetControl32BitMaximum( *m_peer , 100) ;
     if ( n > 0 )
         SetControl32BitValue( *m_peer , 1 ) ;

-    
+

     MacPostControlCreate(pos,size) ;
     MacPostControlCreate(pos,size) ;

-    
+

     for ( int i = 0 ; i < n ; i++ )
     {
         DoAppend( choices[ i ] );
     }
     for ( int i = 0 ; i < n ; i++ )
     {
         DoAppend( choices[ i ] );
     }

-    
+

     HIViewSetVisible( *m_peer, true );
     SetSelection(0);
     EventHandlerRef comboEventHandler ;
     InstallControlEventHandler( *m_peer, GetwxMacComboBoxEventHandlerUPP(),
     HIViewSetVisible( *m_peer, true );
     SetSelection(0);
     EventHandlerRef comboEventHandler ;
     InstallControlEventHandler( *m_peer, GetwxMacComboBoxEventHandlerUPP(),

-        GetEventTypeCount(eventList), eventList, this, 
+        GetEventTypeCount(eventList), eventList, this,

         (EventHandlerRef *)&comboEventHandler);
 #else
     m_choice = new wxComboBoxChoice(this, style );
 
     m_choice = new wxComboBoxChoice(this, style );
     m_choice->SetSizeHints( wxSize( POPUPWIDTH , POPUPHEIGHT ) ) ;
         (EventHandlerRef *)&comboEventHandler);
 #else
     m_choice = new wxComboBoxChoice(this, style );
 
     m_choice = new wxComboBoxChoice(this, style );
     m_choice->SetSizeHints( wxSize( POPUPWIDTH , POPUPHEIGHT ) ) ;

-    
+

     wxSize csize = size;
     if ( style & wxCB_READONLY )
     {
     wxSize csize = size;
     if ( style & wxCB_READONLY )
     {


@@ -417,13 +413,13 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
     else
     {
         m_text = new wxComboBoxText(this);
     else
     {
         m_text = new wxComboBoxText(this);

-        if ( size.y == -1 ) {
+        if ( size.y == wxDefaultCoord ) {

           csize.y = m_text->GetSize().y ;
         }
     }
           csize.y = m_text->GetSize().y ;
         }
     }

-    
+

     DoSetSize(pos.x, pos.y, csize.x, csize.y);
     DoSetSize(pos.x, pos.y, csize.x, csize.y);

-    
+

     for ( int i = 0 ; i < n ; i++ )
     {
         m_choice->DoAppend( choices[ i ] );
     for ( int i = 0 ; i < n ; i++ )
     {
         m_choice->DoAppend( choices[ i ] );


@@ -431,7 +427,7 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
     SetBestSize(csize);   // Needed because it is a wxControlWithItems
 #endif
 
     SetBestSize(csize);   // Needed because it is a wxControlWithItems
 #endif
 

-    return TRUE;
+    return true;

 }
 
 wxString wxComboBox::GetValue() const
 }
 
 wxString wxComboBox::GetValue() const


@@ -442,7 +438,7 @@ wxString wxComboBox::GetValue() const
     return wxMacCFStringHolder( myString, m_font.GetEncoding() ).AsString();
 #else
     wxString        result;
     return wxMacCFStringHolder( myString, m_font.GetEncoding() ).AsString();
 #else
     wxString        result;

-    
+

     if ( m_text == NULL )
     {
         result = m_choice->GetString( m_choice->GetSelection() );
     if ( m_text == NULL )
     {
         result = m_choice->GetString( m_choice->GetSelection() );


@@ -451,7 +447,7 @@ wxString wxComboBox::GetValue() const
     {
         result = m_text->GetValue();
     }
     {
         result = m_text->GetValue();
     }

-    
+

     return result;
 #endif
 }
     return result;
 #endif
 }


@@ -459,7 +455,7 @@ wxString wxComboBox::GetValue() const
 void wxComboBox::SetValue(const wxString& value)
 {
 #if USE_HICOMBOBOX
 void wxComboBox::SetValue(const wxString& value)
 {
 #if USE_HICOMBOBOX

-    
+

 #else
     int s = FindString (value);
     if (s == wxNOT_FOUND && !HasFlag(wxCB_READONLY) )
 #else
     int s = FindString (value);
     if (s == wxNOT_FOUND && !HasFlag(wxCB_READONLY) )


@@ -509,7 +505,7 @@ void wxComboBox::SetEditable(bool editable)
 
     int currentX, currentY;
     GetPosition( &currentX, &currentY );
 
     int currentX, currentY;
     GetPosition( &currentX, &currentY );

-    
+

     int currentW, currentH;
     GetSize( &currentW, &currentH );
 
     int currentW, currentH;
     GetSize( &currentW, &currentH );
 


@@ -532,7 +528,7 @@ long wxComboBox::GetInsertionPoint() const
     return 0;
 }
 
     return 0;
 }
 

-long wxComboBox::GetLastPosition() const
+wxTextPos wxComboBox::GetLastPosition() const

 {
     // TODO
     return 0;
 {
     // TODO
     return 0;


@@ -553,7 +549,7 @@ void wxComboBox::SetSelection(long from, long to)
     // TODO
 }
 
     // TODO
 }
 

-int wxComboBox::DoAppend(const wxString& item) 
+int wxComboBox::DoAppend(const wxString& item)

 {
 #if USE_HICOMBOBOX
     CFIndex outIndex;
 {
 #if USE_HICOMBOBOX
     CFIndex outIndex;


@@ -565,20 +561,20 @@ int wxComboBox::DoAppend(const wxString& item)
 #endif
 }
 
 #endif
 }
 

-int wxComboBox::DoInsert(const wxString& item, int pos) 
+int wxComboBox::DoInsert(const wxString& item, int pos)

 {
 #if USE_HICOMBOBOX
     HIComboBoxInsertTextItemAtIndex( *m_peer, (CFIndex)pos, wxMacCFStringHolder(item, m_font.GetEncoding()) );
 {
 #if USE_HICOMBOBOX
     HIComboBoxInsertTextItemAtIndex( *m_peer, (CFIndex)pos, wxMacCFStringHolder(item, m_font.GetEncoding()) );

-    
+

     //SetControl32BitMaximum( *m_peer, GetCount() );
     //SetControl32BitMaximum( *m_peer, GetCount() );

-    
+

     return pos;
 #else
     return m_choice->DoInsert( item , pos ) ;
 #endif
 }
 
     return pos;
 #else
     return m_choice->DoInsert( item , pos ) ;
 #endif
 }
 

-void wxComboBox::DoSetItemClientData(int n, void* clientData) 
+void wxComboBox::DoSetItemClientData(int n, void* clientData)

 {
 #if USE_HICOMBOBOX
     return; //TODO
 {
 #if USE_HICOMBOBOX
     return; //TODO


@@ -605,7 +601,7 @@ void wxComboBox::DoSetItemClientObject(int n, wxClientData* clientData)
 #endif
 }
 
 #endif
 }
 

-wxClientData* wxComboBox::DoGetItemClientObject(int n) const 
+wxClientData* wxComboBox::DoGetItemClientObject(int n) const

 {
 #if USE_HICOMBOBOX
     return NULL;
 {
 #if USE_HICOMBOBOX
     return NULL;


@@ -628,9 +624,9 @@ void wxComboBox::FreeData()
 
 int wxComboBox::GetCount() const {
 #if USE_HICOMBOBOX
 
 int wxComboBox::GetCount() const {
 #if USE_HICOMBOBOX

-       return (int) HIComboBoxGetItemCount( *m_peer );
+    return (int) HIComboBoxGetItemCount( *m_peer );

 #else
 #else

-       return m_choice->GetCount() ; 
+    return m_choice->GetCount() ;

 #endif
 }
 
 #endif
 }
 


@@ -673,7 +669,7 @@ void wxComboBox::SetSelection(int n)
     SetControl32BitValue( *m_peer , n + 1 ) ;
 #else
     m_choice->SetSelection( n );
     SetControl32BitValue( *m_peer , n + 1 ) ;
 #else
     m_choice->SetSelection( n );

-    
+

     if ( m_text != NULL )
     {
         m_text->SetValue( GetString( n ) );
     if ( m_text != NULL )
     {
         m_text->SetValue( GetString( n ) );


@@ -681,17 +677,17 @@ void wxComboBox::SetSelection(int n)
 #endif
 }
 
 #endif
 }
 

-int wxComboBox::FindString(const wxString& s) const
+int wxComboBox::FindString(const wxString& s, bool bCase) const

 {
 #if USE_HICOMBOBOX
     for( int i = 0 ; i < GetCount() ; i++ )
     {
 {
 #if USE_HICOMBOBOX
     for( int i = 0 ; i < GetCount() ; i++ )
     {

-        if ( GetString( i ).IsSameAs(s, FALSE) )
+        if ( GetString( i ).IsSameAs(s, bCase) )

             return i ;
     }
     return wxNOT_FOUND ;
 #else
             return i ;
     }
     return wxNOT_FOUND ;
 #else

-    return m_choice->FindString( s );
+    return m_choice->FindString( s, bCase );

 #endif
 }
 
 #endif
 }
 


@@ -719,31 +715,123 @@ wxString wxComboBox::GetStringSelection() const
 #endif
 }
 
 #endif
 }
 

-bool wxComboBox::SetStringSelection(const wxString& sel)
+void wxComboBox::SetString(int n, const wxString& s)

 {
 {

-    int s = FindString (sel);
-    if (s > -1)
-        {
-            SetSelection (s);
-            return TRUE;
-        }
+#if USE_HICOMBOBOX
+    verify_noerr ( HIComboBoxInsertTextItemAtIndex( *m_peer, (CFIndex) n,
+        wxMacCFStringHolder(s, m_font.GetEncoding()) ) );
+    verify_noerr ( HIComboBoxRemoveItemAtIndex( *m_peer, (CFIndex) n + 1 ) );
+#else
+    m_choice->SetString( n , s ) ;
+#endif
+}
+
+bool wxComboBox::IsEditable() const
+{
+#if USE_HICOMBOBOX
+    // TODO
+    return !HasFlag(wxCB_READONLY);
+#else
+    return m_text != NULL && !HasFlag(wxCB_READONLY);
+#endif
+}
+
+void wxComboBox::Undo()
+{
+#if USE_HICOMBOBOX
+    // TODO
+#else
+    if (m_text != NULL)
+        m_text->Undo();
+#endif
+}
+
+void wxComboBox::Redo()
+{
+#if USE_HICOMBOBOX
+    // TODO
+#else
+    if (m_text != NULL)
+        m_text->Redo();
+#endif
+}
+
+void wxComboBox::SelectAll()
+{
+#if USE_HICOMBOBOX
+    // TODO
+#else
+    if (m_text != NULL)
+        m_text->SelectAll();
+#endif
+}
+
+bool wxComboBox::CanCopy() const
+{
+#if USE_HICOMBOBOX
+    // TODO
+    return false;
+#else
+    if (m_text != NULL)
+        return m_text->CanCopy();

     else
     else

-        return FALSE;
+        return false;
+#endif

 }
 
 }
 

-void wxComboBox::SetString(int n, const wxString& s) 
+bool wxComboBox::CanCut() const

 {
 #if USE_HICOMBOBOX
 {
 #if USE_HICOMBOBOX

-    verify_noerr ( HIComboBoxInsertTextItemAtIndex( *m_peer, (CFIndex) n, 
-        wxMacCFStringHolder(s, m_font.GetEncoding()) ) );
-    verify_noerr ( HIComboBoxRemoveItemAtIndex( *m_peer, (CFIndex) n + 1 ) );
+    // TODO
+    return false;

 #else
 #else

-    m_choice->SetString( n , s ) ;
+    if (m_text != NULL)
+        return m_text->CanCut();
+    else
+        return false;

 #endif
 }
 
 #endif
 }
 

+bool wxComboBox::CanPaste() const
+{
+#if USE_HICOMBOBOX
+    // TODO
+    return false;
+#else
+    if (m_text != NULL)
+        return m_text->CanPaste();
+    else
+        return false;
+#endif
+}

 
 

-wxInt32 wxComboBox::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) ) 
+bool wxComboBox::CanUndo() const
+{
+#if USE_HICOMBOBOX
+    // TODO
+    return false;
+#else
+    if (m_text != NULL)
+        return m_text->CanUndo();
+    else
+        return false;
+#endif
+}
+
+bool wxComboBox::CanRedo() const
+{
+#if USE_HICOMBOBOX
+    // TODO
+    return false;
+#else
+    if (m_text != NULL)
+        return m_text->CanRedo();
+    else
+        return false;
+#endif
+}
+
+wxInt32 wxComboBox::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) )

 {
     wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_SELECTED, m_windowId );
     event.SetInt(GetSelection());
 {
     wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_SELECTED, m_windowId );
     event.SetInt(GetSelection());


@@ -752,4 +840,3 @@ wxInt32 wxComboBox::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTR
     ProcessCommand(event);
     return noErr ;
 }
     ProcessCommand(event);
     return noErr ;
 }

-