wowgetoffyourcellphone/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

- debug version of xerces libs and updated headers

Browse Source 
- update premake for wxw 2.8 and make some required fixes in
VideoRecorder.cpp

This was SVN commit r5068.
This commit is contained in:
janwas 2007-05-13 10:27:48 +00:00
parent bd2af78d4f
commit 31a60bf1d8
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build/premake/extern_libs.lua
View File

@ -107,9 +107,9 @@ extern_lib_defs = {
tinsert(package.includepaths, libraries_dir.."wxwidgets/include/msvc")
tinsert(package.includepaths, libraries_dir.."wxwidgets/include")
tinsert(package.libpaths, libraries_dir.."wxwidgets/lib/vc_lib")
tinsert(package.config["Debug" ].links, "wxmsw26ud_gl")
tinsert(package.config["Testing"].links, "wxmsw26ud_gl")
tinsert(package.config["Release"].links, "wxmsw26u_gl")
tinsert(package.config["Debug" ].links, "wxmsw28ud_gl")
tinsert(package.config["Testing"].links, "wxmsw28ud_gl")
tinsert(package.config["Release"].links, "wxmsw28u_gl")
else
tinsert(package.buildoptions, "`wx-config --cxxflags`")
tinsert(package.linkoptions, "`wx-config --libs std,gl,ogl,media`")

8
source/tools/atlas/AtlasUI/General/VideoRecorder/VideoRecorder.cpp
View File

@ -90,7 +90,7 @@ public:
protected:
void OnOK(wxCommandEvent& event)
void OnButtonOK(wxCommandEvent& event)
{
wxTextCtrl* filenameWin = wxDynamicCast(FindWindow(ID_FILENAME), wxTextCtrl);
wxComboBox* framerateWin = wxDynamicCast(FindWindow(ID_FRAMERATE), wxComboBox);
@ -112,7 +112,7 @@ protected:
return;
}
wxDialog::OnOK(event);
event.Skip(); // janwas: wxDialog::OnOK has been removed in 2.8 wxw; see http://wxforum.shadonet.com/viewtopic.php?t=11103
}
private:
@ -134,7 +134,7 @@ private:
else if (size < 1024*1024*100) sizeStr = wxString::Format(_T("~%.1f MiB"), (float)size/(1024*1024));
else if (size < 1024*1024*1024) sizeStr = wxString::Format(_T("~%.0f MiB"), (float)size/(1024*1024));
else sizeStr = wxString::Format(_T("~%.2f GiB"), (float)size/(1024*1024*1024));
filesizeWin->SetTitle(sizeStr);
filesizeWin->SetLabel(sizeStr);
}
void FileBrowse(wxCommandEvent& WXUNUSED(event))
@ -160,7 +160,7 @@ BEGIN_EVENT_TABLE(RecorderDialog, wxDialog)
EVT_TEXT(ID_FRAMERATE, RecorderDialog::RecalculateSizes)
EVT_TEXT(ID_BITRATE, RecorderDialog::RecalculateSizes)
EVT_BUTTON(ID_FILECHOOSE, RecorderDialog::FileBrowse)
EVT_BUTTON(wxID_OK, RecorderDialog::OnOK)
EVT_BUTTON(wxID_OK, RecorderDialog::OnButtonOK)
END_EVENT_TABLE()