diff options
| author | Po Lu | 2025-02-10 12:04:27 +0800 |
|---|---|---|
| committer | Po Lu | 2025-02-10 12:04:27 +0800 |
| commit | 6e8bb757841d76e2df9757404dfafc5cb7777cb8 (patch) | |
| tree | fbd6442d28019b62de9e522b618ce5054266ff7e /src | |
| parent | ceef9025944fd3d51122f913ed9a74a259db55f7 (diff) | |
| download | emacs-6e8bb757841d76e2df9757404dfafc5cb7777cb8.tar.gz emacs-6e8bb757841d76e2df9757404dfafc5cb7777cb8.zip | |
Fix compilation on Haiku Nightly hrev58622
* configure.ac (BOBJECTLIST_OWNERSHIP_IS_TEMPLATE_PARAMETER):
Define if BObjectList ownership over its contents is specified
as a template parameter.
* src/haiku_support.cc (class EmacsFontSelectionDialog)
[BOBJECTLIST_OWNERSHIP_IS_TEMPLATE_PARAMETER]: Adjust
accordingly.
Diffstat (limited to 'src')
| -rw-r--r-- | src/haiku_support.cc | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/haiku_support.cc b/src/haiku_support.cc index d83b5c145d6..bfa2cb51456 100644 --- a/src/haiku_support.cc +++ b/src/haiku_support.cc | |||
| @@ -2862,8 +2862,13 @@ class EmacsFontSelectionDialog : public BWindow | |||
| 2862 | BScrollView font_family_scroller; | 2862 | BScrollView font_family_scroller; |
| 2863 | BScrollView font_style_scroller; | 2863 | BScrollView font_style_scroller; |
| 2864 | TripleLayoutView style_view; | 2864 | TripleLayoutView style_view; |
| 2865 | #ifdef BOBJECTLIST_OWNERSHIP_IS_TEMPLATE_PARAMETER | ||
| 2866 | BObjectList<BStringItem, true> all_families; | ||
| 2867 | BObjectList<BStringItem, true> all_styles; | ||
| 2868 | #else /* !BOBJECTLIST_OWNERSHIP_IS_TEMPLATE_PARAMETER */ | ||
| 2865 | BObjectList<BStringItem> all_families; | 2869 | BObjectList<BStringItem> all_families; |
| 2866 | BObjectList<BStringItem> all_styles; | 2870 | BObjectList<BStringItem> all_styles; |
| 2871 | #endif /* !BOBJECTLIST_OWNERSHIP_IS_TEMPLATE_PARAMETER */ | ||
| 2867 | BButton cancel_button, ok_button; | 2872 | BButton cancel_button, ok_button; |
| 2868 | BTextControl size_entry; | 2873 | BTextControl size_entry; |
| 2869 | port_id comm_port; | 2874 | port_id comm_port; |
| @@ -3126,8 +3131,13 @@ public: | |||
| 3126 | B_SUPPORTS_LAYOUT, false, true), | 3131 | B_SUPPORTS_LAYOUT, false, true), |
| 3127 | style_view (&font_style_scroller, &antialias_checkbox, | 3132 | style_view (&font_style_scroller, &antialias_checkbox, |
| 3128 | &preview_checkbox), | 3133 | &preview_checkbox), |
| 3134 | #ifdef BOBJECTLIST_OWNERSHIP_IS_TEMPLATE_PARAMETER | ||
| 3135 | all_families (20), | ||
| 3136 | all_styles (20), | ||
| 3137 | #else /* !BOBJECTLIST_OWNERSHIP_IS_TEMPLATE_PARAMETER */ | ||
| 3129 | all_families (20, true), | 3138 | all_families (20, true), |
| 3130 | all_styles (20, true), | 3139 | all_styles (20, true), |
| 3140 | #endif /* !BOBJECTLIST_OWNERSHIP_IS_TEMPLATE_PARAMETER */ | ||
| 3131 | cancel_button ("Cancel", "Cancel", | 3141 | cancel_button ("Cancel", "Cancel", |
| 3132 | new BMessage (B_CANCEL)), | 3142 | new BMessage (B_CANCEL)), |
| 3133 | ok_button ("OK", "OK", new BMessage (B_OK)), | 3143 | ok_button ("OK", "OK", new BMessage (B_OK)), |