fixes for Raise() to work correctly with both top level and child windows

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

diff --git a/src/mac/carbon/listbox.cpp b/src/mac/carbon/listbox.cpp
index 3b062f04e521ea681e4c33e18450133eba97855d..780e28bc7ede7989d76df389dcdf7c0316c201e3 100644 (file)
--- a/src/mac/carbon/listbox.cpp
+++ b/src/mac/carbon/listbox.cpp
@@ -13,19 +13,24 @@
 #pragma implementation "listbox.h"
 #endif
 
 #pragma implementation "listbox.h"
 #endif
 

+#include "wx/app.h"

 #include "wx/listbox.h"
 #include "wx/settings.h"
 #include "wx/dynarray.h"
 #include "wx/log.h"
 
 #include "wx/utils.h"
 #include "wx/listbox.h"
 #include "wx/settings.h"
 #include "wx/dynarray.h"
 #include "wx/log.h"
 
 #include "wx/utils.h"

-#include "extldef.h"
+#ifndef __DARWIN__
+  #include "extldef.h"
+#endif

 
 

+#if !USE_SHARED_LIBRARY

   IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
 
 BEGIN_EVENT_TABLE(wxListBox, wxControl)
        EVT_SIZE( wxListBox::OnSize ) 
 END_EVENT_TABLE()
   IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
 
 BEGIN_EVENT_TABLE(wxListBox, wxControl)
        EVT_SIZE( wxListBox::OnSize ) 
 END_EVENT_TABLE()

+#endif

 
 #include <wx/mac/uma.h>
 
 
 #include <wx/mac/uma.h>
 


@@ -41,6 +46,7 @@ wxListBox::wxListBox()
 {
   m_noItems = 0;
   m_selected = 0;
 {
   m_noItems = 0;
   m_selected = 0;

+  m_macList = NULL ;

 }
 
 bool wxListBox::Create(wxWindow *parent, wxWindowID id,
 }
 
 bool wxListBox::Create(wxWindow *parent, wxWindowID id,


@@ -51,61 +57,107 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
                        const wxValidator& validator,
                        const wxString& name)
 {
                        const wxValidator& validator,
                        const wxString& name)
 {

-  m_noItems = 0 ; // this will be increased by our append command
-  m_selected = 0;
+    m_noItems = 0 ; // this will be increased by our append command
+    m_selected = 0;
+    
+    Rect bounds ;
+    Str255 title ;
+    
+    MacPreControlCreate( parent , id ,  "" , pos , size ,style, validator , name , &bounds , title ) ;

 
 

-       Rect bounds ;
-       Str255 title ;
-       m_macHorizontalBorder = 5 ; // additional pixels around the real control
-       m_macVerticalBorder = 5 ;
-       
-       MacPreControlCreate( parent , id ,  "" , pos , size ,style, validator , name , &bounds , title ) ;
+#if TARGET_CARBON
+    ListDefSpec listDef;
+    OptionBits  options;
+    Size asize;

 
 

-       m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , true , kwxMacListWithVerticalScrollbar , 0 , 0, 
-               kControlListBoxProc , (long) this ) ;
-       
-       long    result ;
-       UMAGetControlData( m_macControl , kControlNoPart , kControlListBoxListHandleTag , sizeof( ListHandle ) , (char*) &m_macList  , &result ) ;
+    listDef.defType = kListDefStandardTextType;

 
 

-       NewExtLDEFInfo( m_macList , MacDrawStringCell , (long) this ) ;
-       (**m_macList).selFlags = lOnlyOne ;
-       if ( style  & wxLB_MULTIPLE )
-       {
-               (**m_macList).selFlags += lNoExtend ;
-       }
-       else if ( style & wxLB_EXTENDED )
-       {
-               (**m_macList).selFlags += lExtendDrag ;
-       }
-       Point pt = (**m_macList).cellSize ;
-       pt.v = 14 ;
-       LCellSize( pt , m_macList ) ;
-
-       LAddColumn( 1 , 0 , m_macList ) ;
-
-       MacPostControlCreate() ;
+    CreateListBoxControl( parent->GetMacRootWindow(), &bounds, false, 0, 1, false, true,
+                          14, 14, false, &listDef, &m_macControl );

 
 

-       ControlFontStyleRec             controlstyle ;
-       controlstyle.flags = kControlUseFontMask + kControlUseSizeMask ;
-       //controlstyle.font = kControlFontSmallSystemFont ;
-       controlstyle.font = kFontIDMonaco ;
-       controlstyle.size = 9 ;
-       ::UMASetControlFontStyle( m_macControl , &controlstyle ) ;
+    GetControlData(m_macControl, kControlNoPart, kControlListBoxListHandleTag,
+                   sizeof(ListHandle), (Ptr) &m_macList, &asize);

 
 

-       for ( int i = 0 ; i < n ; i++ )
-       {
-               Append( choices[i] ) ;
-       }
+    SetControlReference(m_macControl, (long) this);
+    SetControlVisibility(m_macControl, false, false);

 
 

-       LSetDrawingMode( true , m_macList ) ;
+    options = 0;
+    if ( style & wxLB_MULTIPLE )
+    {
+        options += lNoExtend ;
+    }
+    else if ( style & wxLB_EXTENDED )
+    {
+        options += lExtendDrag ;
+    }
+    else
+    {
+        options = lOnlyOne ;
+    }
+    SetListSelectionFlags(m_macList, options);
+
+#else
+    long       result ;
+
+    m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , false ,
+                                 kwxMacListWithVerticalScrollbar , 0 , 0, 
+                                 kControlListBoxProc , (long) this ) ;
+    UMAGetControlData( m_macControl , kControlNoPart , kControlListBoxListHandleTag ,
+                      sizeof( ListHandle ) , (char*) &m_macList  , &result ) ;
+
+    HLock( (Handle) m_macList ) ;
+    NewExtLDEFInfo( m_macList , MacDrawStringCell , (long) this ) ;
+    
+    (**m_macList).selFlags = 0 ;
+    if ( style & wxLB_MULTIPLE )
+    {
+       (**m_macList).selFlags += lNoExtend ;
+    }
+    else if ( style & wxLB_EXTENDED )
+    {
+       (**m_macList).selFlags += lExtendDrag ;
+    }
+    else
+    {
+       (**m_macList).selFlags = lOnlyOne ;
+    }
+    
+    Point pt = (**m_macList).cellSize ;
+    pt.v = 14 ;
+    LCellSize( pt , m_macList ) ;
+    
+    LAddColumn( 1 , 0 , m_macList ) ;
+    
+    ControlFontStyleRec                controlstyle ;
+    controlstyle.flags = kControlUseFontMask + kControlUseSizeMask ;
+    //controlstyle.font = kControlFontSmallSystemFont ;
+    controlstyle.font = kFontIDMonaco ;
+    controlstyle.size = 9 ;
+    //::UMASetControlFontStyle( m_macControl , &controlstyle ) ;
+#endif
+    
+    MacPostControlCreate() ;
+    
+    for ( int i = 0 ; i < n ; i++ )
+    {
+       Append( choices[i] ) ;
+    }
+    
+    LSetDrawingMode( true , m_macList ) ;

 
 

-  return TRUE;
+    return TRUE;

 }
 
 wxListBox::~wxListBox()
 {
        Free() ;
 }
 
 wxListBox::~wxListBox()
 {
        Free() ;

-       DisposeExtLDEFInfo( m_macList ) ;
+       if ( m_macList )
+       {
+#if !TARGET_CARBON
+           DisposeExtLDEFInfo( m_macList ) ;
+#endif
+           m_macList = NULL ;
+       }

 }
 
 void wxListBox::Free()
 }
 
 void wxListBox::Free()


@@ -151,7 +203,8 @@ void wxListBox::Delete(int N)
     }
 #endif // wxUSE_OWNER_DRAWN/!wxUSE_OWNER_DRAWN
        m_stringArray.Remove( N ) ;
     }
 #endif // wxUSE_OWNER_DRAWN/!wxUSE_OWNER_DRAWN
        m_stringArray.Remove( N ) ;

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

        
        MacDelete( N ) ;
 }
        
        MacDelete( N ) ;
 }


@@ -162,10 +215,14 @@ int wxListBox::DoAppend(const wxString& item)
        if( wxApp::s_macDefaultEncodingIsPC )
        {
                m_stringArray.Add( wxMacMakeMacStringFromPC( item ) ) ;
        if( wxApp::s_macDefaultEncodingIsPC )
        {
                m_stringArray.Add( wxMacMakeMacStringFromPC( item ) ) ;

+               m_dataArray.Add( NULL );

        }
        }

-       else
+       else {

                m_stringArray.Add( item ) ;
                m_stringArray.Add( item ) ;

+               m_dataArray.Add( NULL );
+       }

        m_noItems ++;
        m_noItems ++;

+       DoSetItemClientData( index , NULL ) ;

        MacAppend( item ) ;
 
        return index ;
        MacAppend( item ) ;
 
        return index ;


@@ -185,7 +242,7 @@ void wxListBox::DoSetItems(const wxArrayString& choices, void** clientData)
             wxASSERT_MSG(clientData[i] == NULL,
                          wxT("Can't use client data with owner-drawn listboxes"));
 #else // !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[0] ) ;
+               Append( choices[i] , clientData[i] ) ;

  #endif
        }
        else
  #endif
        }
        else


@@ -231,19 +288,59 @@ int wxListBox::FindString(const wxString& st) const
        {
                wxString search = s.Left( s.Length() - 1 ) ;
                int len = search.Length() ;
        {
                wxString search = s.Left( s.Length() - 1 ) ;
                int len = search.Length() ;

-    for ( int i = 0 ; i < m_noItems ; ++ i )
-    {
-       if ( equalstring( m_stringArray[i].Left( len ) , search , false , false ) )
-               return i ;
-    }
+               Str255 s1 , s2 ;
+
+#if TARGET_CARBON
+               c2pstrcpy( (StringPtr) s2 , search.c_str() ) ;
+#else
+               strcpy( (char *) s2 , search.c_str() ) ;
+               c2pstr( (char *) s2 ) ;
+#endif
+
+       for ( int i = 0 ; i < m_noItems ; ++ i )
+           {
+#if TARGET_CARBON
+               c2pstrcpy( (StringPtr) s1 , m_stringArray[i].Left( len ).c_str() ) ;
+#else
+               strcpy( (char *) s1 , m_stringArray[i].Left( len ).c_str() ) ;
+                       c2pstr( (char *) s1 ) ;
+#endif
+               if ( EqualString( s1 , s2 , false , false ) )
+                       return i ;
+           }
+           if ( s.Left(1) = "*" && s.Length() > 1 )
+           {
+               s.MakeLower() ;
+                   for ( int i = 0 ; i < m_noItems ; ++i )
+                       {
+                               if ( GetString(i).Lower().Matches(s) )
+                                       return i ;
+                       }
+               }       
+

        }
        else
        {
        }
        else
        {

-    for ( int i = 0 ; i < m_noItems ; ++ i )
-    {
-       if ( equalstring( m_stringArray[i] , s , false , false ) )
-               return i ;
-    }
+       Str255 s1 , s2 ;
+
+#if TARGET_CARBON
+               c2pstrcpy( (StringPtr) s2 , s.c_str() ) ;
+#else
+               strcpy( (char *) s2 , s.c_str() ) ;
+               c2pstr( (char *) s2 ) ;
+#endif
+
+           for ( int i = 0 ; i < m_noItems ; ++ i )
+           {
+#if TARGET_CARBON
+               c2pstrcpy( (StringPtr) s1 , m_stringArray[i].c_str() ) ;
+#else
+               strcpy( (char *) s1 , m_stringArray[i].c_str() ) ;
+                       c2pstr( (char *) s1 ) ;
+#endif
+               if ( EqualString( s1 , s2 , false , false ) )
+                       return i ;
+           }

    }
    return -1;
 }
    }
    return -1;
 }


@@ -275,7 +372,7 @@ bool wxListBox::IsSelected(int N) const
 void *wxListBox::DoGetItemClientData(int N) const
 {
     wxCHECK_MSG( N >= 0 && N < m_noItems, NULL,
 void *wxListBox::DoGetItemClientData(int N) const
 {
     wxCHECK_MSG( N >= 0 && N < m_noItems, NULL,

-                 "invalid index in wxListBox::GetClientData" );
+                 wxT("invalid index in wxListBox::GetClientData"));

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


@@ -298,7 +395,16 @@ void wxListBox::DoSetItemClientData(int N, void *Client_data)
         wxFAIL_MSG(wxT("Can't use client data with owner-drawn listboxes"));
     }
 #endif // wxUSE_OWNER_DRAWN
         wxFAIL_MSG(wxT("Can't use client data with owner-drawn listboxes"));
     }
 #endif // wxUSE_OWNER_DRAWN

-    m_dataArray[N] = (char*) Client_data ;
+       wxASSERT_MSG( m_dataArray.GetCount() >= N , "invalid client_data array" ) ;
+       
+       if ( m_dataArray.GetCount() > N )
+       {
+       m_dataArray[N] = (char*) Client_data ;
+    }
+    else
+    {
+       m_dataArray.Add( (char*) Client_data ) ;
+    }

 }
 
 void wxListBox::DoSetItemClientObject(int n, wxClientData* clientData)
 }
 
 void wxListBox::DoSetItemClientObject(int n, wxClientData* clientData)


@@ -365,7 +471,14 @@ void wxListBox::DoInsertItems(const wxArrayString& items, int pos)
 
 void wxListBox::SetString(int N, const wxString& s)
 {
 
 void wxListBox::SetString(int N, const wxString& s)
 {

-       m_stringArray[N] = s ;
+       wxString str ;
+       if( wxApp::s_macDefaultEncodingIsPC )
+       {
+               str = wxMacMakeMacStringFromPC( s )  ;
+       }
+       else
+               str = s ;
+       m_stringArray[N] = str ;

        MacSet( N , s ) ;
 }
 
        MacSet( N , s ) ;
 }
 


@@ -385,6 +498,16 @@ void wxListBox::SetupColours()
     SetForegroundColour(GetParent()->GetForegroundColour());
 }
 
     SetForegroundColour(GetParent()->GetForegroundColour());
 }
 

+void wxListBox::Refresh(bool eraseBack, const wxRect *rect)
+{
+    // Set up port
+    WindowRef rootwindow = GetMacRootWindow() ;
+    wxWindow* wxrootwindow = wxFindWinFromMacWindow( rootwindow ) ;
+    wxMacDrawingHelper focus( wxrootwindow );
+
+    UMADrawControl(m_macControl);
+}
+

 #if wxUSE_OWNER_DRAWN
 
 class wxListBoxItem : public wxOwnerDrawn
 #if wxUSE_OWNER_DRAWN
 
 class wxListBoxItem : public wxOwnerDrawn


@@ -427,39 +550,38 @@ void MacDrawStringCell(Rect *cellRect, Cell lCell, ListHandle theList, long refC
 
 void wxListBox::MacDelete( int N )
 {
 
 void wxListBox::MacDelete( int N )
 {

-       ListHandle list ;
-       long    result ;
-       Cell cell = { 0 , 0 } ;
-       UMAGetControlData( m_macControl , kControlNoPart , kControlListBoxListHandleTag , sizeof( ListHandle ) , (char*) &list  , &result ) ;
-       LDelRow( 1 , N , list ) ;
+    LDelRow( 1 , N , m_macList) ;
+    Refresh();

 }
 
 void wxListBox::MacInsert( int n , const char * text) 
 {
 }
 
 void wxListBox::MacInsert( int n , const char * text) 
 {

-       Cell    cell ;
-
-       cell.h = 0 ;
-       cell.v = n ;
-
-       LAddRow( 1 , cell.v , m_macList ) ;
+    Cell cell = { 0 , 0 } ;
+    cell.v = n ;
+    LAddRow( 1 , cell.v , m_macList ) ;
+    LSetCell(text, strlen(text), cell, m_macList);
+    Refresh();

 }
 
 void wxListBox::MacAppend( const char * text) 
 {
 }
 
 void wxListBox::MacAppend( const char * text) 
 {

-       Cell cell = { 0 , 0 } ;
-       cell.v = (**m_macList).dataBounds.bottom ;
-       LAddRow( 1 , cell.v , m_macList ) ;
+    Cell cell = { 0 , 0 } ;
+    cell.v = (**m_macList).dataBounds.bottom ;
+    LAddRow( 1 , cell.v , m_macList ) ;
+    LSetCell(text, strlen(text), cell, m_macList);
+    Refresh();

 }
 
 void wxListBox::MacClear() 
 {
 }
 
 void wxListBox::MacClear() 
 {

-       LDelRow( (**m_macList).dataBounds.bottom , 0 , m_macList ) ;
+    LDelRow( (**m_macList).dataBounds.bottom , 0 , m_macList ) ;
+    Refresh();

 }
 
 void wxListBox::MacSetSelection( int n , bool select )
 {
        Cell cell = { 0 , 0 } ;
 }
 
 void wxListBox::MacSetSelection( int n , bool select )
 {
        Cell cell = { 0 , 0 } ;

-       if ( LGetSelect( TRUE , &cell , m_macList ) )
+       if ( LGetSelect( true , &cell , m_macList ) )

        {
                LSetSelect( false , cell , m_macList ) ;
        }
        {
                LSetSelect( false , cell , m_macList ) ;
        }


@@ -467,6 +589,7 @@ void wxListBox::MacSetSelection( int n , bool select )
        cell.v = n ;
        LSetSelect( select , cell , m_macList ) ;
        LAutoScroll( m_macList ) ;
        cell.v = n ;
        LSetSelect( select , cell , m_macList ) ;
        LAutoScroll( m_macList ) ;

+       Refresh();

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


@@ -478,7 +601,7 @@ bool wxListBox::MacIsSelected( int n ) const
 
 void wxListBox::MacDestroy()
 {
 
 void wxListBox::MacDestroy()
 {

-//     DisposeExtLDEFInfo( m_macList ) ;
+//    DisposeExtLDEFInfo( m_macList ) ;

 }
 
 int wxListBox::MacGetSelection() const
 }
 
 int wxListBox::MacGetSelection() const


@@ -514,7 +637,8 @@ void wxListBox::MacSet( int n , const char * text )
        // so we just have to redraw
        Cell cell = { 0 , 0 } ;
        cell.v = n ;
        // so we just have to redraw
        Cell cell = { 0 , 0 } ;
        cell.v = n ;

-       LDraw( cell , m_macList ) ;
+       LSetCell(text, strlen(text), cell, m_macList);
+       Refresh();

 }
 
 void wxListBox::MacScrollTo( int n )
 }
 
 void wxListBox::MacScrollTo( int n )


@@ -524,9 +648,15 @@ void wxListBox::MacScrollTo( int n )
 
 void wxListBox::OnSize( const wxSizeEvent &event)
 {
 
 void wxListBox::OnSize( const wxSizeEvent &event)
 {

-       Point pt = (**m_macList).cellSize ;
-       pt.h =  m_width - 15 /* scrollbar */ - m_macHorizontalBorder * 2 ;
-       LCellSize( pt , m_macList ) ;
+    Point pt;
+
+#if TARGET_CARBON
+    GetListCellSize(m_macList, &pt);
+#else
+    pt = (**m_macList).cellSize ;
+#endif
+    pt.h =  m_width - 15  ;
+    LCellSize( pt , m_macList ) ;

 }
 
 void wxListBox::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) 
 }
 
 void wxListBox::MacHandleControlClick( ControlHandle control , SInt16 controlpart )