Yuvi's mac compatibility patch applied

Originally committed to SVN as r418.
2006-06-19 02:57:27 +00:00 · 2006-06-19 02:57:27 +00:00 · ecdc3d435b
parent 105ab46110
commit ecdc3d435b
45 changed files with 5239 additions and 5 deletions
--- a/core/MatroskaParser.c
+++ b/core/MatroskaParser.c
@ -96,7 +96,7 @@ static char  *mystrdup(struct InputStream *is,const char *src) {
  return dst;
 }

-#ifndef __FreeBSD__
+#if !defined(__FreeBSD__) && !defined(__APPLE__)
 static void  strlcpy(char *dst,const char *src,unsigned size) {
  unsigned  i;

--- a/core/about.cpp
+++ b/core/about.cpp
@ -77,7 +77,13 @@ AboutScreen::AboutScreen(wxWindow *parent)
 	// Button sizer
 	wxSizer *ButtonSizer = new wxBoxSizer(wxHORIZONTAL);
 	ButtonSizer->AddStretchSpacer(1);
+#ifndef __WXMAC__
 	ButtonSizer->Add(new wxButton(this,wxID_OK),0,0,0);
+#else
+	wxButton *okButton = new wxButton(this,wxID_OK);
+	ButtonSizer->Add(okButton,0,0,0);
+	okButton->SetDefault();
+#endif

 	// Main sizer
 	wxSizer *MainSizer = new wxBoxSizer(wxVERTICAL);
--- a/core/audio_box.cpp
+++ b/core/audio_box.cpp
@ -49,6 +49,9 @@
 #include "toggle_bitmap.h"
 #include "hotkeys.h"

+#ifdef __WXMAC__
+#include "bevelButton.h"
+#endif

 ///////////////
 // Constructor
@ -182,7 +185,12 @@ wxPanel(parent,-1,wxDefaultPosition,wxDefaultSize,wxTAB_TRAVERSAL|wxBORDER_RAISE
 	KaraokeButton = new wxToggleButton(this,Audio_Button_Karaoke,_("Karaoke"),wxDefaultPosition,wxSize(-1,-1));
 	KaraokeButton->SetToolTip(_("Toggle karaoke mode"));
 	karaokeSizer->Add(KaraokeButton,0,wxRIGHT,0);
+#ifndef __WXMAC__
 	JoinButton = new wxButton(this,Audio_Button_Join,_("Join"),wxDefaultPosition,wxSize(-1,-1));
+#else
+	// we use this custom class to match the button style of toggle buttons in wxMac
+	JoinButton = new wxBevelButton(this,Audio_Button_Join,_("Join"),wxDefaultPosition,wxSize(-1,-1));
+#endif
 	JoinButton->SetToolTip(_("Join selected syllables"));
 	JoinButton->Enable(false);
 	karaokeSizer->Add(JoinButton,0,wxRIGHT,0);
--- a/core/audio_player_portaudio.cpp
+++ b/core/audio_player_portaudio.cpp
@ -121,8 +121,13 @@ int PortAudioPlayer::paCallback(void *inputBuffer, void *outputBuffer, unsigned

 	// Set play position (and real one)
 	player->playPos += framesPerBuffer;
+#ifndef __APPLE__
 	player->realPlayPos = (__int64)(Pa_StreamTime(player->stream) - player->paStart) + player->startPos;
-
+#else
+	// AudioDeviceGetCurrentTime(), used by Pa_StreamTime() on OS X, is buggered, so use playPos for now
+	player->realPlayPos = player->playPos;
+#endif
+	
 	// Cap to start if lower
 	return end;
 }
--- a/core/automation_gui.cpp
+++ b/core/automation_gui.cpp
@ -355,8 +355,10 @@ void DialogAutomationManager::EditScript(AutomationScript *script)
 	wxString editor;
 	if (!Options.IsDefined(_T("automation script editor")) || wxGetKeyState(WXK_SHIFT)) {
 		wxMessageBox(_T("You have not selected a script editor yet. Please select your script editor in the next window. It's recommended to use an editor with syntax highlighting for Lua scripts."), _T("Aegisub"), wxOK|wxICON_INFORMATION);
-#ifdef __WINDOWS__
+#if defined(__WINDOWS__)
 		editor = wxFileSelector(_T("Select script editor"), _T(""), _T("C:\\Windows\\Notepad.exe"), _T("exe"), _T("Execatuables (*.exe)|*.exe|All files (*.*)|*.*"), wxOPEN|wxFILE_MUST_EXIST);
+#elif defined(__APPLE__)
+		editor = wxFileSelector(_T("Select script editor"), _T(""), _T("/Applications/TextEdit.app"), _T("app"), _T("Applications (*.app)|*.app|All files (*.*)|*.*"), wxOPEN|wxFILE_MUST_EXIST);
 #else
 		char *env_editor = getenv("EDITOR");
 		wxString editor(env_editor ? env_editor : "/usr/bin/gvim", wxConvLocal);
@ -370,10 +372,18 @@ void DialogAutomationManager::EditScript(AutomationScript *script)
 	}

 	wxWCharBuffer editorbuf = editor.c_str(), sfnamebuf = sfname.GetFullPath().c_str();
-	wchar_t **cmdline = new wchar_t*[3];
+	wchar_t **cmdline = new wchar_t*[5];
+#ifndef __APPLE__
 	cmdline[0] = editorbuf.data();
 	cmdline[1] = sfnamebuf.data();
 	cmdline[2] = 0;
+#else
+	cmdline[0] = _T("/usr/bin/open");
+	cmdline[1] = _T("-a");
+	cmdline[2] = editorbuf.data();
+	cmdline[3] = sfnamebuf.data();
+	cmdline[4] = 0;
+#endif
 	long res = wxExecute(cmdline);
 	delete cmdline;

--- a/core/dialog_export.cpp
+++ b/core/dialog_export.cpp
@ -105,8 +105,13 @@ DialogExport::DialogExport (wxWindow *parent)
 	// Button sizer
 	wxSizer *ButtonSizer = new wxBoxSizer(wxHORIZONTAL);
 	ButtonSizer->AddStretchSpacer(1);
+#ifndef __WXMAC__
 	ButtonSizer->Add(new wxButton(this,Button_Process,_("Export...")),0,wxRIGHT,5);
 	ButtonSizer->Add(new wxButton(this,wxID_CANCEL),0,wxRIGHT,0);
+#else
+	ButtonSizer->Add(new wxButton(this,wxID_CANCEL),0,wxRIGHT,5);
+	ButtonSizer->Add(new wxButton(this,Button_Process,_("Export...")),0,wxRIGHT,0);
+#endif

 	// Draw stuff sizer
 	HorizSizer = new wxBoxSizer(wxHORIZONTAL);
--- a/core/dialog_hotkeys.cpp
+++ b/core/dialog_hotkeys.cpp
@ -74,8 +74,13 @@ DialogHotkeys::DialogHotkeys(FrameMain *_parent)
 	// Button sizer
 	wxSizer *ButtonSizer = new wxBoxSizer(wxHORIZONTAL);
 	ButtonSizer->AddStretchSpacer(1);
+#ifndef __APPLE__
 	ButtonSizer->Add(new wxButton(this,wxID_OK),0,wxRIGHT|wxEXPAND,5);
 	ButtonSizer->Add(new wxButton(this,wxID_CANCEL),0,wxRIGHT|wxEXPAND,0);
+#else
+	ButtonSizer->Add(new wxButton(this,wxID_CANCEL),0,wxRIGHT|wxEXPAND,5);
+	ButtonSizer->Add(new wxButton(this,wxID_OK),0,wxRIGHT|wxEXPAND,0);
+#endif

 	// Main sizer
 	wxSizer *MainSizer = new wxBoxSizer(wxVERTICAL);
--- a/core/dialog_properties.cpp
+++ b/core/dialog_properties.cpp
@ -119,6 +119,7 @@ DialogProperties::DialogProperties (wxWindow *parent, VideoDisplay *_vid)

 	// Button sizer
 	wxButton *ButtonOK = new wxButton(this,wxID_OK);
+	ButtonOK->SetDefault();
 	wxSizer *ButtonSizer = new wxBoxSizer(wxHORIZONTAL);
 	ButtonSizer->AddStretchSpacer(1);
 	ButtonSizer->Add(ButtonOK,0,0,0);
--- a/core/dialog_resample.cpp
+++ b/core/dialog_resample.cpp
@ -80,8 +80,15 @@ DialogResample::DialogResample(wxWindow *parent, SubtitlesGrid *_grid)
 	// Button sizer
 	wxSizer *ButtonSizer = new wxBoxSizer(wxHORIZONTAL);
 	ButtonSizer->AddStretchSpacer(1);
+#ifndef __WXMAC__
 	ButtonSizer->Add(new wxButton(this,BUTTON_RESAMPLE,_("Resample")),0,wxRIGHT,5);
 	ButtonSizer->Add(new wxButton(this,wxID_CANCEL),0,wxRIGHT,0);
+#else
+	ButtonSizer->Add(new wxButton(this,wxID_CANCEL),0,wxRIGHT,5);
+	wxButton *resampleButton = new wxButton(this,BUTTON_RESAMPLE,_("Resample"));
+	ButtonSizer->Add(resampleButton,0,wxRight,0);
+	resampleButton->SetDefault();
+#endif

 	// Main sizer
 	wxSizer *MainSizer = new wxBoxSizer(wxVERTICAL);
--- a/core/dialog_selection.cpp
+++ b/core/dialog_selection.cpp
@ -100,8 +100,15 @@ wxDialog (parent,-1,_("Select"),wxDefaultPosition,wxDefaultSize,wxCAPTION)
 	// Buttons sizer
 	wxSizer *ButtonSizer = new wxBoxSizer(wxHORIZONTAL);
 	ButtonSizer->AddStretchSpacer(1);
+#ifndef __WXMAC__
 	ButtonSizer->Add(new wxButton(this,wxID_OK),0,wxRIGHT,5);
 	ButtonSizer->Add(new wxButton(this,wxID_CANCEL),0,wxRIGHT,0);
+#else
+	wxButton *okButton = new wxButton(this,wxID_OK);
+	ButtonSizer->Add(new wxButton(this,wxID_CANCEL),0,wxRIGHT,5);
+	ButtonSizer->Add(okButton,0,wxRIGHT,0);
+	okButton->SetDefault();
+#endif

 	// Main sizer
 	wxSizer *MainSizer = new wxBoxSizer(wxVERTICAL);
--- a/core/dialog_shift_times.cpp
+++ b/core/dialog_shift_times.cpp
@ -114,8 +114,13 @@ DialogShiftTimes::DialogShiftTimes (wxWindow *parent,SubtitlesGrid *_grid,VideoD
 	OKButton->SetDefault();
 	wxSizer *ButtonSizer = new wxBoxSizer(wxHORIZONTAL);
 	ButtonSizer->AddStretchSpacer(1);
+#ifndef __WXMAC__
 	ButtonSizer->Add(OKButton,0,wxRIGHT,5);
 	ButtonSizer->Add(CancelButton,0,wxRIGHT,0);
+#else
+	ButtonSizer->Add(CancelButton,0,wxRIGHT,5);
+	ButtonSizer->Add(OKButton,0,wxRIGHT,0);
+#endif
 	ButtonSizer->AddStretchSpacer(1);

 	// General layout
--- a/core/dialog_style_editor.cpp
+++ b/core/dialog_style_editor.cpp
@ -273,9 +273,17 @@ DialogStyleEditor::DialogStyleEditor (wxWindow *parent, AssStyle *_style, Subtit
 	// Buttons
 	wxSizer *ButtonSizer = new wxBoxSizer(wxHORIZONTAL);
 	ButtonSizer->AddStretchSpacer(1);
+#ifndef __WXMAC__
 	ButtonSizer->Add(new wxButton(this, wxID_OK),0,wxRIGHT,5);
 	ButtonSizer->Add(new wxButton(this, wxID_CANCEL),0,wxRIGHT,5);
 	ButtonSizer->Add(new wxButton(this, wxID_APPLY),0,wxRIGHT,5);
+#else
+	wxButton *okButton = new wxButton(this, wxID_OK);
+	ButtonSizer->Add(new wxButton(this, wxID_APPLY),0,wxRIGHT,5);
+	ButtonSizer->Add(new wxButton(this, wxID_CANCEL),0,wxRIGHT,5);
+	ButtonSizer->Add(okButton,0,wxRIGHT,5);
+	okButton->SetDefault();
+#endif

 	// General Layout
 	MainSizer = new wxBoxSizer(wxVERTICAL);
--- a/core/dialog_timing_processor.cpp
+++ b/core/dialog_timing_processor.cpp
@ -133,8 +133,13 @@ DialogTimingProcessor::DialogTimingProcessor(wxWindow *parent,SubtitlesGrid *_gr
 	wxSizer *ButtonSizer = new wxBoxSizer(wxHORIZONTAL);
 	ButtonSizer->AddStretchSpacer(1);
 	ApplyButton = new wxButton(this,wxID_APPLY);
+#ifndef __WXMAC__
 	ButtonSizer->Add(ApplyButton,0,wxRIGHT,5);
 	ButtonSizer->Add(new wxButton(this,wxID_CANCEL),0,0,0);
+#else
+	ButtonSizer->Add(new wxButton(this,wxID_CANCEL),0,wxRIGHT,5);
+	ButtonSizer->Add(ApplyButton,0,0,0);
+#endif

 	// Right Sizer
 	wxSizer *RightSizer = new wxBoxSizer(wxVERTICAL);
--- a/core/fonts_collector.cpp
+++ b/core/fonts_collector.cpp
@ -82,8 +82,13 @@ DialogFontsCollector::DialogFontsCollector(wxWindow *parent)
 	CloseButton = new wxButton(this,wxID_CLOSE);
 	wxSizer *ButtonSizer = new wxBoxSizer(wxHORIZONTAL);
 	ButtonSizer->AddStretchSpacer(1);
+#ifndef __WXMAC__
 	ButtonSizer->Add(StartButton,0,wxRIGHT,5);
 	ButtonSizer->Add(CloseButton);
+#else
+	ButtonSizer->Add(CloseButton,0,wxRIGHT,5);
+	ButtonSizer->Add(StartButton);
+#endif

 	// Main sizer
 	wxSizer *MainSizer = new wxBoxSizer(wxVERTICAL);
--- a/core/frame_main_events.cpp
+++ b/core/frame_main_events.cpp
@ -204,6 +204,11 @@ BEGIN_EVENT_TABLE(FrameMain, wxFrame)
 	EVT_MENU(Grid_Toggle_Tags,FrameMain::OnToggleTags)

 	EVT_MENU(Kana_Game, FrameMain::OnKanaGame)
+
+#ifdef __WXMAC__
+   EVT_MENU(wxID_ABOUT, FrameMain::OnAbout)
+   EVT_MENU(wxID_EXIT, FrameMain::OnExit)
+#endif
 END_EVENT_TABLE()


--- a/core/macosx/.DS_Store
+++ b/core/macosx/.DS_Store
--- a/core/macosx/._.DS_Store
+++ b/core/macosx/._.DS_Store
--- a/core/macosx/._Aegisub.icns
+++ b/core/macosx/._Aegisub.icns
--- a/core/macosx/._assIcon.icns
+++ b/core/macosx/._assIcon.icns
--- a/core/macosx/._srtIcon.icns
+++ b/core/macosx/._srtIcon.icns
--- a/core/macosx/._ssaIcon.icns
+++ b/core/macosx/._ssaIcon.icns
--- a/core/macosx/._txtIcon.icns
+++ b/core/macosx/._txtIcon.icns
--- a/core/macosx/Aegisub.icns
+++ b/core/macosx/Aegisub.icns
--- a/core/macosx/Aegisub_Prefix.pch
+++ b/core/macosx/Aegisub_Prefix.pch
@ -0,0 +1,6 @@
+//
+// Prefix header for all source files of the 'macosx' target in the 'macosx' project.
+//
+
+#include <Carbon/Carbon.h>
+#include "defines.h"
--- a/core/macosx/English.lproj/InfoPlist.strings
+++ b/core/macosx/English.lproj/InfoPlist.strings
--- a/core/macosx/Info.plist
+++ b/core/macosx/Info.plist
@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleDocumentTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>ass</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>assIcon</string>
+			<key>CFBundleTypeName</key>
+			<string>Advanced Substation Alpha</string>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>LSTypeIsPackage</key>
+			<false/>
+			<key>NSPersistentStoreTypeKey</key>
+			<string>XML</string>
+		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>ssa</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>ssaIcon</string>
+			<key>CFBundleTypeName</key>
+			<string>Substation Alpha</string>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>LSTypeIsPackage</key>
+			<false/>
+			<key>NSPersistentStoreTypeKey</key>
+			<string>XML</string>
+		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>srt</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>srtIcon</string>
+			<key>CFBundleTypeName</key>
+			<string>SubRip</string>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>LSTypeIsPackage</key>
+			<false/>
+			<key>NSPersistentStoreTypeKey</key>
+			<string>XML</string>
+		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>txt</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>txtIcon</string>
+			<key>CFBundleTypeName</key>
+			<string>Plain text</string>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>LSTypeIsPackage</key>
+			<false/>
+			<key>NSPersistentStoreTypeKey</key>
+			<string>XML</string>
+		</dict>
+	</array>
+	<key>CFBundleExecutable</key>
+	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleIconFile</key>
+	<string>Aegisub</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.cellosoft.aegisub</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1.0</string>
+	<key>CSResourcesFileMapped</key>
+	<true/>
+</dict>
+</plist>
--- a/core/macosx/Japanese.lproj/InfoPlist.strings
+++ b/core/macosx/Japanese.lproj/InfoPlist.strings
--- a/core/macosx/Japanese.lproj/main.nib/classes.nib
+++ b/core/macosx/Japanese.lproj/main.nib/classes.nib
@ -0,0 +1,4 @@
+{
+IBClasses = ();
+IBVersion = 1;
+}
--- a/core/macosx/Japanese.lproj/main.nib/info.nib
+++ b/core/macosx/Japanese.lproj/main.nib/info.nib
@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IBDocumentLocation</key>
+	<string>117 12 356 240 0 0 1920 1178 </string>
+	<key>IBEditorPositions</key>
+	<dict>
+		<key>29</key>
+		<string>110 302 204 44 0 0 1920 1178 </string>
+	</dict>
+	<key>IBFramework Version</key>
+	<string>432.0</string>
+	<key>IBOldestOS</key>
+	<integer>3</integer>
+	<key>IBSystem Version</key>
+	<string>8A391</string>
+	<key>targetFramework</key>
+	<string>IBCarbonFramework</string>
+</dict>
+</plist>
--- a/core/macosx/Japanese.lproj/main.nib/objects.xib
+++ b/core/macosx/Japanese.lproj/main.nib/objects.xib
@ -0,0 +1,272 @@
+<?xml version="1.0" standalone="yes"?>
+<object class="NSIBObjectData">
+  <string name="targetFramework">IBCarbonFramework</string>
+  <object name="rootObject" class="NSCustomObject" id="1">
+    <string name="customClass">NSApplication</string>
+  </object>
+  <array count="38" name="allObjects">
+    <object class="IBCarbonMenu" id="29">
+      <string name="title">メイン</string>
+      <array count="4" name="items">
+        <object class="IBCarbonMenuItem" id="185">
+          <string name="title">Foo</string>
+          <object name="submenu" class="IBCarbonMenu" id="184">
+            <string name="title">Foo</string>
+            <array count="1" name="items">
+              <object class="IBCarbonMenuItem" id="187">
+                <string name="title">Foo について</string>
+                <int name="keyEquivalentModifier">0</int>
+                <ostype name="command">abou</ostype>
+              </object>
+            </array>
+            <string name="name">_NSAppleMenu</string>
+          </object>
+        </object>
+        <object class="IBCarbonMenuItem" id="127">
+          <string name="title">ファイル</string>
+          <object name="submenu" class="IBCarbonMenu" id="131">
+            <string name="title">ファイル</string>
+            <array count="10" name="items">
+              <object class="IBCarbonMenuItem" id="139">
+                <string name="title">新規</string>
+                <string name="keyEquivalent">n</string>
+                <ostype name="command">new </ostype>
+              </object>
+              <object class="IBCarbonMenuItem" id="134">
+                <string name="title">開く...</string>
+                <string name="keyEquivalent">o</string>
+                <ostype name="command">open</ostype>
+              </object>
+              <object class="IBCarbonMenuItem" id="133">
+                <boolean name="separator">TRUE</boolean>
+              </object>
+              <object class="IBCarbonMenuItem" id="130">
+                <string name="title">閉じる</string>
+                <string name="keyEquivalent">w</string>
+                <ostype name="command">clos</ostype>
+              </object>
+              <object class="IBCarbonMenuItem" id="138">
+                <string name="title">保存</string>
+                <string name="keyEquivalent">s</string>
+                <ostype name="command">save</ostype>
+              </object>
+              <object class="IBCarbonMenuItem" id="137">
+                <string name="title">別名で保存...</string>
+                <string name="keyEquivalent">S</string>
+                <ostype name="command">svas</ostype>
+              </object>
+              <object class="IBCarbonMenuItem" id="132">
+                <string name="title">元に戻す</string>
+                <string name="keyEquivalent">r</string>
+                <ostype name="command">rvrt</ostype>
+              </object>
+              <object class="IBCarbonMenuItem" id="128">
+                <boolean name="separator">TRUE</boolean>
+              </object>
+              <object class="IBCarbonMenuItem" id="135">
+                <string name="title">ページ設定...</string>
+                <string name="keyEquivalent">P</string>
+                <ostype name="command">page</ostype>
+              </object>
+              <object class="IBCarbonMenuItem" id="136">
+                <string name="title">プリント...</string>
+                <string name="keyEquivalent">p</string>
+                <ostype name="command">prnt</ostype>
+              </object>
+            </array>
+          </object>
+        </object>
+        <object class="IBCarbonMenuItem" id="152">
+          <string name="title">編集</string>
+          <object name="submenu" class="IBCarbonMenu" id="147">
+            <string name="title">編集</string>
+            <array count="10" name="items">
+              <object class="IBCarbonMenuItem" id="141">
+                <string name="title">取り消し</string>
+                <string name="keyEquivalent">z</string>
+                <ostype name="command">undo</ostype>
+              </object>
+              <object class="IBCarbonMenuItem" id="146">
+                <string name="title">やり直し</string>
+                <string name="keyEquivalent">Z</string>
+                <ostype name="command">redo</ostype>
+              </object>
+              <object class="IBCarbonMenuItem" id="142">
+                <boolean name="separator">TRUE</boolean>
+              </object>
+              <object class="IBCarbonMenuItem" id="143">
+                <string name="title">カット</string>
+                <string name="keyEquivalent">x</string>
+                <ostype name="command">cut </ostype>
+              </object>
+              <object class="IBCarbonMenuItem" id="149">
+                <string name="title">コピー</string>
+                <string name="keyEquivalent">c</string>
+                <ostype name="command">copy</ostype>
+              </object>
+              <object class="IBCarbonMenuItem" id="144">
+                <string name="title">ペースト</string>
+                <string name="keyEquivalent">v</string>
+                <ostype name="command">past</ostype>
+              </object>
+              <object class="IBCarbonMenuItem" id="151">
+                <string name="title">削除</string>
+                <ostype name="command">clea</ostype>
+              </object>
+              <object class="IBCarbonMenuItem" id="148">
+                <string name="title">すべてを選択</string>
+                <string name="keyEquivalent">a</string>
+                <ostype name="command">sall</ostype>
+              </object>
+              <object class="IBCarbonMenuItem" id="199">
+                <boolean name="separator">TRUE</boolean>
+              </object>
+              <object class="IBCarbonMenuItem" id="198">
+                <string name="title">特殊文字...</string>
+                <ostype name="command">chrp</ostype>
+              </object>
+            </array>
+          </object>
+        </object>
+        <object class="IBCarbonMenuItem" id="192">
+          <string name="title">ウインドウ</string>
+          <object name="submenu" class="IBCarbonMenu" id="195">
+            <string name="title">ウインドウ</string>
+            <array count="6" name="items">
+              <object class="IBCarbonMenuItem" id="190">
+                <boolean name="dynamic">TRUE</boolean>
+                <string name="title">しまう</string>
+                <string name="keyEquivalent">m</string>
+                <ostype name="command">mini</ostype>
+              </object>
+              <object class="IBCarbonMenuItem" id="191">
+                <boolean name="dynamic">TRUE</boolean>
+                <string name="title">すべてをしまう</string>
+                <string name="keyEquivalent">m</string>
+                <int name="keyEquivalentModifier">1572864</int>
+                <ostype name="command">mina</ostype>
+              </object>
+              <object class="IBCarbonMenuItem" id="197">
+                <string name="title">拡大／縮小</string>
+                <ostype name="command">zoom</ostype>
+              </object>
+              <object class="IBCarbonMenuItem" id="194">
+                <boolean name="separator">TRUE</boolean>
+              </object>
+              <object class="IBCarbonMenuItem" id="196">
+                <boolean name="dynamic">TRUE</boolean>
+                <string name="title">すべてを手前に移動</string>
+                <ostype name="command">bfrt</ostype>
+              </object>
+              <object class="IBCarbonMenuItem" id="193">
+                <boolean name="dynamic">TRUE</boolean>
+                <string name="title">ウインドウを整理</string>
+                <int name="keyEquivalentModifier">1572864</int>
+                <ostype name="command">frnt</ostype>
+              </object>
+            </array>
+            <string name="name">_NSWindowsMenu</string>
+          </object>
+        </object>
+      </array>
+      <string name="name">_NSMainMenu</string>
+    </object>
+    <reference idRef="127"/>
+    <reference idRef="128"/>
+    <reference idRef="130"/>
+    <reference idRef="131"/>
+    <reference idRef="132"/>
+    <reference idRef="133"/>
+    <reference idRef="134"/>
+    <reference idRef="135"/>
+    <reference idRef="136"/>
+    <reference idRef="137"/>
+    <reference idRef="138"/>
+    <reference idRef="139"/>
+    <reference idRef="141"/>
+    <reference idRef="142"/>
+    <reference idRef="143"/>
+    <reference idRef="144"/>
+    <reference idRef="146"/>
+    <reference idRef="147"/>
+    <reference idRef="148"/>
+    <reference idRef="149"/>
+    <reference idRef="151"/>
+    <reference idRef="152"/>
+    <object class="IBCarbonWindow" id="166">
+      <string name="windowRect">204 300 564 780 </string>
+      <string name="title">ウインドウ</string>
+      <object name="rootControl" class="IBCarbonRootControl" id="167">
+        <string name="bounds">0 0 360 480 </string>
+        <string name="viewFrame">0 0 480 360 </string>
+      </object>
+      <boolean name="receiveUpdates">FALSE</boolean>
+      <boolean name="liveResize">TRUE</boolean>
+      <boolean name="compositing">TRUE</boolean>
+      <boolean name="isConstrained">FALSE</boolean>
+    </object>
+    <reference idRef="167"/>
+    <reference idRef="184"/>
+    <reference idRef="185"/>
+    <reference idRef="187"/>
+    <reference idRef="190"/>
+    <reference idRef="191"/>
+    <reference idRef="192"/>
+    <reference idRef="193"/>
+    <reference idRef="194"/>
+    <reference idRef="195"/>
+    <reference idRef="196"/>
+    <reference idRef="197"/>
+    <reference idRef="198"/>
+    <reference idRef="199"/>
+  </array>
+  <array count="38" name="allParents">
+    <reference idRef="1"/>
+    <reference idRef="29"/>
+    <reference idRef="131"/>
+    <reference idRef="131"/>
+    <reference idRef="127"/>
+    <reference idRef="131"/>
+    <reference idRef="131"/>
+    <reference idRef="131"/>
+    <reference idRef="131"/>
+    <reference idRef="131"/>
+    <reference idRef="131"/>
+    <reference idRef="131"/>
+    <reference idRef="131"/>
+    <reference idRef="147"/>
+    <reference idRef="147"/>
+    <reference idRef="147"/>
+    <reference idRef="147"/>
+    <reference idRef="147"/>
+    <reference idRef="152"/>
+    <reference idRef="147"/>
+    <reference idRef="147"/>
+    <reference idRef="147"/>
+    <reference idRef="29"/>
+    <reference idRef="1"/>
+    <reference idRef="166"/>
+    <reference idRef="185"/>
+    <reference idRef="29"/>
+    <reference idRef="184"/>
+    <reference idRef="195"/>
+    <reference idRef="195"/>
+    <reference idRef="29"/>
+    <reference idRef="195"/>
+    <reference idRef="195"/>
+    <reference idRef="192"/>
+    <reference idRef="195"/>
+    <reference idRef="195"/>
+    <reference idRef="147"/>
+    <reference idRef="147"/>
+  </array>
+  <dictionary count="3" name="nameTable">
+    <string>Files Owner</string>
+    <reference idRef="1"/>
+    <string>MainWindow</string>
+    <reference idRef="166"/>
+    <string>MenuBar</string>
+    <reference idRef="29"/>
+  </dictionary>
+  <unsigned_int name="nextObjectID">200</unsigned_int>
+</object>
--- a/core/macosx/acconf.h
+++ b/core/macosx/acconf.h
@ -0,0 +1,343 @@
+/* core/posix/acconf.h.  Generated by configure.  */
+/* core/posix/acconf.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
+   systems. This function is required for `alloca.c' support on those systems.
+   */
+/* #undef CRAY_STACKSEG_END */
+
+/* Define to 1 if using `alloca.c'. */
+/* #undef C_ALLOCA */
+
+/* Define to 1 if translation of program messages to the user's native
+   language is requested. */
+#define ENABLE_NLS 1
+
+/* Define to 1 if you have `alloca', as a function or macro. */
+#define HAVE_ALLOCA 1
+
+/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
+   */
+#define HAVE_ALLOCA_H 1
+
+/* Define to 1 if you have the <argz.h> header file. */
+/* #undef HAVE_ARGZ_H */
+
+/* found asa via pkg-config */
+/* #undef HAVE_ASA */
+
+/* Define to 1 if you have the <asa/asa.h> header file. */
+/* #undef HAVE_ASA_ASA_H */
+
+/* Define to 1 if you have the `asprintf' function. */
+#define HAVE_ASPRINTF 1
+
+/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the
+   CoreFoundation framework. */
+#define HAVE_CFLOCALECOPYCURRENT 1
+
+/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in
+   the CoreFoundation framework. */
+#define HAVE_CFPREFERENCESCOPYAPPVALUE 1
+
+/* Define if the GNU dcgettext() function is already present or preinstalled.
+   */
+#define HAVE_DCGETTEXT 1
+
+/* Define to 1 if you have the declaration of `feof_unlocked', and to 0 if you
+   don't. */
+#define HAVE_DECL_FEOF_UNLOCKED 1
+
+/* Define to 1 if you have the declaration of `fgets_unlocked', and to 0 if
+   you don't. */
+#define HAVE_DECL_FGETS_UNLOCKED 0
+
+/* Define to 1 if you have the declaration of `getc_unlocked', and to 0 if you
+   don't. */
+#define HAVE_DECL_GETC_UNLOCKED 1
+
+/* Define to 1 if you have the declaration of `_snprintf', and to 0 if you
+   don't. */
+#define HAVE_DECL__SNPRINTF 0
+
+/* Define to 1 if you have the declaration of `_snwprintf', and to 0 if you
+   don't. */
+#define HAVE_DECL__SNWPRINTF 0
+
+/* Define to 1 if you have the `fwprintf' function. */
+#define HAVE_FWPRINTF 1
+
+/* Define to 1 if you have the `getcwd' function. */
+#define HAVE_GETCWD 1
+
+/* Define to 1 if you have the `getegid' function. */
+#define HAVE_GETEGID 1
+
+/* Define to 1 if you have the `geteuid' function. */
+#define HAVE_GETEUID 1
+
+/* Define to 1 if you have the `getgid' function. */
+#define HAVE_GETGID 1
+
+/* Define to 1 if you have the `getpagesize' function. */
+#define HAVE_GETPAGESIZE 1
+
+/* Define if the GNU gettext() function is already present or preinstalled. */
+#define HAVE_GETTEXT 1
+
+/* Define to 1 if you have the `getuid' function. */
+#define HAVE_GETUID 1
+
+/* Define if you have the iconv() function. */
+#define HAVE_ICONV 1
+
+/* Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>. */
+#define HAVE_INTMAX_T 1
+
+/* Define if <inttypes.h> exists and doesn't clash with <sys/types.h>. */
+#define HAVE_INTTYPES_H 1
+
+/* Define if <inttypes.h> exists, doesn't clash with <sys/types.h>, and
+   declares uintmax_t. */
+#define HAVE_INTTYPES_H_WITH_UINTMAX 1
+
+/* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
+#define HAVE_LANGINFO_CODESET 1
+
+/* Define if your <locale.h> file defines LC_MESSAGES. */
+#define HAVE_LC_MESSAGES 1
+
+/* Define to 1 if you have the `avcodec' library (-lavcodec). */
+/* #undef HAVE_LIBAVCODEC */
+
+/* Define to 1 if you have the `avformat' library (-lavformat). */
+/* #undef HAVE_LIBAVFORMAT */
+
+/* Define to 1 if you have the `dl' library (-ldl). */
+#define HAVE_LIBDL 1
+
+/* Define to 1 if you have the `lua' library (-llua). */
+#define HAVE_LIBLUA 1
+
+/* Define to 1 if you have the `lualib' library (-llualib). */
+#define HAVE_LIBLUALIB 1
+
+/* Define to 1 if you have the `m' library (-lm). */
+#define HAVE_LIBM 1
+
+/* Define to 1 if you have the `portaudio' library (-lportaudio). */
+#define HAVE_LIBPORTAUDIO 1
+
+/* Define to 1 if you have the `pthread' library (-lpthread). */
+#define HAVE_LIBPTHREAD 1
+
+/* Define to 1 if you have the `ssa' library (-lssa). */
+/* #undef HAVE_LIBSSA */
+
+/* Define to 1 if you have the <libssa/libssa.h> header file. */
+/* #undef HAVE_LIBSSA_LIBSSA_H */
+
+/* Define to 1 if you have the <limits.h> header file. */
+#define HAVE_LIMITS_H 1
+
+/* Define to 1 if you have the <locale.h> header file. */
+#define HAVE_LOCALE_H 1
+
+/* Define if you have the 'long double' type. */
+#define HAVE_LONG_DOUBLE 1
+
+/* Define if you have the 'long long' type. */
+#define HAVE_LONG_LONG 1
+
+/* Define to 1 if you have the <malloc.h> header file. */
+/* #undef HAVE_MALLOC_H */
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the `mempcpy' function. */
+/* #undef HAVE_MEMPCPY */
+
+/* Define to 1 if you have a working `mmap' system call. */
+#define HAVE_MMAP 1
+
+/* Define to 1 if you have the `munmap' function. */
+#define HAVE_MUNMAP 1
+
+/* Define to 1 if you have the <nl_types.h> header file. */
+#define HAVE_NL_TYPES_H 1
+
+/* Define if your printf() function supports format strings with positions. */
+#define HAVE_POSIX_PRINTF 1
+
+/* Preprocessor support for #pragma once */
+#define HAVE_PRAGMA_ONCE 1
+
+/* Define to 1 if you have the `putenv' function. */
+#define HAVE_PUTENV 1
+
+/* Define to 1 if you have the `setenv' function. */
+#define HAVE_SETENV 1
+
+/* Define to 1 if you have the `setlocale' function. */
+#define HAVE_SETLOCALE 1
+
+/* Define to 1 if you have the `snprintf' function. */
+#define HAVE_SNPRINTF 1
+
+/* Define to 1 if stdbool.h conforms to C99. */
+#define HAVE_STDBOOL_H 1
+
+/* Define to 1 if you have the <stddef.h> header file. */
+#define HAVE_STDDEF_H 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define if <stdint.h> exists, doesn't clash with <sys/types.h>, and declares
+   uintmax_t. */
+#define HAVE_STDINT_H_WITH_UINTMAX 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the `stpcpy' function. */
+#define HAVE_STPCPY 1
+
+/* Define to 1 if you have the `strcasecmp' function. */
+#define HAVE_STRCASECMP 1
+
+/* Define to 1 if you have the `strdup' function. */
+#define HAVE_STRDUP 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the `strtoul' function. */
+#define HAVE_STRTOUL 1
+
+/* Define to 1 if you have the <sys/param.h> header file. */
+#define HAVE_SYS_PARAM_H 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the `tsearch' function. */
+#define HAVE_TSEARCH 1
+
+/* Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>. */
+#define HAVE_UINTMAX_T 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define if you have the 'unsigned long long' type. */
+#define HAVE_UNSIGNED_LONG_LONG 1
+
+/* Define if you have the 'wchar_t' type. */
+#define HAVE_WCHAR_T 1
+
+/* Define to 1 if you have the `wcslen' function. */
+#define HAVE_WCSLEN 1
+
+/* Define if you have the 'wint_t' type. */
+#define HAVE_WINT_T 1
+
+/* Define to 1 if the system has the type `_Bool'. */
+#define HAVE__BOOL 1
+
+/* Define to 1 if you have the `__argz_count' function. */
+/* #undef HAVE___ARGZ_COUNT */
+
+/* Define to 1 if you have the `__argz_next' function. */
+/* #undef HAVE___ARGZ_NEXT */
+
+/* Define to 1 if you have the `__argz_stringify' function. */
+/* #undef HAVE___ARGZ_STRINGIFY */
+
+/* Define to 1 if you have the `__fsetlocking' function. */
+/* #undef HAVE___FSETLOCKING */
+
+/* Define as const if the declaration of iconv() needs const. */
+#define ICONV_CONST const
+
+/* Define if integer division by zero raises signal SIGFPE. */
+#define INTDIV0_RAISES_SIGFPE 0
+
+/* Name of package */
+#define PACKAGE "aegisub"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT ""
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "aegisub"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "aegisub 1.10"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "aegisub"
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "1.10"
+
+/* Define if <inttypes.h> exists and defines unusable PRI* macros. */
+/* #undef PRI_MACROS_BROKEN */
+
+/* Define as the maximum value of type 'size_t', if the system doesn't define
+   it. */
+/* #undef SIZE_MAX */
+
+/* If using the C implementation of alloca, define if you know the
+   direction of stack growth for your system; otherwise it will be
+   automatically deduced at run-time.
+	STACK_DIRECTION > 0 => grows toward higher addresses
+	STACK_DIRECTION < 0 => grows toward lower addresses
+	STACK_DIRECTION = 0 => direction of growth unknown */
+/* #undef STACK_DIRECTION */
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Version number of package */
+#define VERSION "1.10"
+
+/* Define to 1 if the X Window System is missing or not being used. */
+/* #undef X_DISPLAY_MISSING */
+
+/* Define to empty if `const' does not conform to ANSI C. */
+/* #undef const */
+
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+   calls it, or to nothing if 'inline' is not supported under any name.  */
+#ifndef __cplusplus
+/* #undef inline */
+#endif
+
+/* Define to `long' if <sys/types.h> does not define. */
+/* #undef off_t */
+
+/* Define as the type of the result of subtracting two pointers, if the system
+   doesn't define it. */
+/* #undef ptrdiff_t */
+
+/* Define to empty if the C compiler doesn't support this keyword. */
+/* #undef signed */
+
+/* Define to `unsigned' if <sys/types.h> does not define. */
+/* #undef size_t */
+
+/* Define to unsigned long or unsigned long long if <stdint.h> and
+   <inttypes.h> don't define. */
+/* #undef uintmax_t */
+
+/* Define to empty if the keyword `volatile' does not work. Warning: valid
+   code using `volatile' can become incorrect without. Disable with care. */
+/* #undef volatile */
--- a/core/macosx/assIcon.icns
+++ b/core/macosx/assIcon.icns
--- a/core/macosx/bevelButton.cpp
+++ b/core/macosx/bevelButton.cpp
@ -0,0 +1,69 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        bevelButton.cpp
+// Purpose:     wxBevelButton, a button that looks like a toggle button in wxMac
+// Author:      David Conrad
+// Modified by:
+// Created:     2006-06-16
+// RCS-ID:      $Id: bevelButton.cpp,v 1.0 2006/06/16 23:29:20 SC Exp $
+// Copyright:   (c) David Conrad
+// Licence:       wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+#pragma implementation "button.h"
+#endif
+
+#include "wx/wxprec.h"
+
+#include "bevelButton.h"
+#include "wx/panel.h"
+#include "wx/stockitem.h"
+
+IMPLEMENT_DYNAMIC_CLASS(wxBevelButton, wxControl)
+
+#include "wx/mac/uma.h"
+#include "bevelButton.h"
+// Button
+
+static const int kMacOSXHorizontalBorder = 2 ;
+static const int kMacOSXVerticalBorder = 4 ;
+
+bool wxBevelButton::Create(wxWindow *parent, wxWindowID id, const wxString& lbl,
+						   const wxPoint& pos,
+						   const wxSize& size, long style,
+						   const wxValidator& validator,
+						   const wxString& name)
+{
+    wxString label(lbl);
+    if (label.empty() && wxIsStockID(id))
+        label = wxGetStockLabel(id);
+    
+    m_macIsUserPane = FALSE ;
+    
+    if ( !wxButtonBase::Create(parent, id, pos, size, style, validator, name) )
+        return false;
+    
+    m_label = label ;
+	
+    Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
+    m_peer = new wxMacControl(this) ;
+
+	verify_noerr ( CreateBevelButtonControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , CFSTR("") , 
+		 kControlBevelButtonNormalBevel , 0 , NULL , 0 , 0 , 0 , m_peer->GetControlRefAddr() ) );
+
+    MacPostControlCreate(pos,size) ;
+    
+	return TRUE;
+}
+
+wxSize wxBevelButton::DoGetBestSize() const
+{
+    int wBtn = 70 ; 
+    int hBtn = 20 ;
+	
+    int lBtn = m_label.Length() * 8 + 12 ;
+    if (lBtn > wBtn) 
+        wBtn = lBtn;
+	
+    return wxSize ( wBtn , hBtn ) ;
+}
--- a/core/macosx/bevelButton.h
+++ b/core/macosx/bevelButton.h
@ -0,0 +1,48 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        bevelButton.h
+// Purpose:     wxBevelButton class, a button that looks like Toggle buttons in wxMac
+// Author:      David Conrad
+// Modified by:
+// Created:     2006-06-16
+// RCS-ID:      $Id: bevelButton.h,v 1.0 2006/06/16 23:29:20 VS Exp $
+// Copyright:   (c) David Conrad
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_BEVEL_BUTTON_H_
+#define _WX_BEVEL_BUTTON_H_
+
+#include "wx/control.h"
+#include "wx/gdicmn.h"
+
+WXDLLEXPORT_DATA(extern const wxChar*) wxButtonNameStr;
+
+// Pushbutton
+class WXDLLEXPORT wxBevelButton: public wxButton
+{
+	DECLARE_DYNAMIC_CLASS(wxButton)
+public:
+	inline wxBevelButton() {}
+	inline wxBevelButton(wxWindow *parent, wxWindowID id,
+						 const wxString& label = wxEmptyString,
+						 const wxPoint& pos = wxDefaultPosition,
+						 const wxSize& size = wxDefaultSize, long style = 0,
+						 const wxValidator& validator = wxDefaultValidator,
+						 const wxString& name = wxButtonNameStr)
+{
+		Create(parent, id, label, pos, size, style, validator, name);
+}
+
+bool Create(wxWindow *parent, wxWindowID id,
+			const wxString& label = wxEmptyString,
+			const wxPoint& pos = wxDefaultPosition,
+			const wxSize& size = wxDefaultSize, long style = 0,
+			const wxValidator& validator = wxDefaultValidator,
+			const wxString& name = wxButtonNameStr);
+
+protected:
+virtual wxSize DoGetBestSize() const ;
+};
+
+#endif
+// _WX_BUTTON_H_
--- a/core/macosx/macosx.xcodeproj/davedc.mode1
+++ b/core/macosx/macosx.xcodeproj/davedc.mode1
--- a/core/macosx/macosx.xcodeproj/davedc.pbxuser
+++ b/core/macosx/macosx.xcodeproj/davedc.pbxuser
--- a/core/macosx/macosx.xcodeproj/project.pbxproj
+++ b/core/macosx/macosx.xcodeproj/project.pbxproj
--- a/core/macosx/res.cpp
+++ b/core/macosx/res.cpp
@ -0,0 +1,85 @@
+#define static
+#include "../core/bitmaps/new_toolbutton_xpm.xpm"
+#include "../core/bitmaps/open_toolbutton_xpm.xpm"
+#include "../core/bitmaps/save_toolbutton_xpm.xpm"
+#include "../core/bitmaps/style_toolbutton_xpm.xpm"
+#include "../core/bitmaps/styling_toolbutton_xpm.xpm"
+#include "../core/bitmaps/translation_toolbutton_xpm.xpm"
+#include "../core/bitmaps/properties_toolbutton_xpm.xpm"
+#include "../core/bitmaps/automation_toolbutton_xpm.xpm"
+#include "../core/bitmaps/spellcheck_toolbutton_xpm.xpm"
+#include "../core/bitmaps/resample_toolbutton_xpm.xpm"
+#include "../core/bitmaps/timing_processor_toolbutton_xpm.xpm"
+#include "../core/bitmaps/jumpto_button_xpm.xpm"
+#include "../core/bitmaps/jumpto_disable_button_xpm.xpm"
+#include "../core/bitmaps/contents_button_xpm.xpm"
+#include "../core/bitmaps/zoom_in_button_xpm.xpm"
+#include "../core/bitmaps/zoom_out_button_xpm.xpm"
+#include "../core/bitmaps/font_collector_button_xpm.xpm"
+#include "../core/bitmaps/hotkeys_button_xpm.xpm"
+#include "../core/bitmaps/substart_to_video_xpm.xpm"
+#include "../core/bitmaps/subend_to_video_xpm.xpm"
+#include "../core/bitmaps/video_to_substart_xpm.xpm"
+#include "../core/bitmaps/video_to_subend_xpm.xpm"
+#include "../core/bitmaps/substart_to_video_disable_xpm.xpm"
+#include "../core/bitmaps/subend_to_video_disable_xpm.xpm"
+#include "../core/bitmaps/video_to_substart_disable_xpm.xpm"
+#include "../core/bitmaps/video_to_subend_disable_xpm.xpm"
+#include "../core/bitmaps/snap_subs_to_scene_xpm.xpm"
+#include "../core/bitmaps/snap_subs_to_scene_disable_xpm.xpm"
+#include "../core/bitmaps/copy_button_xpm.xpm"
+#include "../core/bitmaps/paste_button_xpm.xpm"
+#include "../core/bitmaps/cut_button_xpm.xpm"
+#include "../core/bitmaps/undo_button_xpm.xpm"
+#include "../core/bitmaps/redo_button_xpm.xpm"
+#include "../core/bitmaps/copy_disable_button_xpm.xpm"
+#include "../core/bitmaps/paste_disable_button_xpm.xpm"
+#include "../core/bitmaps/cut_disable_button_xpm.xpm"
+#include "../core/bitmaps/undo_disable_button_xpm.xpm"
+#include "../core/bitmaps/redo_disable_button_xpm.xpm"
+#include "../core/bitmaps/irc_button_xpm.xpm"
+#include "../core/bitmaps/find_button_xpm.xpm"
+#include "../core/bitmaps/null_button_xpm.xpm"
+#include "../core/bitmaps/select_visible_button_xpm.xpm"
+#include "../core/bitmaps/toggle_tag_hiding_xpm.xpm"
+#include "../core/bitmaps/shift_to_frame_xpm.xpm"
+#include "../core/bitmaps/shift_to_frame_disable_xpm.xpm"
+#include "../core/bitmaps/button_play_xpm.xpm"
+#include "../core/bitmaps/button_stop_xpm.xpm"
+#include "../core/bitmaps/button_track_points_xpm.xpm"
+#include "../core/bitmaps/button_track_point_add_xpm.xpm"
+#include "../core/bitmaps/button_track_point_del_xpm.xpm"
+#include "../core/bitmaps/button_track_movement_xpm.xpm"
+#include "../core/bitmaps/button_track_split_line_xpm.xpm"
+#include "../core/bitmaps/button_track_trail_xpm.xpm"
+#include "../core/bitmaps/button_track_move_xpm.xpm"
+#include "../core/bitmaps/button_bold_xpm.xpm"
+#include "../core/bitmaps/button_italics_xpm.xpm"
+#include "../core/bitmaps/button_underline_xpm.xpm"
+#include "../core/bitmaps/button_strikeout_xpm.xpm"
+#include "../core/bitmaps/button_fontname_xpm.xpm"
+#include "../core/bitmaps/button_color1_xpm.xpm"
+#include "../core/bitmaps/button_color2_xpm.xpm"
+#include "../core/bitmaps/button_color3_xpm.xpm"
+#include "../core/bitmaps/button_color4_xpm.xpm"
+#include "../core/bitmaps/button_prev_xpm.xpm"
+#include "../core/bitmaps/button_next_xpm.xpm"
+#include "../core/bitmaps/button_playsel_xpm.xpm"
+#include "../core/bitmaps/button_playline_xpm.xpm"
+#include "../core/bitmaps/button_playfirst500_xpm.xpm"
+#include "../core/bitmaps/button_playlast500_xpm.xpm"
+#include "../core/bitmaps/button_play500before_xpm.xpm"
+#include "../core/bitmaps/button_play500after_xpm.xpm"
+#include "../core/bitmaps/button_playtoend_xpm.xpm"
+#include "../core/bitmaps/button_audio_goto_xpm.xpm"
+#include "../core/bitmaps/button_audio_commit_xpm.xpm"
+#include "../core/bitmaps/button_leadin_xpm.xpm"
+#include "../core/bitmaps/button_leadout_xpm.xpm"
+#include "../core/bitmaps/toggle_audio_autoscroll_xpm.xpm"
+#include "../core/bitmaps/toggle_audio_autocommit_xpm.xpm"
+#include "../core/bitmaps/toggle_audio_ssa_xpm.xpm"
+#include "../core/bitmaps/toggle_audio_spectrum_xpm.xpm"
+#include "../core/bitmaps/toggle_audio_link_xpm.xpm"
+#include "../core/bitmaps/toggle_video_autoscroll_xpm.xpm"
+#include "../core/bitmaps/splash_xpm.xpm"
+#include "../core/bitmaps/wxicon_xpm.xpm"
--- a/core/macosx/res.h
+++ b/core/macosx/res.h
@ -0,0 +1,87 @@
+#ifndef _RES_H
+#define _RES_H
+extern char *new_toolbutton_xpm[];
+extern char *open_toolbutton_xpm[];
+extern char *save_toolbutton_xpm[];
+extern char *style_toolbutton_xpm[];
+extern char *styling_toolbutton_xpm[];
+extern char *translation_toolbutton_xpm[];
+extern char *properties_toolbutton_xpm[];
+extern char *automation_toolbutton_xpm[];
+extern char *spellcheck_toolbutton_xpm[];
+extern char *resample_toolbutton_xpm[];
+extern char *timing_processor_toolbutton_xpm[];
+extern char *jumpto_button_xpm[];
+extern char *jumpto_disable_button_xpm[];
+extern char *contents_button_xpm[];
+extern char *zoom_in_button_xpm[];
+extern char *zoom_out_button_xpm[];
+extern char *font_collector_button_xpm[];
+extern char *hotkeys_button_xpm[];
+extern char *substart_to_video_xpm[];
+extern char *subend_to_video_xpm[];
+extern char *video_to_substart_xpm[];
+extern char *video_to_subend_xpm[];
+extern char *substart_to_video_disable_xpm[];
+extern char *subend_to_video_disable_xpm[];
+extern char *video_to_substart_disable_xpm[];
+extern char *video_to_subend_disable_xpm[];
+extern char *snap_subs_to_scene_xpm[];
+extern char *snap_subs_to_scene_disable_xpm[];
+extern char *copy_button_xpm[];
+extern char *paste_button_xpm[];
+extern char *cut_button_xpm[];
+extern char *undo_button_xpm[];
+extern char *redo_button_xpm[];
+extern char *copy_disable_button_xpm[];
+extern char *paste_disable_button_xpm[];
+extern char *cut_disable_button_xpm[];
+extern char *undo_disable_button_xpm[];
+extern char *redo_disable_button_xpm[];
+extern char *irc_button_xpm[];
+extern char *find_button_xpm[];
+extern char *null_button_xpm[];
+extern char *select_visible_button_xpm[];
+extern char *toggle_tag_hiding_xpm[];
+extern char *shift_to_frame_xpm[];
+extern char *shift_to_frame_disable_xpm[];
+extern char *button_play_xpm[];
+extern char *button_stop_xpm[];
+extern char *button_track_points_xpm[];
+extern char *button_track_point_add_xpm[];
+extern char *button_track_point_del_xpm[];
+extern char *button_track_movement_xpm[];
+extern char *button_track_split_line_xpm[];
+extern char *button_track_trail_xpm[];
+extern char *button_track_move_xpm[];
+extern char *button_bold_xpm[];
+extern char *button_italics_xpm[];
+extern char *button_underline_xpm[];
+extern char *button_strikeout_xpm[];
+extern char *button_fontname_xpm[];
+extern char *button_color1_xpm[];
+extern char *button_color2_xpm[];
+extern char *button_color3_xpm[];
+extern char *button_color4_xpm[];
+extern char *button_prev_xpm[];
+extern char *button_next_xpm[];
+extern char *button_playsel_xpm[];
+extern char *button_playline_xpm[];
+extern char *button_playfirst500_xpm[];
+extern char *button_playlast500_xpm[];
+extern char *button_play500before_xpm[];
+extern char *button_play500after_xpm[];
+extern char *button_playtoend_xpm[];
+extern char *button_audio_goto_xpm[];
+extern char *button_audio_commit_xpm[];
+extern char *button_leadin_xpm[];
+extern char *button_leadout_xpm[];
+extern char *toggle_audio_autoscroll_xpm[];
+extern char *toggle_audio_autocommit_xpm[];
+extern char *toggle_audio_ssa_xpm[];
+extern char *toggle_audio_spectrum_xpm[];
+extern char *toggle_audio_link_xpm[];
+extern char *toggle_video_autoscroll_xpm[];
+extern char *splash_xpm[];
+extern char *wxicon_xpm[];
+#endif /* _RES_H */
--- a/core/macosx/srtIcon.icns
+++ b/core/macosx/srtIcon.icns
--- a/core/macosx/ssaIcon.icns
+++ b/core/macosx/ssaIcon.icns
--- a/core/macosx/txtIcon.icns
+++ b/core/macosx/txtIcon.icns
--- a/core/main.cpp
+++ b/core/main.cpp
@ -304,9 +304,19 @@ void AegisubApp::GetFullPath(wxString arg) {
 ///////////////////////////////////
 // Gets folder name from full path
 void AegisubApp::GetFolderName () {
-#ifdef __WINDOWS__
+#if defined(__WINDOWS__)
 	folderName = _T("");
 	wxFileName path(fullPath);
+#elif defined(__APPLE__)
+	wxFileName path;
+	path.AssignHomeDir();
+	path.AppendDir(_T("Library"));
+	path.AppendDir(_T("Application Support"));
+	if (!path.DirExists())
+		path.Mkdir();
+	path.AppendDir(_T("Aegisub"));
+	if (!path.DirExists())
+		path.Mkdir();
 #else
 	wxFileName path;
 	path.AssignHomeDir();
@ -318,6 +328,18 @@ void AegisubApp::GetFolderName () {
 	folderName += _T("/");
 }

+////////////////
+// Apple events
+#ifdef __WXMAC__
+void AegisubApp::MacOpenFile(const wxString &filename) {
+	if (frame != NULL && !filename.empty()) {
+		frame->LoadSubtitles(filename);
+		wxFileName filepath(filename);
+		Options.SetText(_T("Last open subtitles path"), filepath.GetPath());
+	}
+}
+#endif
+

 ///////////
 // Statics
@ -353,3 +375,4 @@ void AegisubApp::OnKey(wxKeyEvent &event) {
 		event.Skip();
 	}
 }
+
--- a/core/main.h
+++ b/core/main.h
@ -72,6 +72,11 @@ public:

 	bool OnInit();
 	int OnRun();
+	
+#ifdef __WXMAC__
+	// Apple events
+	virtual void MacOpenFile(const wxString &filename);
+#endif

 #ifndef _DEBUG
 	void OnUnhandledException();
--- a/core/options.cpp
+++ b/core/options.cpp
@ -89,7 +89,11 @@ void OptionsManager::LoadDefaults() {
 	SetColour(_T("Syntax Highlight Tags"),wxColour(90,90,90));
 	SetColour(_T("Syntax Highlight Error"),wxColour(200,0,0));
 	SetColour(_T("Edit Box Need Enter Background"),wxColour(192,192,255));
+#if defined(__WINDOWS__)
 	SetInt(_T("Font Size"),9);
+#else
+	SetInt(_T("Font Size"),11);
+#endif
 	SetText(_T("Font Face"),_T(""));

 	SetBool(_T("Shift Times ByTime"),true);
@ -143,7 +147,11 @@ void OptionsManager::LoadDefaults() {
 	SetInt(_T("Grid hide overrides"),1);
 	wchar_t temp = 0x2600;
 	SetText(_T("Grid hide overrides char"),temp);
+#if defined(__WINDOWS__)
 	SetInt(_T("Grid font size"),8);
+#else
+	SetInt(_T("Grid font size"),10);
+#endif
 	SetBool(_T("Grid allow focus"),true);

 	SetBool(_T("Highlight subs in frame"),true);