Font (possible) fix

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

diff --git a/src/mac/carbon/listbox.cpp b/src/mac/carbon/listbox.cpp
index b897ec3b41b4d74b3837efbfe51130e8aada2209..c0084b4a6efc1c793715081a47676dcff4f7b82e 100644 (file)
--- a/src/mac/carbon/listbox.cpp
+++ b/src/mac/carbon/listbox.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxListBox
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxListBox
 // Author:      Stefan Csomor
 // Modified by:


@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "listbox.h"
-#endif
-

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


@@ -27,7 +23,6 @@
 
 #include "wx/utils.h"
 
 
 #include "wx/utils.h"
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
 
 BEGIN_EVENT_TABLE(wxListBox, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
 
 BEGIN_EVENT_TABLE(wxListBox, wxControl)


@@ -36,7 +31,6 @@ BEGIN_EVENT_TABLE(wxListBox, wxControl)
     EVT_CHAR( wxListBox::OnChar )
 #endif
 END_EVENT_TABLE()
     EVT_CHAR( wxListBox::OnChar )
 #endif
 END_EVENT_TABLE()

-#endif

 
 #include "wx/mac/uma.h"
 
 
 #include "wx/mac/uma.h"
 


@@ -48,6 +42,10 @@ const short kTextColumnId = 1024 ;
 // 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
 static pascal void DataBrowserItemNotificationProc(ControlRef browser, DataBrowserItemID itemID,
     DataBrowserItemNotification message, DataBrowserItemDataRef itemData)
 #if TARGET_API_MAC_OSX
 static pascal void DataBrowserItemNotificationProc(ControlRef browser, DataBrowserItemID itemID,
     DataBrowserItemNotification message, DataBrowserItemDataRef itemData)


@@ -104,39 +102,67 @@ static pascal OSStatus ListBoxGetSetItemData(ControlRef browser,
     DataBrowserItemID itemID, DataBrowserPropertyID property,
     DataBrowserItemDataRef itemData, Boolean changeValue)
 {
     DataBrowserItemID itemID, DataBrowserPropertyID property,
     DataBrowserItemDataRef itemData, Boolean changeValue)
 {

-       OSStatus err = errDataBrowserPropertyNotSupported;
+    OSStatus err = errDataBrowserPropertyNotSupported;

 
 

-       if ( ! changeValue )
-       {
-       switch (property)
-       {
+    if ( ! changeValue )
+    {
+        switch (property)
+        {

 
 

-           case kTextColumnId:
-               {
-                   long ref = GetControlReference( browser ) ;
-                   if ( ref )
-                   {
-                       wxListBox* list = wxDynamicCast( (wxObject*) ref , wxListBox ) ;
+            case kTextColumnId:
+            {
+                long ref = GetControlReference( browser ) ;
+                if ( ref )
+                {
+                    wxListBox* list = wxDynamicCast( (wxObject*) ref , wxListBox ) ;

                     int i = itemID - 1 ;
                     if (i >= 0 && i < list->GetCount() )
                     int i = itemID - 1 ;
                     if (i >= 0 && i < list->GetCount() )

-                           {
-                               wxMacCFStringHolder cf( list->GetString(i) , list->GetFont().GetEncoding() ) ;
-                               verify_noerr( ::SetDataBrowserItemDataText( itemData , cf ) ) ;
-                               err = noErr ;
-                           }
-                       }
-               }
-               break;
+                    {
+                        wxMacCFStringHolder cf( list->GetString(i) , list->GetFont().GetEncoding() ) ;
+                        verify_noerr( ::SetDataBrowserItemDataText( itemData , cf ) ) ;
+                        err = noErr ;
+                    }
+                }
+            }
+            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()


@@ -182,7 +208,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 ;


@@ -200,59 +226,68 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
     }
     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;
     DataBrowserListViewColumnDesc columnDesc ;
     columnDesc.headerBtnDesc.titleOffset = 0;

-       columnDesc.headerBtnDesc.version = kDataBrowserListViewLatestHeaderDesc;
+    columnDesc.headerBtnDesc.version = kDataBrowserListViewLatestHeaderDesc;

 
 

-       columnDesc.headerBtnDesc.btnFontStyle.flags     =
-               kControlUseFontMask | kControlUseJustMask;
+    columnDesc.headerBtnDesc.btnFontStyle.flags    =
+        kControlUseFontMask | kControlUseJustMask;

 
 

-       columnDesc.headerBtnDesc.btnContentInfo.contentType = kControlNoContent;
-       columnDesc.propertyDesc.propertyType = kDataBrowserTextType;
-       columnDesc.headerBtnDesc.btnFontStyle.just = teFlushDefault;
-       columnDesc.headerBtnDesc.minimumWidth = 0;
-       columnDesc.headerBtnDesc.maximumWidth = 10000;
+    columnDesc.headerBtnDesc.btnContentInfo.contentType = kControlNoContent;
+    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.headerBtnDesc.btnFontStyle.font = kControlFontViewSystemFont;
+    columnDesc.headerBtnDesc.btnFontStyle.style = normal;
+    columnDesc.headerBtnDesc.titleString = NULL ; // CFSTR( "" );

 
 

-       columnDesc.propertyDesc.propertyID = kTextColumnId;
-       columnDesc.propertyDesc.propertyType = kDataBrowserTextType;
-       columnDesc.propertyDesc.propertyFlags =
+    columnDesc.propertyDesc.propertyID = kTextColumnId;
+    columnDesc.propertyDesc.propertyType = kDataBrowserTextType ; // kDataBrowserCustomType;
+    columnDesc.propertyDesc.propertyFlags =

 #if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
 #if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2

-        kDataBrowserListViewTypeSelectColumn |
+     kDataBrowserListViewTypeSelectColumn |

 #endif
 #endif

-        kDataBrowserTableViewSelectionColumn ;
+     kDataBrowserTableViewSelectionColumn ;

 
 

-
-       verify_noerr(m_peer->AddListViewColumn( &columnDesc, kDataBrowserListViewAppendColumn) ) ;
+    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->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) ;
+#if 0
+    // shouldn't be necessary anymore under 10.2
+    m_peer->SetData( kControlNoPart, kControlDataBrowserIncludesFrameAndFocusTag, (Boolean) false ) ;
+    m_peer->SetNeedsFocusRect( true ) ;

 #endif
 #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 ) ;
-#endif

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


@@ -278,19 +313,6 @@ wxListBox::~wxListBox()
 
 void wxListBox::FreeData()
 {
 
 void wxListBox::FreeData()
 {

-#if wxUSE_OWNER_DRAWN
-    if ( m_windowStyle & wxLB_OWNERDRAW )
-    {
-        size_t uiCount = m_aItems.Count();
-        while ( uiCount-- != 0 ) {
-            delete m_aItems[uiCount];
-            m_aItems[uiCount] = NULL;
-        }
-
-        m_aItems.Clear();
-    }
-    else
-#endif // wxUSE_OWNER_DRAWN

     if ( HasClientObjectData() )
     {
         for ( size_t n = 0; n < (size_t)m_noItems; n++ )
     if ( HasClientObjectData() )
     {
         for ( size_t n = 0; n < (size_t)m_noItems; n++ )


@@ -317,15 +339,10 @@ void wxListBox::Delete(int N)
     wxCHECK_RET( N >= 0 && N < m_noItems,
                  wxT("invalid index in wxListBox::Delete") );
 
     wxCHECK_RET( N >= 0 && N < m_noItems,
                  wxT("invalid index in wxListBox::Delete") );
 

-#if wxUSE_OWNER_DRAWN
-    delete m_aItems[N];
-    m_aItems.RemoveAt(N);
-#else // !wxUSE_OWNER_DRAWN

     if ( HasClientObjectData() )
     {
         delete GetClientObject(N);
     }
     if ( HasClientObjectData() )
     {
         delete GetClientObject(N);
     }

-#endif // wxUSE_OWNER_DRAWN/!wxUSE_OWNER_DRAWN

     m_stringArray.RemoveAt( N ) ;
     m_dataArray.RemoveAt( N ) ;
     m_noItems --;
     m_stringArray.RemoveAt( N ) ;
     m_dataArray.RemoveAt( N ) ;
     m_noItems --;


@@ -356,40 +373,15 @@ void wxListBox::DoSetItems(const wxArrayString& choices, void** clientData)
     {
         if ( clientData )
         {
     {
         if ( clientData )
         {

-#if wxUSE_OWNER_DRAWN
-            wxASSERT_MSG(clientData[i] == NULL,
-                wxT("Can't use client data with owner-drawn listboxes"));
-#else // !wxUSE_OWNER_DRAWN

             Append( choices[i] , clientData[i] ) ;
             Append( choices[i] , clientData[i] ) ;

-#endif

         }
         else
             Append( choices[i] ) ;
     }
         }
         else
             Append( choices[i] ) ;
     }

-
-#if wxUSE_OWNER_DRAWN
-    if ( m_windowStyle & wxLB_OWNERDRAW ) {
-        // first delete old items
-        size_t ui = m_aItems.Count();
-        while ( ui-- != 0 ) {
-            delete m_aItems[ui];
-            m_aItems[ui] = NULL;
-        }
-        m_aItems.Empty();
-
-        // then create new ones
-        for ( ui = 0; ui < (size_t)m_noItems; ui++ ) {
-            wxOwnerDrawn *pNewItem = CreateItem(ui);
-            pNewItem->SetName(choices[ui]);
-            m_aItems.Add(pNewItem);
-        }
-    }
-#endif // wxUSE_OWNER_DRAWN

 }
 
 }
 

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

 {
 {

-

     if ( s.Right(1) == wxT("*") )
     {
         wxString search = s.Left( s.Length() - 1 ) ;
     if ( s.Right(1) == wxT("*") )
     {
         wxString search = s.Left( s.Length() - 1 ) ;


@@ -399,9 +391,9 @@ int wxListBox::FindString(const wxString& s) const
 
         for ( int i = 0 ; i < m_noItems ; ++ i )
         {
 
         for ( int i = 0 ; i < m_noItems ; ++ i )
         {

-               wxMacStringToPascal( m_stringArray[i].Left( len ) , s1 ) ;
+            wxMacStringToPascal( m_stringArray[i].Left( len ) , s1 ) ;

 
 

-            if ( EqualString( s1 , s2 , false , false ) )
+            if ( EqualString( s1 , s2 , bCase , false ) )

                 return i ;
         }
         if ( s.Left(1) == wxT("*") && s.Length() > 1 )
                 return i ;
         }
         if ( s.Left(1) == wxT("*") && s.Length() > 1 )


@@ -424,13 +416,13 @@ int wxListBox::FindString(const wxString& s) const
 
         for ( int i = 0 ; i < m_noItems ; ++ i )
         {
 
         for ( int i = 0 ; i < m_noItems ; ++ i )
         {

-               wxMacStringToPascal( m_stringArray[i] , s1 ) ;
+            wxMacStringToPascal( m_stringArray[i] , s1 ) ;

 
 

-            if ( EqualString( s1 , s2 , false , false ) )
+            if ( EqualString( s1 , s2 , bCase , false ) )

                 return i ;
         }
     }
                 return i ;
         }
     }

-    return -1;
+    return wxNOT_FOUND;

 }
 
 void wxListBox::Clear()
 }
 
 void wxListBox::Clear()


@@ -479,14 +471,6 @@ 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 )
-    {
-        // client data must be pointer to wxOwnerDrawn, otherwise we would crash
-        // in OnMeasure/OnDraw.
-        wxFAIL_MSG(wxT("Can't use client data with owner-drawn listboxes"));
-    }
-#endif // wxUSE_OWNER_DRAWN

     wxASSERT_MSG( m_dataArray.GetCount() >= (size_t) N , wxT("invalid client_data array") ) ;
 
     if ( m_dataArray.GetCount() > (size_t) N )
     wxASSERT_MSG( m_dataArray.GetCount() >= (size_t) N , wxT("invalid client_data array") ) ;
 
     if ( m_dataArray.GetCount() > (size_t) N )


@@ -519,7 +503,10 @@ 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)
 }
 
 void wxListBox::DoInsertItems(const wxArrayString& items, int pos)


@@ -613,27 +600,6 @@ void wxListBox::Refresh(bool eraseBack, const wxRect *rect)
     wxControl::Refresh( eraseBack , rect ) ;
 }
 
     wxControl::Refresh( eraseBack , rect ) ;
 }
 

-#if wxUSE_OWNER_DRAWN
-
-class wxListBoxItem : public wxOwnerDrawn
-{
-public:
-    wxListBoxItem(const wxString& str = "");
-};
-
-wxListBoxItem::wxListBoxItem(const wxString& str) : wxOwnerDrawn(str, FALSE)
-{
-    // no bitmaps/checkmarks
-    SetMarginWidth(0);
-}
-
-wxOwnerDrawn *wxListBox::CreateItem(size_t n)
-{
-    return new wxListBoxItem();
-}
-
-#endif  //USE_OWNER_DRAWN
-

 
 // Some custom controls depend on this
 /* static */ wxVisualAttributes
 
 // Some custom controls depend on this
 /* static */ wxVisualAttributes


@@ -735,9 +701,9 @@ void wxListBox::MacSetSelection( int n , bool select )
 
 bool  wxListBox::MacSuppressSelection( bool suppress )
 {
 
 bool  wxListBox::MacSuppressSelection( bool suppress )
 {

-       bool former = m_suppressSelection ;
-       m_suppressSelection = suppress ;
-       return former ;
+    bool former = m_suppressSelection ;
+    m_suppressSelection = suppress ;
+    return former ;

 }
 
 bool wxListBox::MacIsSelected( int n ) const
 }
 
 bool wxListBox::MacIsSelected( int n ) const


@@ -823,14 +789,14 @@ void wxListBox::OnChar(wxKeyEvent& event)
     /* generate wxID_CANCEL if command-. or <esc> has been pressed (typically in dialogs) */
     else if (event.GetKeyCode() == WXK_ESCAPE || (event.GetKeyCode() == '.' && event.MetaDown() ) )
     {
     /* generate wxID_CANCEL if command-. or <esc> has been pressed (typically in dialogs) */
     else if (event.GetKeyCode() == WXK_ESCAPE || (event.GetKeyCode() == '.' && event.MetaDown() ) )
     {

-       // FIXME: look in ancestors, not just parent.
+        // FIXME: look in ancestors, not just parent.

         wxWindow* win = GetParent()->FindWindow( wxID_CANCEL ) ;
         if (win)
         {
         wxWindow* win = GetParent()->FindWindow( wxID_CANCEL ) ;
         if (win)
         {

-               wxCommandEvent new_event(wxEVT_COMMAND_BUTTON_CLICKED,wxID_CANCEL);
-               new_event.SetEventObject( win );
-               win->GetEventHandler()->ProcessEvent( new_event );
-       }
+            wxCommandEvent new_event(wxEVT_COMMAND_BUTTON_CLICKED,wxID_CANCEL);
+            new_event.SetEventObject( win );
+            win->GetEventHandler()->ProcessEvent( new_event );
+          }

     }
     else if ( event.GetKeyCode() == WXK_TAB )
     {
     }
     else if ( event.GetKeyCode() == WXK_TAB )
     {


@@ -905,4 +871,3 @@ void wxListBox::OnChar(wxKeyEvent& event)
 #endif // !TARGET_API_MAC_OSX
 
 #endif
 #endif // !TARGET_API_MAC_OSX
 
 #endif

-