diff --git a/src/mac/carbon/corersrc.r b/src/mac/carbon/corersrc.r index 2193043cd6..80516fe823 100644 --- a/src/mac/carbon/corersrc.r +++ b/src/mac/carbon/corersrc.r @@ -22,6 +22,21 @@ resource 'ldes' ( 128 ) } } ; +resource 'ldes' ( 129 ) +{ + versionZero + { + 0 , + 0 , + 0 , + 0 , + hasVertScroll , + hasHorizScroll , + 0 , + noGrowSpace , + } +} ; + resource 'CURS' (9, "Hand") { $"0380 04C0 04C0 04C0 04C0 04C0 74F8 9CAE" $"4CAB 240B 2403 1003 0803 0806 0406 0406", @@ -46,3 +61,69 @@ resource 'CURS' (11, "Size NS") { {7, 7} }; +resource 'ICN#' (128) { + { /* array: 2 elements */ + /* [1] */ + $"0000 0000 0041 C000 00A2 F000 03A5 FC00" + $"064B FF00 1CD7 FFC0 F1FF FFF0 E000 FFFC" + $"80FF FFFF 80FF FFFF 803F FFFE 80FF FFFE" + $"803F FFFA C0FF FFF6 7FFF FFEE 5FFF FFDE" + $"FFFF FFBE CFFF FF7F F3FF FEFF E4FF FDFE" + $"E13F FBFC E04F F7F8 E013 EFF0 7804 DFE0" + $"1E01 3FC0 0780 3F80 01E0 3F00 0078 3E00" + $"001E 3C00 0007 B800 0001 F000 0000 60", + /* [2] */ + $"0000 0000 0041 C000 00E3 F000 03E7 FC00" + $"07CF FF00 1FDF FFC0 FFFF FFF0 FFFF FFFC" + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" + $"FFFF FFFF FFFF FFFF 7FFF FFFF 7FFF FFFF" + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFE" + $"FFFF FFFC FFFF FFF8 FFFF FFF0 7FFF FFE0" + $"1FFF FFC0 07FF FF80 01FF FF00 007F FE00" + $"001F FC00 0007 F800 0001 F000 0000 60" + } +}; + +resource 'ics#' (128) { + { /* array: 2 elements */ + /* [1] */ + $"09C0 15F0 EBFC 8EFF AFFE 97FE DFFE EFFA" + $"BFE7 8BE6 C5DC 30D8 1C30 0760 03C0", + /* [2] */ + $"09C0 1DF0 FFFC FFFF FFFF FFFF FFFF FFFF" + $"FFFF FFFE FFFC 3FF8 0FF0 03E0 02C0" + } +}; + +resource 'ics4' (128) { + $"0000 EC0D 6FC0 0000 00DE BDD6 666F C000" + $"DEBB EE65 6666 6FC0 E2CD BEBB 6666 666E" + $"EC2C A566 6666 6660 E1C2 A666 6666 66D0" + $"BDBD E666 6666 6DC0 FFF6 6666 6666 5CC0" + $"ECDF 6666 666D 0DFF FC0C DF66 6650 DFFC" + $"5DC0 0CDF 6D0D FFC0 0C75 C00C D0DF FC00" + $"000D 6DC0 0DFF C000 0000 CE65 CFFC 0000" + $"0000 00DD 6FC0" +}; + +resource 'ics8' (128) { + $"0000 00F5 81F7 017F EBF1 2BF5 0000 0000" + $"0000 F888 8256 7FD2 D2D2 ECF1 F800 0000" + $"F9FB 5E5E FD82 EFB0 ECD2 D2D2 ECF1 F7F5" + $"AD5D 3333 5E87 5E82 D3D2 D2D2 D2D2 EBFD" + $"820F 3333 ACD5 D2EB D2D2 D2D2 D2D2 D2F5" + $"8808 3333 5FEF D2D2 D2D2 D2D2 D2D2 8000" + $"FB5E 5D5D D5D2 D2D2 D2D2 D2D2 D280 F600" + $"FDFF D6EC D2D2 D2D2 D2D2 D2D2 802B 2BF5" + $"FEF7 81F4 EFEB D2D2 D2D2 D280 F6F9 FFFD" + $"FEF6 002B 57FE F0EB D2D2 80F6 56FF FFF7" + $"7EAA F600 00F7 57F3 EC80 2B56 FFFF F700" + $"0031 CD86 F600 00F7 FA2B 56FF FFF7 0000" + $"0000 F57A EB80 F600 0056 FFFF F700 0000" + $"0000 0000 2AAB EC80 2BFF FFF7 0000 0000" + $"0000 0000 0000 5BAB F0FD F700 0000 0000" + $"0000 0000 0000 0000 01" +}; + + + diff --git a/src/mac/carbon/listbox.cpp b/src/mac/carbon/listbox.cpp index 343420363c..120a417fbf 100644 --- a/src/mac/carbon/listbox.cpp +++ b/src/mac/carbon/listbox.cpp @@ -181,7 +181,9 @@ static pascal void wxMacListDefinition( short message, Boolean isSelected, Rect } extern "C" void MacDrawStringCell(Rect *cellRect, Cell lCell, ListHandle theList, long refCon) ; +// resources ldef ids const short kwxMacListWithVerticalScrollbar = 128 ; +const short kwxMacListWithVerticalAndHorizontalScrollbar = 129 ; // ============================================================================ // list box control implementation @@ -238,7 +240,7 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id, Size asize; - CreateListBoxControl( MAC_WXHWND(parent->MacGetRootWindow()), &bounds, false, 0, 1, false, true, + CreateListBoxControl( MAC_WXHWND(parent->MacGetRootWindow()), &bounds, false, 0, 1, (style & wxLB_HSCROLL), true, kwxMacListItemHeight, kwxMacListItemHeight, false, &listDef, (ControlRef *)&m_macControl ); GetControlData( (ControlHandle) m_macControl, kControlNoPart, kControlListBoxListHandleTag, @@ -252,8 +254,8 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id, long result ; wxStAppResource resload ; m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , - kwxMacListWithVerticalScrollbar , 0 , 0, - kControlListBoxProc , (long) this ) ; + (style & wxLB_HSCROLL) ? kwxMacListWithVerticalAndHorizontalScrollbar : kwxMacListWithVerticalScrollbar , + 0 , 0, kControlListBoxProc , (long) this ) ; ::GetControlData( (ControlHandle) m_macControl , kControlNoPart , kControlListBoxListHandleTag , sizeof( ListHandle ) , (char*) &m_macList , &result ) ; diff --git a/src/mac/corersrc.r b/src/mac/corersrc.r index 2193043cd6..80516fe823 100644 --- a/src/mac/corersrc.r +++ b/src/mac/corersrc.r @@ -22,6 +22,21 @@ resource 'ldes' ( 128 ) } } ; +resource 'ldes' ( 129 ) +{ + versionZero + { + 0 , + 0 , + 0 , + 0 , + hasVertScroll , + hasHorizScroll , + 0 , + noGrowSpace , + } +} ; + resource 'CURS' (9, "Hand") { $"0380 04C0 04C0 04C0 04C0 04C0 74F8 9CAE" $"4CAB 240B 2403 1003 0803 0806 0406 0406", @@ -46,3 +61,69 @@ resource 'CURS' (11, "Size NS") { {7, 7} }; +resource 'ICN#' (128) { + { /* array: 2 elements */ + /* [1] */ + $"0000 0000 0041 C000 00A2 F000 03A5 FC00" + $"064B FF00 1CD7 FFC0 F1FF FFF0 E000 FFFC" + $"80FF FFFF 80FF FFFF 803F FFFE 80FF FFFE" + $"803F FFFA C0FF FFF6 7FFF FFEE 5FFF FFDE" + $"FFFF FFBE CFFF FF7F F3FF FEFF E4FF FDFE" + $"E13F FBFC E04F F7F8 E013 EFF0 7804 DFE0" + $"1E01 3FC0 0780 3F80 01E0 3F00 0078 3E00" + $"001E 3C00 0007 B800 0001 F000 0000 60", + /* [2] */ + $"0000 0000 0041 C000 00E3 F000 03E7 FC00" + $"07CF FF00 1FDF FFC0 FFFF FFF0 FFFF FFFC" + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" + $"FFFF FFFF FFFF FFFF 7FFF FFFF 7FFF FFFF" + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFE" + $"FFFF FFFC FFFF FFF8 FFFF FFF0 7FFF FFE0" + $"1FFF FFC0 07FF FF80 01FF FF00 007F FE00" + $"001F FC00 0007 F800 0001 F000 0000 60" + } +}; + +resource 'ics#' (128) { + { /* array: 2 elements */ + /* [1] */ + $"09C0 15F0 EBFC 8EFF AFFE 97FE DFFE EFFA" + $"BFE7 8BE6 C5DC 30D8 1C30 0760 03C0", + /* [2] */ + $"09C0 1DF0 FFFC FFFF FFFF FFFF FFFF FFFF" + $"FFFF FFFE FFFC 3FF8 0FF0 03E0 02C0" + } +}; + +resource 'ics4' (128) { + $"0000 EC0D 6FC0 0000 00DE BDD6 666F C000" + $"DEBB EE65 6666 6FC0 E2CD BEBB 6666 666E" + $"EC2C A566 6666 6660 E1C2 A666 6666 66D0" + $"BDBD E666 6666 6DC0 FFF6 6666 6666 5CC0" + $"ECDF 6666 666D 0DFF FC0C DF66 6650 DFFC" + $"5DC0 0CDF 6D0D FFC0 0C75 C00C D0DF FC00" + $"000D 6DC0 0DFF C000 0000 CE65 CFFC 0000" + $"0000 00DD 6FC0" +}; + +resource 'ics8' (128) { + $"0000 00F5 81F7 017F EBF1 2BF5 0000 0000" + $"0000 F888 8256 7FD2 D2D2 ECF1 F800 0000" + $"F9FB 5E5E FD82 EFB0 ECD2 D2D2 ECF1 F7F5" + $"AD5D 3333 5E87 5E82 D3D2 D2D2 D2D2 EBFD" + $"820F 3333 ACD5 D2EB D2D2 D2D2 D2D2 D2F5" + $"8808 3333 5FEF D2D2 D2D2 D2D2 D2D2 8000" + $"FB5E 5D5D D5D2 D2D2 D2D2 D2D2 D280 F600" + $"FDFF D6EC D2D2 D2D2 D2D2 D2D2 802B 2BF5" + $"FEF7 81F4 EFEB D2D2 D2D2 D280 F6F9 FFFD" + $"FEF6 002B 57FE F0EB D2D2 80F6 56FF FFF7" + $"7EAA F600 00F7 57F3 EC80 2B56 FFFF F700" + $"0031 CD86 F600 00F7 FA2B 56FF FFF7 0000" + $"0000 F57A EB80 F600 0056 FFFF F700 0000" + $"0000 0000 2AAB EC80 2BFF FFF7 0000 0000" + $"0000 0000 0000 5BAB F0FD F700 0000 0000" + $"0000 0000 0000 0000 01" +}; + + + diff --git a/src/mac/listbox.cpp b/src/mac/listbox.cpp index 343420363c..120a417fbf 100644 --- a/src/mac/listbox.cpp +++ b/src/mac/listbox.cpp @@ -181,7 +181,9 @@ static pascal void wxMacListDefinition( short message, Boolean isSelected, Rect } extern "C" void MacDrawStringCell(Rect *cellRect, Cell lCell, ListHandle theList, long refCon) ; +// resources ldef ids const short kwxMacListWithVerticalScrollbar = 128 ; +const short kwxMacListWithVerticalAndHorizontalScrollbar = 129 ; // ============================================================================ // list box control implementation @@ -238,7 +240,7 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id, Size asize; - CreateListBoxControl( MAC_WXHWND(parent->MacGetRootWindow()), &bounds, false, 0, 1, false, true, + CreateListBoxControl( MAC_WXHWND(parent->MacGetRootWindow()), &bounds, false, 0, 1, (style & wxLB_HSCROLL), true, kwxMacListItemHeight, kwxMacListItemHeight, false, &listDef, (ControlRef *)&m_macControl ); GetControlData( (ControlHandle) m_macControl, kControlNoPart, kControlListBoxListHandleTag, @@ -252,8 +254,8 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id, long result ; wxStAppResource resload ; m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , - kwxMacListWithVerticalScrollbar , 0 , 0, - kControlListBoxProc , (long) this ) ; + (style & wxLB_HSCROLL) ? kwxMacListWithVerticalAndHorizontalScrollbar : kwxMacListWithVerticalScrollbar , + 0 , 0, kControlListBoxProc , (long) this ) ; ::GetControlData( (ControlHandle) m_macControl , kControlNoPart , kControlListBoxListHandleTag , sizeof( ListHandle ) , (char*) &m_macList , &result ) ;