#include "wx/utils.h"
#ifndef __DARWIN__
- #include "extldef.h"
+// #include "extldef.h"
#endif
#if !USE_SHARED_LIBRARY
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 ;
m_macList = NULL ;
}
+static ListDefUPP macListDefUPP = NULL ;
+
bool wxListBox::Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos,
const wxSize& size,
MacPreControlCreate( parent , id , "" , pos , size ,style, validator , name , &bounds , title ) ;
-#if TARGET_CARBON
ListDefSpec listDef;
- OptionBits options;
+ listDef.defType = kListDefUserProcType;
+ if ( macListDefUPP == NULL )
+ {
+ macListDefUPP = NewListDefUPP( wxMacListDefinition );
+ }
+ listDef.u.userProc = macListDefUPP ;
+#if TARGET_CARBON
Size asize;
- listDef.defType = kListDefStandardTextType;
CreateListBoxControl( parent->GetMacRootWindow(), &bounds, false, 0, 1, false, true,
14, 14, false, &listDef, &m_macControl );
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 ;
- m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , false ,
+ m_macControl = ::NewControl( parent->GetMacRootWindow() , &bounds , title , false ,
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 ) ;
- 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 )
{
- (**m_macList).selFlags += lNoExtend ;
+ options += lNoExtend ;
}
else if ( style & wxLB_EXTENDED )
{
- (**m_macList).selFlags += lExtendDrag ;
+ options += lExtendDrag ;
}
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++ )
{
- Append( choices[i] ) ;
+ Append( choices[i] ) ;
}
LSetDrawingMode( true , m_macList ) ;
if ( m_macList )
{
#if !TARGET_CARBON
- DisposeExtLDEFInfo( m_macList ) ;
+ DisposeHandle( (**m_macList).listDefProc ) ;
+ (**m_macList).listDefProc = NULL ;
#endif
m_macList = NULL ;
}
#if wxUSE_OWNER_DRAWN
delete m_aItems[N];
- m_aItems.Remove(N);
+ m_aItems.RemoveAt(N);
#else // !wxUSE_OWNER_DRAWN
if ( HasClientObjectData() )
{
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();
}
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();
}
// 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();
}
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() ;
projects / wxWidgets.git / blobdiff