fixed wxTaskBarIcon compilation

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

diff --git a/src/mac/carbon/listbox.cpp b/src/mac/carbon/listbox.cpp
index 05cc0e249a6927baa3f82ebd2461c8aa253ea602..7dfe8b1f327821a1214d79bc17af0a2011bbbd24 100644 (file)
--- a/src/mac/carbon/listbox.cpp
+++ b/src/mac/carbon/listbox.cpp
@@ -20,10 +20,8 @@
 #include "wx/log.h"
 
 #include "wx/utils.h"
 #include "wx/log.h"
 
 #include "wx/utils.h"

-#ifdef __UNIX__
-  #include "ldef/extldef.h"
-#else
-  #include "extldef.h"
+#ifndef __DARWIN__
+//  #include "extldef.h"

 #endif
 
 #if !USE_SHARED_LIBRARY
 #endif
 
 #if !USE_SHARED_LIBRARY


@@ -34,7 +32,97 @@ BEGIN_EVENT_TABLE(wxListBox, wxControl)
 END_EVENT_TABLE()
 #endif
 
 END_EVENT_TABLE()
 #endif
 

-#include <wx/mac/uma.h>
+#include "wx/mac/uma.h"
+
+
+typedef struct {
+ unsigned short instruction;
+ void (*function)();
+} ldefRec, *ldefPtr, **ldefHandle;
+
+extern "C"
+{
+static pascal void wxMacListDefinition( short message, Boolean isSelected, Rect *drawRect,
+                                                                        Cell cell, short dataOffset, short dataLength,
+                                                                        ListHandle listHandle ) ;
+}
+
+static pascal void wxMacListDefinition( short message, Boolean isSelected, Rect *drawRect,
+                                                                        Cell cell, short dataOffset, short dataLength,
+                                                                        ListHandle listHandle )
+{
+       FontInfo fontInfo;
+       GrafPtr savePort;
+       GrafPtr grafPtr;
+       RgnHandle savedClipRegion;
+       SInt32 savedPenMode;
+       wxListBox*                      list;
+  GetPort(&savePort);
+  SetPort((**listHandle).port);
+  grafPtr = (**listHandle).port ;
+       // typecast our refCon
+       list = (wxListBox*) GetControlReference( (ControlHandle) GetListRefCon(listHandle) );
+       
+       //      Calculate the cell rect.
+       
+       switch( message ) {
+               case lInitMsg:
+                       break;
+
+               case lCloseMsg:
+                       break;
+
+               case lDrawMsg:
+               {
+                   const wxString text = list->m_stringArray[cell.v] ;
+
+                       //      Save the current clip region, and set the clip region to the area we are about
+                       //      to draw.
+                       
+                       savedClipRegion = NewRgn();
+                       GetClip( savedClipRegion );
+                       ClipRect( drawRect );
+                       EraseRect( drawRect );
+                                               
+               
+       MoveTo(drawRect->left + 4 , drawRect->top + 10 );
+       ::TextFont( kFontIDMonaco ) ;
+       ::TextSize( 9  );
+       ::TextFace( 0 ) ;
+ 
+       DrawText(text, 0 , text.Length());
+                       //      If the cell is hilited, do the hilite now. Paint the cell contents with the
+                       //      appropriate QuickDraw transform mode.
+                       
+                       if( isSelected ) {
+                               savedPenMode = GetPortPenMode( grafPtr );
+                               SetPortPenMode( grafPtr, hilitetransfermode );
+                               PaintRect( drawRect );
+                               SetPortPenMode( grafPtr, savedPenMode );
+                       }
+                       
+                       //      Restore the saved clip region.
+                       
+                       SetClip( savedClipRegion );
+                       DisposeRgn( savedClipRegion );
+                       }
+                       break;
+               case lHiliteMsg:
+                       
+                       //      Hilite or unhilite the cell. Paint the cell contents with the
+                       //      appropriate QuickDraw transform mode.
+                       
+                       GetPort( &grafPtr );
+                       savedPenMode = GetPortPenMode( grafPtr );
+                       SetPortPenMode( grafPtr, hilitetransfermode );
+                       PaintRect( drawRect );
+                       SetPortPenMode( grafPtr, savedPenMode );
+                       break;
+               default :
+                 break ;
+       }
+       SetPort(savePort);      
+}

 
 extern "C" void MacDrawStringCell(Rect *cellRect, Cell lCell, ListHandle theList, long refCon) ;
 const short kwxMacListWithVerticalScrollbar = 128 ;
 
 extern "C" void MacDrawStringCell(Rect *cellRect, Cell lCell, ListHandle theList, long refCon) ;
 const short kwxMacListWithVerticalScrollbar = 128 ;


@@ -51,6 +139,8 @@ wxListBox::wxListBox()
   m_macList = NULL ;
 }
 
   m_macList = NULL ;
 }
 

+static ListDefUPP macListDefUPP = NULL ;
+

 bool wxListBox::Create(wxWindow *parent, wxWindowID id,
                        const wxPoint& pos,
                        const wxSize& size,
 bool wxListBox::Create(wxWindow *parent, wxWindowID id,
                        const wxPoint& pos,
                        const wxSize& size,


@@ -59,58 +149,84 @@ 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;
-
-       Rect bounds ;
-       Str255 title ;
-       
-       MacPreControlCreate( parent , id ,  "" , pos , size ,style, validator , name , &bounds , title ) ;
-
-       m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , false , kwxMacListWithVerticalScrollbar , 0 , 0, 
-               kControlListBoxProc , (long) this ) ;
-       
-       long    result ;
-       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 ) ;
+    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 ) ;
+
+    ListDefSpec listDef;
+    listDef.defType = kListDefUserProcType;
+    if ( macListDefUPP == NULL )
+    {
+      macListDefUPP = NewListDefUPP( wxMacListDefinition ); 
+    }
+               listDef.u.userProc = macListDefUPP ;
+#if TARGET_CARBON
+    Size asize;

 
 

-       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 ) ;
+#else
+    long       result ;
+
+    m_macControl = ::NewControl( parent->GetMacRootWindow() , &bounds , title , false ,
+                                 kwxMacListWithVerticalScrollbar , 0 , 0, 
+                                 kControlListBoxProc , (long) this ) ;
+    ::GetControlData( m_macControl , kControlNoPart , kControlListBoxListHandleTag ,
+                      sizeof( ListHandle ) , (char*) &m_macList  , &result ) ;
+
+    HLock( (Handle) m_macList ) ;
+    ldefHandle ldef ;
+    ldef = (ldefHandle) NewHandle( sizeof(ldefRec) ) ;
+    if (  (**m_macList).listDefProc != NULL )
+    {
+      (**ldef).instruction = 0x4EF9;  /* JMP instruction */
+      (**ldef).function = (void(*)()) listDef.u.userProc;
+      (**m_macList).listDefProc = (Handle) ldef ;
+    }
+        
+    Point pt = (**m_macList).cellSize ;
+    pt.v = 14 ;
+    LCellSize( pt , m_macList ) ;
+    
+    LAddColumn( 1 , 0 , m_macList ) ;
+#endif
+    OptionBits  options = 0;
+    if ( style & wxLB_MULTIPLE )
+    {
+        options += lNoExtend ;
+    }
+    else if ( style & wxLB_EXTENDED )
+    {
+        options += lExtendDrag ;
+    }
+    else
+    {
+        options = lOnlyOne ;
+    }
+    SetListSelectionFlags(m_macList, options);
+    
+    MacPostControlCreate() ;
+    
+    for ( int i = 0 ; i < n ; i++ )
+    {
+           Append( choices[i] ) ;
+    }
+    
+    LSetDrawingMode( true , m_macList ) ;

 
 

-  return TRUE;
+    return TRUE;

 }
 
 wxListBox::~wxListBox()
 }
 
 wxListBox::~wxListBox()


@@ -118,8 +234,11 @@ wxListBox::~wxListBox()
        Free() ;
        if ( m_macList )
        {
        Free() ;
        if ( m_macList )
        {

-               DisposeExtLDEFInfo( m_macList ) ;
-               m_macList = NULL ;
+#if !TARGET_CARBON
+      DisposeHandle( (**m_macList).listDefProc ) ;
+      (**m_macList).listDefProc = NULL ;
+#endif
+           m_macList = NULL ;

        }
 }
 
        }
 }
 


@@ -158,7 +277,7 @@ void wxListBox::Delete(int N)
 
 #if wxUSE_OWNER_DRAWN
     delete m_aItems[N];
 
 #if wxUSE_OWNER_DRAWN
     delete m_aItems[N];

-    m_aItems.Remove(N);
+    m_aItems.RemoveAt(N);

 #else // !wxUSE_OWNER_DRAWN
     if ( HasClientObjectData() )
     {
 #else // !wxUSE_OWNER_DRAWN
     if ( HasClientObjectData() )
     {


@@ -166,7 +285,7 @@ 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_dataArray.Remove( N ) ;
+       m_dataArray.RemoveAt( N ) ;

        m_noItems --;
        
        MacDelete( N ) ;
        m_noItems --;
        
        MacDelete( N ) ;


@@ -271,7 +390,7 @@ int wxListBox::FindString(const wxString& st) const
                if ( EqualString( s1 , s2 , false , false ) )
                        return i ;
            }
                if ( EqualString( s1 , s2 , false , false ) )
                        return i ;
            }

-           if ( s.Left(1) = "*" && s.Length() > 1 )
+           if ( s.Left(1) == "*" && s.Length() > 1 )

            {
                s.MakeLower() ;
                    for ( int i = 0 ; i < m_noItems ; ++i )
            {
                s.MakeLower() ;
                    for ( int i = 0 ; i < m_noItems ; ++i )


@@ -321,7 +440,8 @@ void wxListBox::SetSelection(int N, bool select)
 {
     wxCHECK_RET( N >= 0 && N < m_noItems,
                  "invalid index in wxListBox::SetSelection" );
 {
     wxCHECK_RET( N >= 0 && N < m_noItems,
                  "invalid index in wxListBox::SetSelection" );

-       MacSetSelection( N , select ) ;
+         MacSetSelection( N , select ) ;
+         GetSelections( m_selectionPreImage ) ;

 }
 
 bool wxListBox::IsSelected(int N) const
 }
 
 bool wxListBox::IsSelected(int N) const


@@ -329,13 +449,13 @@ bool wxListBox::IsSelected(int N) const
     wxCHECK_MSG( N >= 0 && N < m_noItems, FALSE,
                  "invalid index in wxListBox::Selected" );
 
     wxCHECK_MSG( N >= 0 && N < m_noItems, FALSE,
                  "invalid index in wxListBox::Selected" );
 

-       return MacIsSelected( N ) ;
+         return MacIsSelected( N ) ;

 }
 
 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];
 }


@@ -379,23 +499,6 @@ void wxListBox::DoSetItemClientObject(int n, wxClientData* clientData)
 int wxListBox::GetSelections(wxArrayInt& aSelections) const
 {
        return MacGetSelections( aSelections ) ;
 int wxListBox::GetSelections(wxArrayInt& aSelections) const
 {
        return MacGetSelections( aSelections ) ;

-
-/* TODO
-    if ((m_windowStyle & wxLB_MULTIMacE) || (m_windowStyle & wxLB_EXTENDED))
-    {
-        int no_sel = ??
-        for ( int n = 0; n < no_sel; n++ )
-            aSelections.Add(??);
-
-        return no_sel;
-    }
-    else  // single-selection listbox
-    {
-        aSelections.Add(??);
-
-        return 1;
-    }
-*/

 }
 
 // Get single selection, for single choice list items
 }
 
 // Get single selection, for single choice list items


@@ -461,6 +564,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


@@ -503,45 +616,49 @@ void MacDrawStringCell(Rect *cellRect, Cell lCell, ListHandle theList, long refC
 
 void wxListBox::MacDelete( int N )
 {
 
 void wxListBox::MacDelete( int N )
 {

-       ListHandle list ;
-       long    result ;
-       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 ( ! (m_windowStyle & wxLB_MULTIPLE) )

        {
        {

-               LSetSelect( false , cell , m_macList ) ;
+       if ( LGetSelect( true , &cell , m_macList ) )
+       {
+               LSetSelect( false , cell , m_macList ) ;
+       }

        }
        
        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


@@ -553,7 +670,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


@@ -589,7 +706,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 )


@@ -599,9 +717,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  ;
-       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 ) 


@@ -609,7 +733,7 @@ void wxListBox::MacHandleControlClick( ControlHandle control , SInt16 controlpar
        Boolean wasDoubleClick = false ;
        long    result ;
 
        Boolean wasDoubleClick = false ;
        long    result ;
 

-       UMAGetControlData( m_macControl , kControlNoPart , kControlListBoxDoubleClickTag , sizeof( wasDoubleClick ) , (char*) &wasDoubleClick  , &result ) ;
+       ::GetControlData( m_macControl , kControlNoPart , kControlListBoxDoubleClickTag , sizeof( wasDoubleClick ) , (char*) &wasDoubleClick  , &result ) ;

        if ( !wasDoubleClick )
        {
                MacDoClick() ;
        if ( !wasDoubleClick )
        {
                MacDoClick() ;


@@ -628,11 +752,27 @@ void wxListBox::MacSetRedraw( bool doDraw )
 
 void wxListBox::MacDoClick()
 {
 
 void wxListBox::MacDoClick()
 {

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

        wxArrayInt aSelections;
        int n, count = GetSelections(aSelections);
        wxArrayInt aSelections;
        int n, count = GetSelections(aSelections);

+       
+       if ( count == m_selectionPreImage.GetCount() )
+       {
+         bool hasChanged = false ;
+         for ( int i = 0 ; i < count ; ++i )
+         {
+           if ( aSelections[i] != m_selectionPreImage[i] )
+           {
+             hasChanged = true ;
+             break ;
+           }
+         }
+         if ( !hasChanged )
+           return ;
+       }
+       
+       wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, m_windowId);
+  event.SetEventObject( this );
+

        if ( count > 0 )
        {
            n = aSelections[0];
        if ( count > 0 )
        {
            n = aSelections[0];