From 345ff629d7e1e1705848e4359ebb60ae42b2ffe0 Mon Sep 17 00:00:00 2001 From: Niels Martin Hansen Date: Sun, 23 Sep 2007 23:22:15 +0000 Subject: [PATCH] Use wxChoicebook instead of wxTreebook on wxMac, to avoid some mislayout and be a bit more in line with Apple's HIG. Originally committed to SVN as r1583. --- aegisub/dialog_options.cpp | 4 ++-- aegisub/dialog_options.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/aegisub/dialog_options.cpp b/aegisub/dialog_options.cpp index 14d6178a8..c735d33f7 100644 --- a/aegisub/dialog_options.cpp +++ b/aegisub/dialog_options.cpp @@ -37,10 +37,10 @@ /////////// // Headers #include "dialog_options.h" -#ifdef wxUSE_TREEBOOK +#if wxUSE_TREEBOOK && !__WXMAC__ #include #else -#define AddSubPage(a,b,c) AddPage(a,b,c) +#define AddSubPage(page,text,select) AddPage(page,wxString::Format(_T("\t%s"),text),select) #endif #include "options.h" #include diff --git a/aegisub/dialog_options.h b/aegisub/dialog_options.h index 3b0932d98..3039be522 100644 --- a/aegisub/dialog_options.h +++ b/aegisub/dialog_options.h @@ -52,7 +52,7 @@ // Prototypes class FrameMain; class DialogInputHotkey; -#ifdef wxUSE_TREEBOOK +#if wxUSE_TREEBOOK && !__WXMAC__ class wxTreebook; #else #include