diff --git a/aegisub/src/browse_button.cpp b/aegisub/src/browse_button.cpp index fa900d18e..37448543c 100644 --- a/aegisub/src/browse_button.cpp +++ b/aegisub/src/browse_button.cpp @@ -84,14 +84,12 @@ void BrowseButton::OnPressed(wxCommandEvent &event) { // Folder if (type == BROWSE_FOLDER) { // For some reason I can't make this work on Mac... -jfs -#ifndef __WXMAC__ wxString def = StandardPaths::DecodePathMaybeRelative(ctrl[0]->GetValue(), _T("?user/")); wxDirDialog dlg(0, _("Please choose the folder:"), def); if (dlg.ShowModal() == wxID_OK) { wxString dir = StandardPaths::EncodePath(dlg.GetPath()); if (dir != _T("")) ctrl[0]->SetValue(dir); } -#endif } // File diff --git a/aegisub/src/dialog_options.cpp b/aegisub/src/dialog_options.cpp index a334df92c..827706ebc 100644 --- a/aegisub/src/dialog_options.cpp +++ b/aegisub/src/dialog_options.cpp @@ -40,7 +40,7 @@ #include "config.h" #include "dialog_options.h" -#if wxUSE_TREEBOOK && !__WXMAC__ +#if wxUSE_TREEBOOK #include #else diff --git a/aegisub/src/dialog_options.h b/aegisub/src/dialog_options.h index a9ac69a7b..ae673aaa8 100644 --- a/aegisub/src/dialog_options.h +++ b/aegisub/src/dialog_options.h @@ -53,7 +53,7 @@ // Prototypes class FrameMain; class DialogInputHotkey; -#if wxUSE_TREEBOOK && !__WXMAC__ +#if wxUSE_TREEBOOK class wxTreebook; #else #include diff --git a/aegisub/src/video_display.cpp b/aegisub/src/video_display.cpp index 81dc906c9..70022ec71 100644 --- a/aegisub/src/video_display.cpp +++ b/aegisub/src/video_display.cpp @@ -133,11 +133,7 @@ int attribList[] = { WX_GL_RGBA , WX_GL_DOUBLEBUFFER, WX_GL_STENCIL_SIZE, 8, 0 } /// @param name /// VideoDisplay::VideoDisplay(wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name) -#ifdef __WXMAC__ -: wxGLCanvas (parent, id, pos, size, style, name, attribList) -#else : wxGLCanvas (parent, id, attribList, pos, size, style, name) -#endif { // Set options box = NULL;