don't use wxTheXXXList in wxXXX ctor/dtor, only objects explicitly created

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

diff --git a/src/mac/listbox.cpp b/src/mac/listbox.cpp
index b17715ec55978a54a7610c2253651ff8670901ed..cb6e1e96baf4ac9030990e60418360c03431069c 100644 (file)
--- a/src/mac/listbox.cpp
+++ b/src/mac/listbox.cpp
@@ -21,7 +21,7 @@
 
 #include "wx/utils.h"
 #ifndef __DARWIN__
 
 #include "wx/utils.h"
 #ifndef __DARWIN__

-  #include "extldef.h"
+//  #include "extldef.h"

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


@@ -32,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 ;


@@ -49,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,


@@ -65,12 +157,16 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
     
     MacPreControlCreate( parent , id ,  "" , pos , size ,style, validator , name , &bounds , title ) ;
 
     
     MacPreControlCreate( parent , id ,  "" , pos , size ,style, validator , name , &bounds , title ) ;
 

-#if TARGET_CARBON

     ListDefSpec listDef;
     ListDefSpec listDef;

-    OptionBits  options;
+    listDef.defType = kListDefUserProcType;
+    if ( macListDefUPP == NULL )
+    {
+      macListDefUPP = NewListDefUPP( wxMacListDefinition ); 
+    }
+               listDef.u.userProc = macListDefUPP ;
+#if TARGET_CARBON

     Size asize;
 
     Size asize;
 

-    listDef.defType = kListDefStandardTextType;

 
     CreateListBoxControl( parent->GetMacRootWindow(), &bounds, false, 0, 1, false, true,
                           14, 14, false, &listDef, &m_macControl );
 
     CreateListBoxControl( parent->GetMacRootWindow(), &bounds, false, 0, 1, false, true,
                           14, 14, false, &listDef, &m_macControl );


@@ -81,66 +177,51 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
     SetControlReference(m_macControl, (long) this);
     SetControlVisibility(m_macControl, false, false);
 
     SetControlReference(m_macControl, (long) this);
     SetControlVisibility(m_macControl, false, false);
 

-    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 ;
 
 #else
     long       result ;
 

-    m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , false ,
+    m_macControl = ::NewControl( parent->GetMacRootWindow() , &bounds , title , false ,

                                  kwxMacListWithVerticalScrollbar , 0 , 0, 
                                  kControlListBoxProc , (long) this ) ;
                                  kwxMacListWithVerticalScrollbar , 0 , 0, 
                                  kControlListBoxProc , (long) this ) ;

-    UMAGetControlData( m_macControl , kControlNoPart , kControlListBoxListHandleTag ,
+    ::GetControlData( m_macControl , kControlNoPart , kControlListBoxListHandleTag ,

                       sizeof( ListHandle ) , (char*) &m_macList  , &result ) ;
 
     HLock( (Handle) m_macList ) ;
                       sizeof( ListHandle ) , (char*) &m_macList  , &result ) ;
 
     HLock( (Handle) m_macList ) ;

-    NewExtLDEFInfo( m_macList , MacDrawStringCell , (long) this ) ;
+    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 ) ;

     
     

-    (**m_macList).selFlags = 0 ;
+    LAddColumn( 1 , 0 , m_macList ) ;
+#endif
+    OptionBits  options = 0;

     if ( style & wxLB_MULTIPLE )
     {
     if ( style & wxLB_MULTIPLE )
     {

-       (**m_macList).selFlags += lNoExtend ;
+        options += lNoExtend ;

     }
     else if ( style & wxLB_EXTENDED )
     {
     }
     else if ( style & wxLB_EXTENDED )
     {

-       (**m_macList).selFlags += lExtendDrag ;
+        options += lExtendDrag ;

     }
     else
     {
     }
     else
     {

-       (**m_macList).selFlags = lOnlyOne ;
+        options = 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
+    SetListSelectionFlags(m_macList, options);

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

-       Append( choices[i] ) ;
+           Append( choices[i] ) ;

     }
     
     LSetDrawingMode( true , m_macList ) ;
     }
     
     LSetDrawingMode( true , m_macList ) ;


@@ -154,7 +235,8 @@ wxListBox::~wxListBox()
        if ( m_macList )
        {
 #if !TARGET_CARBON
        if ( m_macList )
        {
 #if !TARGET_CARBON

-           DisposeExtLDEFInfo( m_macList ) ;
+      DisposeHandle( (**m_macList).listDefProc ) ;
+      (**m_macList).listDefProc = NULL ;

 #endif
            m_macList = NULL ;
        }
 #endif
            m_macList = NULL ;
        }


@@ -183,6 +265,27 @@ void wxListBox::Free()
     }
 }
 
     }
 }
 

+void  wxListBox::DoSetSize(int x, int y,
+            int width, int height,
+            int sizeFlags )
+{
+       wxControl::DoSetSize( x , y , width , height , sizeFlags ) ;
+#if TARGET_CARBON
+       Rect bounds ;
+       GetControlBounds( m_macControl , &bounds ) ;
+       ControlRef control = GetListVerticalScrollBar( m_macList ) ;
+       if ( control )
+       {
+               Rect scrollbounds ;
+               GetControlBounds( control , &scrollbounds ) ;
+               if( scrollbounds.right != bounds.right + 1 )
+               {
+                       UMAMoveControl( control , bounds.right - (scrollbounds.right - scrollbounds.left) + 1 , 
+                               scrollbounds.top ) ;
+               }
+       }
+#endif
+}

 void wxListBox::DoSetFirstItem(int N)
 {
        MacScrollTo( N ) ;
 void wxListBox::DoSetFirstItem(int N)
 {
        MacScrollTo( N ) ;


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


@@ -366,7 +470,7 @@ 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
 }
 
 void *wxListBox::DoGetItemClientData(int N) const


@@ -416,23 +520,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


@@ -559,7 +646,7 @@ void wxListBox::MacInsert( int n , const char * text)
     Cell cell = { 0 , 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);
+//    LSetCell(text, strlen(text), cell, m_macList);

     Refresh();
 }
 
     Refresh();
 }
 


@@ -568,7 +655,7 @@ 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);
+ //   LSetCell(text, strlen(text), cell, m_macList);

     Refresh();
 }
 
     Refresh();
 }
 


@@ -581,9 +668,12 @@ void wxListBox::MacClear()
 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 ;
        }
        
        cell.v = n ;


@@ -637,7 +727,7 @@ 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 ;

-       LSetCell(text, strlen(text), cell, m_macList);
+//     LSetCell(text, strlen(text), cell, m_macList);

        Refresh();
 }
 
        Refresh();
 }
 


@@ -664,7 +754,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() ;


@@ -683,11 +773,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];