Quit application menu item needs special handling like the Preferences item. [ patch...

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

diff --git a/src/mac/carbon/listbox.cpp b/src/mac/carbon/listbox.cpp
index 70035a81c2453d8edb6c032bef9fe3ec44959ea0..38bdecfd0176a694bafea1cd402e640de656180a 100644 (file)
--- a/src/mac/carbon/listbox.cpp
+++ b/src/mac/carbon/listbox.cpp
@@ -9,10 +9,14 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "listbox.h"
 #endif
 
 #pragma implementation "listbox.h"
 #endif
 

+#include "wx/wxprec.h"
+
+#if wxUSE_LISTBOX
+

 #include "wx/app.h"
 #include "wx/listbox.h"
 #include "wx/button.h"
 #include "wx/app.h"
 #include "wx/listbox.h"
 #include "wx/button.h"


@@ -40,15 +44,19 @@ const short kTextColumnId = 1024 ;
 
 // new databrowserbased version
 // because of the limited insert
 
 // new databrowserbased version
 // because of the limited insert

-// functionality of DataBrowser, 
+// functionality of DataBrowser,

 // we just introduce id s corresponding
 // to the line number
 
 // we just introduce id s corresponding
 // to the line number
 

+DataBrowserItemDataUPP gDataBrowserItemDataUPP = NULL ;
+DataBrowserItemNotificationUPP gDataBrowserItemNotificationUPP = NULL ;
+DataBrowserDrawItemUPP gDataBrowserDrawItemUPP = NULL ;
+

 #if TARGET_API_MAC_OSX
 #if TARGET_API_MAC_OSX

-static pascal void DataBrowserItemNotificationProc(ControlRef browser, DataBrowserItemID itemID, 
+static pascal void DataBrowserItemNotificationProc(ControlRef browser, DataBrowserItemID itemID,

     DataBrowserItemNotification message, DataBrowserItemDataRef itemData)
 #else
     DataBrowserItemNotification message, DataBrowserItemDataRef itemData)
 #else

-static pascal  void DataBrowserItemNotificationProc(ControlRef browser, DataBrowserItemID itemID, 
+static pascal  void DataBrowserItemNotificationProc(ControlRef browser, DataBrowserItemID itemID,

     DataBrowserItemNotification message)
 #endif
 {
     DataBrowserItemNotification message)
 #endif
 {


@@ -90,25 +98,25 @@ static pascal  void DataBrowserItemNotificationProc(ControlRef browser, DataBrow
                 event.SetExtraLong( list->HasMultipleSelection() ? message == kDataBrowserItemSelected : TRUE );
                 wxPostEvent( list->GetEventHandler() , event ) ;
                 // direct notification is not always having the listbox GetSelection() having in synch with event
                 event.SetExtraLong( list->HasMultipleSelection() ? message == kDataBrowserItemSelected : TRUE );
                 wxPostEvent( list->GetEventHandler() , event ) ;
                 // direct notification is not always having the listbox GetSelection() having in synch with event

-                // list->GetEventHandler()->ProcessEvent(event) ; 
-            } 
+                // list->GetEventHandler()->ProcessEvent(event) ;
+            }

         }
     }
 }
 
         }
     }
 }
 

-static pascal OSStatus ListBoxGetSetItemData(ControlRef browser, 
-    DataBrowserItemID itemID, DataBrowserPropertyID property, 
+static pascal OSStatus ListBoxGetSetItemData(ControlRef browser,
+    DataBrowserItemID itemID, DataBrowserPropertyID property,

     DataBrowserItemDataRef itemData, Boolean changeValue)
 {
        OSStatus err = errDataBrowserPropertyNotSupported;
     DataBrowserItemDataRef itemData, Boolean changeValue)
 {
        OSStatus err = errDataBrowserPropertyNotSupported;

-       
+

        if ( ! changeValue )
        if ( ! changeValue )

-       {       
+       {

        switch (property)
        {
        switch (property)
        {

-               
+

            case kTextColumnId:
            case kTextColumnId:

-               {       
+               {

                    long ref = GetControlReference( browser ) ;
                    if ( ref )
                    {
                    long ref = GetControlReference( browser ) ;
                    if ( ref )
                    {


@@ -121,18 +129,46 @@ static pascal OSStatus ListBoxGetSetItemData(ControlRef browser,
                                err = noErr ;
                            }
                        }
                                err = noErr ;
                            }
                        }

-               }       
+               }

                break;
                break;

-                               
+

                default:
                default:

-               
+

                break;
        }
        }
                break;
        }
        }

-       
+

        return err;
 }
 
        return err;
 }
 

+static pascal void ListBoxDrawProc( ControlRef browser , DataBrowserItemID item , DataBrowserPropertyID property ,
+    DataBrowserItemState itemState , const Rect *itemRect , SInt16 depth , Boolean isColorDevice )
+{
+
+    CFStringRef      cfString;
+    long        systemVersion;
+
+    cfString  = CFStringCreateWithFormat( NULL, NULL, CFSTR("Row %d"), item );
+  
+    ThemeDrawingState themeState ;
+    GetThemeDrawingState( &themeState ) ;
+  
+    if ( itemState == kDataBrowserItemIsSelected )      //  In this sample we handle the "selected" state, all others fall through to our "active" state
+    {
+        Gestalt( gestaltSystemVersion, &systemVersion );
+        if ( (systemVersion >= 0x00001030) && (IsControlActive( browser ) == false) )  //  Panther DB starts using kThemeBrushSecondaryHighlightColor for inactive browser hilighting
+            SetThemePen( kThemeBrushSecondaryHighlightColor, 32, true );
+        else
+            SetThemePen( kThemeBrushPrimaryHighlightColor, 32, true );
+
+        PaintRect( itemRect );                //  First paint the hilite rect, then the text on top
+        SetThemeDrawingState( themeState , false ) ;
+    }
+    DrawThemeTextBox( cfString, kThemeApplicationFont, kThemeStateActive, true, itemRect, teFlushDefault, NULL );
+    if ( cfString != NULL )  
+        CFRelease( cfString );
+    SetThemeDrawingState( themeState , true ) ;
+}

 
 // Listbox item
 wxListBox::wxListBox()
 
 // Listbox item
 wxListBox::wxListBox()


@@ -169,7 +205,7 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
 
     wxASSERT_MSG( !(style & wxLB_MULTIPLE) || !(style & wxLB_EXTENDED),
                   _T("only one of listbox selection modes can be specified") );
 
     wxASSERT_MSG( !(style & wxLB_MULTIPLE) || !(style & wxLB_EXTENDED),
                   _T("only one of listbox selection modes can be specified") );

-    
+

     if ( !wxListBoxBase::Create(parent, id, pos, size, style & ~(wxHSCROLL|wxVSCROLL), validator, name) )
         return false;
 
     if ( !wxListBoxBase::Create(parent, id, pos, size, style & ~(wxHSCROLL|wxVSCROLL), validator, name) )
         return false;
 


@@ -178,7 +214,7 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
 
     Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
 
 
     Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
 

-    m_peer = new wxMacControl() ;
+    m_peer = new wxMacControl(this) ;

     verify_noerr( ::CreateDataBrowserControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()), &bounds, kDataBrowserListView , m_peer->GetControlRefAddr() ) );
 
     DataBrowserSelectionFlags  options = kDataBrowserDragSelect ;
     verify_noerr( ::CreateDataBrowserControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()), &bounds, kDataBrowserListView , m_peer->GetControlRefAddr() ) );
 
     DataBrowserSelectionFlags  options = kDataBrowserDragSelect ;


@@ -194,61 +230,70 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
     {
         options += kDataBrowserSelectOnlyOne ;
     }
     {
         options += kDataBrowserSelectOnlyOne ;
     }

-    verify_noerr(m_peer->SetSelectionFlags( options ) ); 
+    verify_noerr(m_peer->SetSelectionFlags( options ) );
+    
+    if ( gDataBrowserItemDataUPP == NULL ) gDataBrowserItemDataUPP = NewDataBrowserItemDataUPP(ListBoxGetSetItemData) ;
+    if ( gDataBrowserItemNotificationUPP == NULL )
+    { 
+        gDataBrowserItemNotificationUPP = 
+#if TARGET_API_MAC_OSX
+               (DataBrowserItemNotificationUPP) NewDataBrowserItemNotificationWithItemUPP(DataBrowserItemNotificationProc) ;
+#else
+               NewDataBrowserItemNotificationUPP(DataBrowserItemNotificationProc) ;
+#endif
+    }    
+    if ( gDataBrowserDrawItemUPP == NULL ) gDataBrowserDrawItemUPP = NewDataBrowserDrawItemUPP(ListBoxDrawProc) ;
+
+    DataBrowserCallbacks callbacks ;
+    InitializeDataBrowserCallbacks( &callbacks , kDataBrowserLatestCallbacks ) ;

 
 

+    callbacks.u.v1.itemDataCallback = gDataBrowserItemDataUPP;
+       callbacks.u.v1.itemNotificationCallback = gDataBrowserItemNotificationUPP;
+    m_peer->SetCallbacks( &callbacks);
+
+    DataBrowserCustomCallbacks customCallbacks ;
+    InitializeDataBrowserCustomCallbacks( &customCallbacks , kDataBrowserLatestCustomCallbacks ) ; 
+   
+    customCallbacks.u.v1.drawItemCallback = gDataBrowserDrawItemUPP ;
+   
+    SetDataBrowserCustomCallbacks( m_peer->GetControlRef() , &customCallbacks ) ;    
+    

     DataBrowserListViewColumnDesc columnDesc ;
     columnDesc.headerBtnDesc.titleOffset = 0;
        columnDesc.headerBtnDesc.version = kDataBrowserListViewLatestHeaderDesc;
     DataBrowserListViewColumnDesc columnDesc ;
     columnDesc.headerBtnDesc.titleOffset = 0;
        columnDesc.headerBtnDesc.version = kDataBrowserListViewLatestHeaderDesc;

-               
-       columnDesc.headerBtnDesc.btnFontStyle.flags     = 
+
+       columnDesc.headerBtnDesc.btnFontStyle.flags     =

                kControlUseFontMask | kControlUseJustMask;
                kControlUseFontMask | kControlUseJustMask;

-       
+

        columnDesc.headerBtnDesc.btnContentInfo.contentType = kControlNoContent;
        columnDesc.headerBtnDesc.btnContentInfo.contentType = kControlNoContent;

-       columnDesc.propertyDesc.propertyType = kDataBrowserTextType;

        columnDesc.headerBtnDesc.btnFontStyle.just = teFlushDefault;
        columnDesc.headerBtnDesc.minimumWidth = 0;
        columnDesc.headerBtnDesc.maximumWidth = 10000;
        columnDesc.headerBtnDesc.btnFontStyle.just = teFlushDefault;
        columnDesc.headerBtnDesc.minimumWidth = 0;
        columnDesc.headerBtnDesc.maximumWidth = 10000;

-       
+

        columnDesc.headerBtnDesc.btnFontStyle.font = kControlFontViewSystemFont;
        columnDesc.headerBtnDesc.btnFontStyle.style = normal;
        columnDesc.headerBtnDesc.titleString = NULL ; // CFSTR( "" );
 
        columnDesc.propertyDesc.propertyID = kTextColumnId;
        columnDesc.headerBtnDesc.btnFontStyle.font = kControlFontViewSystemFont;
        columnDesc.headerBtnDesc.btnFontStyle.style = normal;
        columnDesc.headerBtnDesc.titleString = NULL ; // CFSTR( "" );
 
        columnDesc.propertyDesc.propertyID = kTextColumnId;

-       columnDesc.propertyDesc.propertyType = kDataBrowserTextType;
+       columnDesc.propertyDesc.propertyType = kDataBrowserTextType ; // kDataBrowserCustomType;

        columnDesc.propertyDesc.propertyFlags =
 #if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
        columnDesc.propertyDesc.propertyFlags =
 #if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2

-        kDataBrowserListViewTypeSelectColumn | 
+        kDataBrowserListViewTypeSelectColumn |

 #endif
         kDataBrowserTableViewSelectionColumn ;
 
 #endif
         kDataBrowserTableViewSelectionColumn ;
 

-       

        verify_noerr(m_peer->AddListViewColumn( &columnDesc, kDataBrowserListViewAppendColumn) ) ;
     verify_noerr(m_peer->AutoSizeListViewColumns() ) ;
     verify_noerr(m_peer->SetHasScrollBars(false , true ) ) ;
     verify_noerr(m_peer->SetTableViewHiliteStyle(kDataBrowserTableViewFillHilite  ) ) ;
     verify_noerr(m_peer->SetListViewHeaderBtnHeight( 0 ) ) ;
        verify_noerr(m_peer->AddListViewColumn( &columnDesc, kDataBrowserListViewAppendColumn) ) ;
     verify_noerr(m_peer->AutoSizeListViewColumns() ) ;
     verify_noerr(m_peer->SetHasScrollBars(false , true ) ) ;
     verify_noerr(m_peer->SetTableViewHiliteStyle(kDataBrowserTableViewFillHilite  ) ) ;
     verify_noerr(m_peer->SetListViewHeaderBtnHeight( 0 ) ) ;

-    DataBrowserCallbacks callbacks ;
-    
-    callbacks.version = kDataBrowserLatestCallbacks;
-    
-    InitDataBrowserCallbacks(&callbacks);
-    
-    callbacks.u.v1.itemDataCallback = 
-        NewDataBrowserItemDataUPP(ListBoxGetSetItemData);
-       
-       callbacks.u.v1.itemNotificationCallback =
-#if TARGET_API_MAC_OSX
-           (DataBrowserItemNotificationUPP) NewDataBrowserItemNotificationWithItemUPP(DataBrowserItemNotificationProc) ;
-#else
-           NewDataBrowserItemNotificationUPP(DataBrowserItemNotificationProc) ;
-#endif
-    m_peer->SetCallbacks( &callbacks);

 
 

-#if TARGET_API_MAC_OSX
-    // there is a redraw bug in 10.2.X
-    if ( UMAGetSystemVersion() < 0x1030 )
-        m_peer->SetData( kControlNoPart, kControlDataBrowserIncludesFrameAndFocusTag, (Boolean) false ) ;
+#if 0
+    // shouldn't be necessary anymore under 10.2
+    m_peer->SetData( kControlNoPart, kControlDataBrowserIncludesFrameAndFocusTag, (Boolean) false ) ;
+    m_peer->SetNeedsFocusRect( true ) ;

 #endif
 #endif

+

     MacPostControlCreate(pos,size) ;
 
     for ( int i = 0 ; i < n ; i++ )
     MacPostControlCreate(pos,size) ;
 
     for ( int i = 0 ; i < n ; i++ )


@@ -257,13 +302,13 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
     }
 
     SetBestSize(size);   // Needed because it is a wxControlWithItems
     }
 
     SetBestSize(size);   // Needed because it is a wxControlWithItems

-    
+

     return TRUE;
 }
 
 wxListBox::~wxListBox()
 {
     return TRUE;
 }
 
 wxListBox::~wxListBox()
 {

-    m_peer->SetReference( NULL ) ;
+    m_peer->SetReference( 0 ) ;

     FreeData() ;
     // avoid access during destruction
     if ( m_macList )
     FreeData() ;
     // avoid access during destruction
     if ( m_macList )


@@ -347,7 +392,7 @@ void wxListBox::DoSetItems(const wxArrayString& choices, void** clientData)
 {
     Clear() ;
     int n = choices.GetCount();
 {
     Clear() ;
     int n = choices.GetCount();

-    
+

     for( int i = 0 ; i < n ; ++i )
     {
         if ( clientData )
     for( int i = 0 ; i < n ; ++i )
     {
         if ( clientData )


@@ -362,7 +407,7 @@ void wxListBox::DoSetItems(const wxArrayString& choices, void** clientData)
         else
             Append( choices[i] ) ;
     }
         else
             Append( choices[i] ) ;
     }

-    
+

 #if wxUSE_OWNER_DRAWN
     if ( m_windowStyle & wxLB_OWNERDRAW ) {
         // first delete old items
 #if wxUSE_OWNER_DRAWN
     if ( m_windowStyle & wxLB_OWNERDRAW ) {
         // first delete old items


@@ -372,7 +417,7 @@ void wxListBox::DoSetItems(const wxArrayString& choices, void** clientData)
             m_aItems[ui] = NULL;
         }
         m_aItems.Empty();
             m_aItems[ui] = NULL;
         }
         m_aItems.Empty();

-        
+

         // then create new ones
         for ( ui = 0; ui < (size_t)m_noItems; ui++ ) {
             wxOwnerDrawn *pNewItem = CreateItem(ui);
         // then create new ones
         for ( ui = 0; ui < (size_t)m_noItems; ui++ ) {
             wxOwnerDrawn *pNewItem = CreateItem(ui);


@@ -385,14 +430,14 @@ void wxListBox::DoSetItems(const wxArrayString& choices, void** clientData)
 
 int wxListBox::FindString(const wxString& s) const
 {
 
 int wxListBox::FindString(const wxString& s) const
 {

-    
+

     if ( s.Right(1) == wxT("*") )
     {
         wxString search = s.Left( s.Length() - 1 ) ;
         int len = search.Length() ;
         Str255 s1 , s2 ;
         wxMacStringToPascal( search , s2 ) ;
     if ( s.Right(1) == wxT("*") )
     {
         wxString search = s.Left( s.Length() - 1 ) ;
         int len = search.Length() ;
         Str255 s1 , s2 ;
         wxMacStringToPascal( search , s2 ) ;

-        
+

         for ( int i = 0 ; i < m_noItems ; ++ i )
         {
                wxMacStringToPascal( m_stringArray[i].Left( len ) , s1 ) ;
         for ( int i = 0 ; i < m_noItems ; ++ i )
         {
                wxMacStringToPascal( m_stringArray[i].Left( len ) , s1 ) ;


@@ -410,14 +455,14 @@ int wxListBox::FindString(const wxString& s) const
                     return i ;
             }
         }
                     return i ;
             }
         }

-        
+

     }
     else
     {
         Str255 s1 , s2 ;
     }
     else
     {
         Str255 s1 , s2 ;

-        
+

         wxMacStringToPascal( s , s2 ) ;
         wxMacStringToPascal( s , s2 ) ;

-        
+

         for ( int i = 0 ; i < m_noItems ; ++ i )
         {
                wxMacStringToPascal( m_stringArray[i] , s1 ) ;
         for ( int i = 0 ; i < m_noItems ; ++ i )
         {
                wxMacStringToPascal( m_stringArray[i] , s1 ) ;


@@ -438,11 +483,11 @@ void wxListBox::Clear()
     MacClear() ;
 }
 
     MacClear() ;
 }
 

-void wxListBox::SetSelection(int N, bool select)
+void wxListBox::DoSetSelection(int N, bool select)

 {
     wxCHECK_RET( N == wxNOT_FOUND || (N >= 0 && N < m_noItems) ,
         wxT("invalid index in wxListBox::SetSelection") );
 {
     wxCHECK_RET( N == wxNOT_FOUND || (N >= 0 && N < m_noItems) ,
         wxT("invalid index in wxListBox::SetSelection") );

-        
+

     if ( N == wxNOT_FOUND )
         MacDeselectAll() ;
     else
     if ( N == wxNOT_FOUND )
         MacDeselectAll() ;
     else


@@ -453,7 +498,7 @@ bool wxListBox::IsSelected(int N) const
 {
     wxCHECK_MSG( N >= 0 && N < m_noItems, FALSE,
         wxT("invalid index in wxListBox::Selected") );
 {
     wxCHECK_MSG( N >= 0 && N < m_noItems, FALSE,
         wxT("invalid index in wxListBox::Selected") );

-    
+

     return MacIsSelected( N ) ;
 }
 
     return MacIsSelected( N ) ;
 }
 


@@ -461,7 +506,7 @@ void *wxListBox::DoGetItemClientData(int N) const
 {
     wxCHECK_MSG( N >= 0 && N < m_noItems, NULL,
         wxT("invalid index in wxListBox::GetClientData"));
 {
     wxCHECK_MSG( N >= 0 && N < m_noItems, NULL,
         wxT("invalid index in wxListBox::GetClientData"));

-    
+

     return (void *)m_dataArray[N];
 }
 
     return (void *)m_dataArray[N];
 }
 


@@ -474,7 +519,7 @@ void wxListBox::DoSetItemClientData(int N, void *Client_data)
 {
     wxCHECK_RET( N >= 0 && N < m_noItems,
         wxT("invalid index in wxListBox::SetClientData") );
 {
     wxCHECK_RET( N >= 0 && N < m_noItems,
         wxT("invalid index in wxListBox::SetClientData") );

-    
+

 #if wxUSE_OWNER_DRAWN
     if ( m_windowStyle & wxLB_OWNERDRAW )
     {
 #if wxUSE_OWNER_DRAWN
     if ( m_windowStyle & wxLB_OWNERDRAW )
     {


@@ -484,7 +529,7 @@ void wxListBox::DoSetItemClientData(int N, void *Client_data)
     }
 #endif // wxUSE_OWNER_DRAWN
     wxASSERT_MSG( m_dataArray.GetCount() >= (size_t) N , wxT("invalid client_data array") ) ;
     }
 #endif // wxUSE_OWNER_DRAWN
     wxASSERT_MSG( m_dataArray.GetCount() >= (size_t) N , wxT("invalid client_data array") ) ;

-    
+

     if ( m_dataArray.GetCount() > (size_t) N )
     {
         m_dataArray[N] = (char*) Client_data ;
     if ( m_dataArray.GetCount() > (size_t) N )
     {
         m_dataArray[N] = (char*) Client_data ;


@@ -515,18 +560,21 @@ int wxListBox::GetSelection() const
 // Find string for position
 wxString wxListBox::GetString(int N) const
 {
 // Find string for position
 wxString wxListBox::GetString(int N) const
 {

-       return m_stringArray[N]  ;
+    wxCHECK_MSG( N >= 0 && N < m_noItems, wxEmptyString,
+                 wxT("invalid index in wxListBox::GetString") );
+
+    return m_stringArray[N]  ;

 }
 
 void wxListBox::DoInsertItems(const wxArrayString& items, int pos)
 {
     wxCHECK_RET( pos >= 0 && pos <= m_noItems,
         wxT("invalid index in wxListBox::InsertItems") );
 }
 
 void wxListBox::DoInsertItems(const wxArrayString& items, int pos)
 {
     wxCHECK_RET( pos >= 0 && pos <= m_noItems,
         wxT("invalid index in wxListBox::InsertItems") );

-    
+

     InvalidateBestSize();
 
     int nItems = items.GetCount();
     InvalidateBestSize();
 
     int nItems = items.GetCount();

-    
+

     for ( int i = 0 ; i < nItems ; i++ )
     {
         m_stringArray.Insert( items[i] , pos + i ) ;
     for ( int i = 0 ; i < nItems ; i++ )
     {
         m_stringArray.Insert( items[i] , pos + i ) ;


@@ -549,8 +597,8 @@ wxSize wxListBox::DoGetBestSize() const
     int wLine;
 
     {
     int wLine;
 
     {

-        wxMacPortStateHelper st( UMAGetWindowPort( (WindowRef) MacGetTopLevelWindowRef() ) ) ; 
-        
+        wxMacPortStateHelper st( UMAGetWindowPort( (WindowRef) MacGetTopLevelWindowRef() ) ) ;
+

         if ( m_font.Ok() )
         {
             ::TextFont( m_font.MacGetFontNum() ) ;
         if ( m_font.Ok() )
         {
             ::TextFont( m_font.MacGetFontNum() ) ;


@@ -563,7 +611,7 @@ wxSize wxListBox::DoGetBestSize() const
             ::TextSize( 9  );
             ::TextFace( 0 ) ;
         }
             ::TextSize( 9  );
             ::TextFace( 0 ) ;
         }

-        
+

         // Find the widest line
         for(int i = 0; i < GetCount(); i++) {
             wxString str(GetString(i));
         // Find the widest line
         for(int i = 0; i < GetCount(); i++) {
             wxString str(GetString(i));


@@ -582,15 +630,15 @@ wxSize wxListBox::DoGetBestSize() const
         #endif
             lbWidth = wxMax(lbWidth, wLine);
         }
         #endif
             lbWidth = wxMax(lbWidth, wLine);
         }

-        
+

         // Add room for the scrollbar
         lbWidth += wxSystemSettings::GetMetric(wxSYS_VSCROLL_X);
         // Add room for the scrollbar
         lbWidth += wxSystemSettings::GetMetric(wxSYS_VSCROLL_X);

-        
+

         // And just a bit more
         int cy = 12 ;
         int cx = ::TextWidth( "X" , 0 , 1 ) ;
         lbWidth += cx ;
         // And just a bit more
         int cy = 12 ;
         int cx = ::TextWidth( "X" , 0 , 1 ) ;
         lbWidth += cx ;

-        
+

         // don't make the listbox too tall (limit height to around 10 items) but don't
         // make it too small neither
         lbHeight = (cy+4) * wxMin(wxMax(GetCount(), 3), 10);
         // don't make the listbox too tall (limit height to around 10 items) but don't
         // make it too small neither
         lbHeight = (cy+4) * wxMin(wxMax(GetCount(), 3), 10);


@@ -607,7 +655,6 @@ int wxListBox::GetCount() const
 void wxListBox::Refresh(bool eraseBack, const wxRect *rect)
 {
     wxControl::Refresh( eraseBack , rect ) ;
 void wxListBox::Refresh(bool eraseBack, const wxRect *rect)
 {
     wxControl::Refresh( eraseBack , rect ) ;

-    //    MacRedrawControl() ;

 }
 
 #if wxUSE_OWNER_DRAWN
 }
 
 #if wxUSE_OWNER_DRAWN


@@ -665,7 +712,7 @@ void wxListBox::MacDelete( int n )
         else if ( current > n )
         {
             // something behind the deleted item was selected -> move up
         else if ( current > n )
         {
             // something behind the deleted item was selected -> move up

-            MacSetSelection( current - 1 , true ) ;            
+            MacSetSelection( current - 1 , true ) ;

             MacSetSelection( current , false ) ;
         }
     }
             MacSetSelection( current , false ) ;
         }
     }


@@ -686,7 +733,7 @@ void wxListBox::MacInsert( int n , const wxString& text)
         int current = selectionBefore[i] ;
         if ( current >= n )
         {
         int current = selectionBefore[i] ;
         if ( current >= n )
         {

-            MacSetSelection( current + 1 , true ) ;            
+            MacSetSelection( current + 1 , true ) ;

             MacSetSelection( current , false ) ;
         }
     }
             MacSetSelection( current , false ) ;
         }
     }


@@ -707,7 +754,7 @@ void wxListBox::MacClear()
     verify_noerr( m_peer->RemoveItems( kDataBrowserNoItem , 0 , NULL , kDataBrowserItemNoProperty ) ) ;
 }
 
     verify_noerr( m_peer->RemoveItems( kDataBrowserNoItem , 0 , NULL , kDataBrowserItemNoProperty ) ) ;
 }
 

-void wxListBox::MacDeselectAll() 
+void wxListBox::MacDeselectAll()

 {
     bool former = MacSuppressSelection( true ) ;
     verify_noerr(m_peer->SetSelectedItems( 0 , NULL , kDataBrowserItemsRemove ) ) ;
 {
     bool former = MacSuppressSelection( true ) ;
     verify_noerr(m_peer->SetSelectedItems( 0 , NULL , kDataBrowserItemsRemove ) ) ;


@@ -730,7 +777,7 @@ void wxListBox::MacSetSelection( int n , bool select )
     MacSuppressSelection( former ) ;
 }
 
     MacSuppressSelection( former ) ;
 }
 

-bool  wxListBox::MacSuppressSelection( bool suppress ) 
+bool  wxListBox::MacSuppressSelection( bool suppress )

 {
        bool former = m_suppressSelection ;
        m_suppressSelection = suppress ;
 {
        bool former = m_suppressSelection ;
        m_suppressSelection = suppress ;


@@ -757,9 +804,9 @@ int wxListBox::MacGetSelection() const
 int wxListBox::MacGetSelections( wxArrayInt& aSelections ) const
 {
     int no_sel = 0 ;
 int wxListBox::MacGetSelections( wxArrayInt& aSelections ) const
 {
     int no_sel = 0 ;

-    
+

     aSelections.Empty();
     aSelections.Empty();

-    
+

     UInt32 first , last ;
     m_peer->GetSelectionAnchor( &first , &last ) ;
     if ( first != kDataBrowserNoItem )
     UInt32 first , last ;
     m_peer->GetSelectionAnchor( &first , &last ) ;
     if ( first != kDataBrowserNoItem )


@@ -796,13 +843,13 @@ void wxListBox::OnChar(wxKeyEvent& event)
     // todo trigger proper events here
     event.Skip() ;
     return ;
     // todo trigger proper events here
     event.Skip() ;
     return ;

-    
+

     if ( event.GetKeyCode() == WXK_RETURN || event.GetKeyCode() == WXK_NUMPAD_ENTER)
     {
         wxWindow* parent = GetParent() ;
         while( parent  && !parent->IsTopLevel() && parent->GetDefaultItem() == NULL )
             parent = parent->GetParent() ;
     if ( event.GetKeyCode() == WXK_RETURN || event.GetKeyCode() == WXK_NUMPAD_ENTER)
     {
         wxWindow* parent = GetParent() ;
         while( parent  && !parent->IsTopLevel() && parent->GetDefaultItem() == NULL )
             parent = parent->GetParent() ;

-        
+

         if ( parent && parent->GetDefaultItem() )
         {
             wxButton *def = wxDynamicCast(parent->GetDefaultItem(),
         if ( parent && parent->GetDefaultItem() )
         {
             wxButton *def = wxDynamicCast(parent->GetDefaultItem(),


@@ -844,10 +891,10 @@ void wxListBox::OnChar(wxKeyEvent& event)
     {
         // perform the default key handling first
         wxControl::OnKeyDown( event ) ;
     {
         // perform the default key handling first
         wxControl::OnKeyDown( event ) ;

-        
+

         wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, m_windowId);
         event.SetEventObject( this );
         wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, m_windowId);
         event.SetEventObject( this );

-        
+

         wxArrayInt aSelections;
         int n, count = GetSelections(aSelections);
         if ( count > 0 )
         wxArrayInt aSelections;
         int n, count = GetSelections(aSelections);
         if ( count > 0 )


@@ -863,9 +910,9 @@ void wxListBox::OnChar(wxKeyEvent& event)
         {
             n = -1;
         }
         {
             n = -1;
         }

-        
-        event.m_commandInt = n;
-        
+
+        event.SetInt(n);
+

         GetEventHandler()->ProcessEvent(event);
     }
     else
         GetEventHandler()->ProcessEvent(event);
     }
     else


@@ -884,20 +931,22 @@ void wxListBox::OnChar(wxKeyEvent& event)
                 SetSelection(line) ;
                 wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, m_windowId);
                 event.SetEventObject( this );
                 SetSelection(line) ;
                 wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, m_windowId);
                 event.SetEventObject( this );

-                
+

                 if ( HasClientObjectData() )
                     event.SetClientObject( GetClientObject( line ) );
                 else if ( HasClientUntypedData() )
                     event.SetClientData( GetClientData(line) );
                 event.SetString( GetString(line) );
                 if ( HasClientObjectData() )
                     event.SetClientObject( GetClientObject( line ) );
                 else if ( HasClientUntypedData() )
                     event.SetClientData( GetClientData(line) );
                 event.SetString( GetString(line) );

-                
-                event.m_commandInt = line ;
-                
+
+                event.SetInt(line);
+

                 GetEventHandler()->ProcessEvent(event);
             }
         }
     }
 }
 
                 GetEventHandler()->ProcessEvent(event);
             }
         }
     }
 }
 

+#endif // !TARGET_API_MAC_OSX
+

 #endif
 
 #endif