mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Remove a bunch of __WXMAC__ entries that are no longer required.

Browse source 
* Options uses a TreeBook like every other platform
 * Browse button now works in osx
 * wxGLCanvas is now the same as windows/unix

Originally committed to SVN as r3484.
This commit is contained in:
Amar Takhar 2009-09-05 01:16:23 +00:00
parent 878f451d72
commit 2d96c5bf4b
4 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
aegisub/src/browse_button.cpp
View file

@ -84,14 +84,12 @@ void BrowseButton::OnPressed(wxCommandEvent &event) {
// Folder // Folder
if (type == BROWSE_FOLDER) { if (type == BROWSE_FOLDER) {
// For some reason I can't make this work on Mac... -jfs // For some reason I can't make this work on Mac... -jfs
#ifndef __WXMAC__
wxString def = StandardPaths::DecodePathMaybeRelative(ctrl[0]->GetValue(), _T("?user/")); wxString def = StandardPaths::DecodePathMaybeRelative(ctrl[0]->GetValue(), _T("?user/"));
wxDirDialog dlg(0, _("Please choose the folder:"), def); wxDirDialog dlg(0, _("Please choose the folder:"), def);
if (dlg.ShowModal() == wxID_OK) { if (dlg.ShowModal() == wxID_OK) {
wxString dir = StandardPaths::EncodePath(dlg.GetPath()); wxString dir = StandardPaths::EncodePath(dlg.GetPath());
if (dir != _T("")) ctrl[0]->SetValue(dir); if (dir != _T("")) ctrl[0]->SetValue(dir);
} }
#endif
} }
// File // File

2
aegisub/src/dialog_options.cpp
View file

@ -40,7 +40,7 @@
#include "config.h" #include "config.h"
#include "dialog_options.h" #include "dialog_options.h"
#if wxUSE_TREEBOOK && !__WXMAC__ #if wxUSE_TREEBOOK
#include <wx/treebook.h> #include <wx/treebook.h>
#else #else

2
aegisub/src/dialog_options.h
View file

@ -53,7 +53,7 @@
// Prototypes // Prototypes
class FrameMain; class FrameMain;
class DialogInputHotkey; class DialogInputHotkey;
#if wxUSE_TREEBOOK && !__WXMAC__ #if wxUSE_TREEBOOK
class wxTreebook; class wxTreebook;
#else #else
#include <wx/choicebk.h> #include <wx/choicebk.h>

4
aegisub/src/video_display.cpp
View file

@ -133,11 +133,7 @@ int attribList[] = { WX_GL_RGBA , WX_GL_DOUBLEBUFFER, WX_GL_STENCIL_SIZE, 8, 0 }
/// @param name /// @param name
/// ///
VideoDisplay::VideoDisplay(wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& 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) : wxGLCanvas (parent, id, attribList, pos, size, style, name)
#endif
{ {
// Set options // Set options
box = NULL; box = NULL;