amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-11 05:07:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Updates to make Linux work... still lost of issues.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1157 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
coppro
2008-08-21 02:41:30 +00:00
parent 30afb08930
commit d13b721b41
10 changed files with 129 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/data/field/package_choice.cpp
+1 -1
View File
@@ -51,7 +51,7 @@ IMPLEMENT_REFLECTION(PackageChoiceStyle) {
String PackageChoiceValue::toString() const {
PackagedP pack = getPackage();
if (pack) return pack->short_name;
if (pack.get()) return pack->short_name;
else return _("");
}
src/gui/set/window.cpp
+2 -2
View File
@@ -255,8 +255,8 @@ void SetWindow::setControlStatusText(wxWindow* control, const String& text) {
}
}
control_status_texts.push_back(make_pair(control,text));
control->Connect(wxEVT_ENTER_WINDOW,(wxObjectEventFunction)(wxEventFunction)(wxMouseEventFunction)onControlEnter,nullptr,this);
control->Connect(wxEVT_LEAVE_WINDOW,(wxObjectEventFunction)(wxEventFunction)(wxMouseEventFunction)onControlLeave,nullptr,this);
control->Connect(wxEVT_ENTER_WINDOW,wxMouseEventHandler(SetWindow::onControlEnter),nullptr,this);
control->Connect(wxEVT_LEAVE_WINDOW,wxMouseEventHandler(SetWindow::onControlLeave),nullptr,this);
}
void SetWindow::onControlEnter(wxMouseEvent& ev) {
for (size_t i = 0 ; i < control_status_texts.size() ; ++i) {
src/util/atomic.hpp
+1 -1
View File
@@ -54,7 +54,7 @@
#define HAVE_FAST_ATOMIC
// ----------------------------------------------------------------------------- : AtomicInt : GCC
#elif defined(__GNUC__) && defined(__i486)
#elif defined(__GNUC__) && defined(HAVE_GCC_ATOMIC_BUILTINS)
/// An integer which is equivalent to an AtomicInt, but which doesn't support attomic operations
typedef unsigned int AtomicIntEquiv;