OS X compilation fixes

Originally committed to SVN as r6512.
This commit is contained in:
Thomas Goyne 2012-02-23 19:28:19 +00:00
parent 45dbc8bd15
commit 5f82f5b2d7
3 changed files with 6 additions and 1 deletions

View File

@ -46,6 +46,7 @@
#include <algorithm> #include <algorithm>
#include <wx/clipbrd.h>
#include <wx/filefn.h> #include <wx/filefn.h>
#include <wx/filename.h> #include <wx/filename.h>
#include <wx/log.h> #include <wx/log.h>

View File

@ -40,6 +40,10 @@
#include "auto4_lua.h" #include "auto4_lua.h"
#ifndef AGI_PRE
#include <wx/filedlg.h>
#endif
#ifdef __WINDOWS__ #ifdef __WINDOWS__
#include "../../contrib/lua51/src/lua.h" #include "../../contrib/lua51/src/lua.h"
#include "../../contrib/lua51/src/lauxlib.h" #include "../../contrib/lua51/src/lauxlib.h"

View File

@ -365,7 +365,7 @@ void DialogFontsCollector::OnAddText(wxThreadEvent &event) {
} }
void DialogFontsCollector::OnCollectionComplete(wxThreadEvent &) { void DialogFontsCollector::OnCollectionComplete(wxThreadEvent &) {
EnableCloseButton(); EnableCloseButton(true);
start_btn->Enable(); start_btn->Enable();
close_btn->Enable(); close_btn->Enable();
collection_mode->Enable(); collection_mode->Enable();